fixes #5317

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@30287 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/AbstractPlot.java b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/AbstractPlot.java
index ebfba89205902108caaa9e2e6447c1ac1b018ea7..112b0f33ecfde9e5dca3c4143f7bbec4ea90f965 100644 (file)
--- a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/AbstractPlot.java
+++ b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/AbstractPlot.java
@@ -16,6 +16,7 @@ import java.util.HashMap;
 \r
 import javax.swing.SwingUtilities;\r
 \r
+import org.jfree.chart.JFreeChart;\r
 import org.jfree.chart.axis.Axis;\r
 import org.jfree.chart.plot.Plot;\r
 import org.simantics.db.ReadGraph;\r
@@ -41,7 +42,7 @@ public abstract class AbstractPlot implements IPlot {
     protected Plot plot;\r
     protected PlotProperties currentProperties;\r
     private PlotPropertyListener listener;\r
-\r
+    private org.jfree.chart.JFreeChart jfreechart;\r
 \r
     public AbstractPlot(ReadGraph graph, Resource resource) {\r
         this.resource = resource;\r
@@ -67,6 +68,15 @@ public abstract class AbstractPlot implements IPlot {
     public Resource getResource() {\r
         return resource;\r
     }\r
+    \r
+    @Override\r
+    public void setJFreeChart(JFreeChart jfreechart) {\r
+       this.jfreechart = jfreechart;\r
+    }\r
+    \r
+    public org.jfree.chart.JFreeChart getJfreechart() {\r
+               return jfreechart;\r
+       }\r
 \r
     protected abstract Plot newPlot();\r
     protected abstract void setPlotProperties(PlotProperties properties);\r
@@ -143,7 +153,7 @@ public abstract class AbstractPlot implements IPlot {
     }\r
     \r
     @Override\r
-    public void configurePlot() {\r
+    public void configurePlot(PlotProperties properties) {\r
        // TODO Auto-generated method stub\r
        \r
     }\r
@@ -200,7 +210,7 @@ public abstract class AbstractPlot implements IPlot {
                 @Override\r
                 public void run() {\r
                     setPlotProperties(result);\r
-                    configurePlot();\r
+                    configurePlot(result);\r
                 }\r
             });\r
         }\r

diff --git a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/IPlot.java b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/IPlot.java
index c040a5f5b7402038a8305d5b46afa315316715e7..473ee385db562bafda2bcf5161b1fa1f02d11842 100644 (file)
--- a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/IPlot.java
+++ b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/IPlot.java
@@ -11,9 +11,11 @@
  *******************************************************************************/\r
 package org.simantics.jfreechart.chart;\r
 \r
+import org.jfree.chart.JFreeChart;\r
 import org.jfree.chart.plot.Plot;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.exception.DatabaseException;\r
+import org.simantics.jfreechart.chart.AbstractPlot.PlotProperties;\r
 \r
 /**\r
  * Interface for JFreeChart.Plot type resource\r
@@ -38,6 +40,10 @@ public interface IPlot extends IJFreeChartComponent {
      */\r
     public Resource getResource();\r
     \r
-    public void configurePlot();\r
+    public void configurePlot(PlotProperties properties);\r
     \r
+    \r
+    public void setJFreeChart(JFreeChart jfreechart);\r
+    \r
+    public JFreeChart getJfreechart();\r
 }\r

diff --git a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java
index ea8df3d66f4d66c770f22cbd48097b03acd34e4c..a6a66b728c2a4f30a12ca13790867569be01cc4e 100644 (file)
--- a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java
+++ b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java
@@ -84,7 +84,9 @@ public class JFreeChart implements IJFreeChart {
 \r
         if(jfreechart == null)\r
             jfreechart = new org.jfree.chart.JFreeChart(plot.getPlot());\r
-\r
+        \r
+        plot.setJFreeChart(jfreechart);\r
+        \r
         if(listener == null) {\r
             listener = new JFreeChartListener();\r
             SimanticsUI.getSession().asyncRequest(new Read<Pair<ITitle, Boolean>>() {\r