pass chartImagePath to lower levels

nextreports · Feb 29, 2016 · d96d7cd · d96d7cd
1 parent 0b98a08
commit d96d7cd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/ro/nextreports/engine/exporter/ExporterBean.java b/src/ro/nextreports/engine/exporter/ExporterBean.java
@@ -40,6 +40,7 @@ public class ExporterBean {
 	private String language;
 	// should we put raw data inside table (and use renderer to show formatted data)  or we should put formatted data
 	private boolean reportTableExporterRawData;
+	private String imageChartPath;
 
 	public ExporterBean(Connection con, int queryTimeout, QueryResult result,
 			OutputStream out, ReportLayout reportLayout, ParametersBean pBean,
@@ -162,6 +163,14 @@ public boolean isReportTableExporterRawData() {
 
 	public void setReportTableExporterRawData(boolean reportTableExporterRawData) {
 		this.reportTableExporterRawData = reportTableExporterRawData;
+	}	
+
+	public String getImageChartPath() {
+		return imageChartPath;
+	}
+
+	public void setImageChartPath(String imageChartPath) {
+		this.imageChartPath = imageChartPath;
 	}
 
 	@Override

diff --git a/src/ro/nextreports/engine/exporter/ResultExporter.java b/src/ro/nextreports/engine/exporter/ResultExporter.java
@@ -1856,8 +1856,12 @@ private void generateChartImage(ChartBandElement bandElement) {
 			}
 		}
 
-        runner.setParameterValues(bean.getParametersBean().getParamValues());        
-        runner.setImagePath(imageChartPath);  
+        runner.setParameterValues(bean.getParametersBean().getParamValues()); 
+        String localPath = imageChartPath;
+        if (localPath == null) {
+        	localPath = bean.getImageChartPath();
+        }        
+        runner.setImagePath(localPath);  
         I18nLanguage lang = I18nUtil.getLanguageByName(bean.getReportLayout(), bean.getLanguage());
         if (lang != null) {
         	runner.setLanguage(lang.getName());
@@ -1870,7 +1874,7 @@ private void generateChartImage(ChartBandElement bandElement) {
             runner.run();
             image = runner.getChartImageName();
             bandElement.setImage(image);
-        } catch (Exception e) {    
+        } catch (Exception e) {
         	// if there is an exception we must reset image name (not generated) on band element
         	// otherwise the last one generated will be used, which is false!
         	bandElement.setImage("not_generated");
@@ -2050,6 +2054,7 @@ protected ExporterBean getSubreportExporterBean(Report subreport, boolean rowCou
 			boolean isProcedure = QueryUtil.isProcedureCall(sql);
 			ExporterBean eb = new ExporterBean(bean.getConnection(), bean.getQueryTimeout(), queryResult, bean.getOut(),
 					subreport.getLayout(), bean.getParametersBean(), subreport.getBaseName(), false, isProcedure);
+			eb.setImageChartPath(imageChartPath);
 			eb.setSubreport(true);
 			return eb;
 		} finally {