]> gerrit.simantics Code Review - simantics/sysdyn.git/commitdiff
chart component moved to jfreechart plug-in.
authorluukkainen <luukkainen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Wed, 16 Jan 2013 10:49:27 +0000 (10:49 +0000)
committerluukkainen <luukkainen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Wed, 16 Jan 2013 10:49:27 +0000 (10:49 +0000)
refs #3988

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

71 files changed:
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractAxis.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractDataset.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractPlot.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractRenderer.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/BarRenderer.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/CategoryAxis.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/CategoryDataset.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/CategoryPlot.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ChartComposite.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ChartUtils.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ExtendedNumberAxis.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IAxis.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IDataset.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IJFreeChart.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IJFreeChartComponent.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IPlot.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IRenderer.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ITitle.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/JFreeChart.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/NumberAxis.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/PieDataset.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/PiePlot.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/StackedBarRenderer.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/TextTitle.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYAreaRenderer.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYDataset.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYLineRenderer.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYPlot.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartBoundsOutline.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartElementFactory.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartElementWriter.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartNode.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartSceneGraph.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/PopulateChartDropParticipant.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ResizeListener.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/AxisChildRule.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/AxisDropAction.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/AxisLabelRule.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesChildRule.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesDropAction.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesLabelDecorationRule.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesLabelRule.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/VariableChildRule.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/AllVariablesOfModel.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/AxisHidePropertyComposite.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/BooleanPropertyFactory.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/BooleanSelectionListener.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/ChartTab.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/ColorPicker.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/DoubleValidator.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/JFreeChartPropertyColorProvider.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/RVIFactory.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/RVIModifier.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/RangeComposite.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/TitleFactory.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/TitleModifier.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/TrackedSpinner.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/VariableExistsValidator.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/VariableProposalProvider.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarAxisTab.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarGeneralPropertiesTab.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarSeriesPropertyComposite.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarSeriesTab.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/pie/PieGeneralPropertiesTab.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/pie/PieSeriesPropertyComposite.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/pie/PieSeriesTab.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/AxisAndVariablesExplorerComposite.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/AxisPropertyComposite.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/SeriesPropertyComposite.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/XYLineAxisAndVariablesTab.java [deleted file]
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/XYLineGeneralPropertiesTab.java [deleted file]

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractAxis.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractAxis.java
deleted file mode 100644 (file)
index 9f37e5e..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import java.awt.Color;\r
-\r
-import org.jfree.chart.axis.Axis;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.diagram.G2DUtils;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Abstract axis class for all JFreeChart axis\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public abstract class AbstractAxis implements IAxis {\r
-\r
-    protected Axis axis;\r
-    protected String label;\r
-    protected Boolean tMarksVisible, tLabelsVisible, labelVisible, lineVisible;\r
-    protected Color color;\r
-    protected Double min, max, rotate;\r
-\r
-    /**\r
-     * Creates a new axis\r
-     * @param graph ReadGraph\r
-     * @param axisResource resource of type JFreeChart.NumberAxis\r
-     */\r
-    public AbstractAxis(ReadGraph graph, Resource axisResource) {\r
-        try {\r
-            /*\r
-             *  Axis is practically always called from a listener, \r
-             *  so it is safe to always create a new axis every time. \r
-             *  \r
-             *  The parent listener takes care that the axis is updated. \r
-             *  (And the code stays much more readable)\r
-             */\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            label = graph.getPossibleRelatedValue(axisResource, l0.HasLabel);\r
-            tMarksVisible = graph.getPossibleRelatedValue(axisResource, jfree.Axis_visibleTickMarks, Bindings.BOOLEAN);\r
-            tLabelsVisible = graph.getPossibleRelatedValue(axisResource, jfree.Axis_visibleTickLabels, Bindings.BOOLEAN);\r
-            labelVisible = graph.getPossibleRelatedValue(axisResource, jfree.Axis_visibleLabel, Bindings.BOOLEAN);\r
-            lineVisible = graph.getPossibleRelatedValue(axisResource, jfree.Axis_visibleAxisLine, Bindings.BOOLEAN);\r
-            Resource c = graph.getPossibleObject(axisResource, jfree.color);\r
-            color = c == null ? null : G2DUtils.getColor(graph, c);\r
-            min = graph.getPossibleRelatedValue(axisResource, jfree.Axis_min, Bindings.DOUBLE);\r
-            max = graph.getPossibleRelatedValue(axisResource, jfree.Axis_max, Bindings.DOUBLE);\r
-            rotate = graph.getPossibleRelatedValue(axisResource, jfree.Axis_rotateLabelDegrees, Bindings.DOUBLE);\r
-        } catch (DatabaseException e) {\r
-            e.printStackTrace();\r
-        }\r
-    }\r
-    \r
-    @Override\r
-    public void dispose() {\r
-        \r
-    }\r
-\r
-    @Override\r
-    public Axis getAxis() {\r
-        if(tMarksVisible != null && tMarksVisible == false)\r
-            axis.setTickMarksVisible(false);\r
-        if(tLabelsVisible != null && tLabelsVisible == false)\r
-            axis.setTickLabelsVisible(false);\r
-        if(lineVisible != null && lineVisible == false)\r
-            axis.setAxisLineVisible(false);\r
-        \r
-        if(color != null) {\r
-            axis.setAxisLinePaint(color);\r
-            axis.setLabelPaint(color);\r
-            axis.setTickLabelPaint(color);\r
-            axis.setTickMarkPaint(color);\r
-        }\r
-        // label exists and its visibility == null or true\r
-        if((labelVisible == null || labelVisible == true) && label != null)\r
-            axis.setLabel(label);\r
-        return axis;\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractDataset.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractDataset.java
deleted file mode 100644 (file)
index 31a9112..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-\r
-\r
-/**\r
- * Abstract dataset class for all JFreeChart datasets\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public abstract class AbstractDataset implements IDataset {\r
-\r
-    protected Resource resource;\r
-    \r
-    public AbstractDataset(ReadGraph graph, Resource resource) {\r
-        this.resource = resource;\r
-    }\r
-    \r
-    @Override\r
-    public void dispose() {\r
-        \r
-    }\r
-\r
-    @Override\r
-    public Resource getResource() {\r
-        return resource;\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractPlot.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractPlot.java
deleted file mode 100644 (file)
index 48e0f69..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import java.util.ArrayList;\r
-import java.util.HashMap;\r
-\r
-import javax.swing.SwingUtilities;\r
-\r
-import org.jfree.chart.axis.Axis;\r
-import org.jfree.chart.plot.Plot;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.request.ObjectsWithType;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.procedure.Listener;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.ui.SimanticsUI;\r
-\r
-/**\r
- * Abstract plot class for all JFreeChart plots\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public abstract class AbstractPlot implements IPlot {\r
-\r
-    protected Resource resource;\r
-    protected Plot plot;\r
-    protected PlotProperties currentProperties;\r
-    private PlotPropertyListener listener;\r
-\r
-\r
-    public AbstractPlot(ReadGraph graph, Resource resource) {\r
-        this.resource = resource;\r
-    }\r
-\r
-    @Override\r
-    public void dispose() {\r
-        if(currentProperties != null) {\r
-            for(IAxis axis : currentProperties.ranges)\r
-                axis.dispose();\r
-\r
-            for(IAxis axis : currentProperties.domains)\r
-                axis.dispose();\r
-\r
-            for(IDataset dataset : currentProperties.datasets)\r
-                dataset.dispose();\r
-        }\r
-        if(listener != null)\r
-            listener.dispose();\r
-    }\r
-\r
-    @Override\r
-    public Resource getResource() {\r
-        return resource;\r
-    }\r
-\r
-    protected abstract Plot newPlot();\r
-    protected abstract void setPlotProperties(PlotProperties properties);\r
-    protected abstract void getOtherProperties(ReadGraph graph, PlotProperties properties) throws DatabaseException;\r
-\r
-    @Override\r
-    public Plot getPlot() {\r
-        if(plot == null)\r
-            plot = newPlot();\r
-\r
-        if(listener == null || listener.isDisposed()) {\r
-            listener = new PlotPropertyListener();\r
-            SimanticsUI.getSession().asyncRequest(new Read<PlotProperties>() {\r
-\r
-                @Override\r
-                public PlotProperties perform(ReadGraph graph) throws DatabaseException {\r
-\r
-                    PlotProperties properties = new PlotProperties();\r
-\r
-                    Layer0 l0 = Layer0.getInstance(graph);\r
-                    JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-\r
-                    HashMap<Resource, IAxis> axisMap = new HashMap<Resource, IAxis>();\r
-\r
-                    // Get all range axis\r
-                    Resource rangeList = graph.getPossibleObject(resource, jfree.Plot_rangeAxisList);\r
-                    if(rangeList != null) {\r
-                        for(Resource axisResource : ListUtils.toList(graph, rangeList)) {\r
-                            IAxis axis = graph.adapt(axisResource, IAxis.class);\r
-                            if(axis.getAxis() instanceof Axis) {\r
-                                properties.ranges.add(axis);\r
-                                axisMap.put(axisResource, axis);\r
-                            }\r
-                        }\r
-                    }\r
-\r
-                    // Get all domain axis\r
-                    // There usually is only one domain axis, but this supports also multiple domain axis\r
-                    for(Resource axisResource : graph.syncRequest(new ObjectsWithType(resource, jfree.Plot_domainAxis, jfree.Axis))) {\r
-                        IAxis axis = graph.adapt(axisResource, IAxis.class);\r
-                        if(axis.getAxis() instanceof Axis) {\r
-                            properties.domains.add(axis);\r
-                            axisMap.put(axisResource, axis);\r
-                        }\r
-                    }\r
-\r
-                    // Get all datasets and map them to axis\r
-                    for(Resource datasetResource : graph.syncRequest(new ObjectsWithType(resource, l0.ConsistsOf, jfree.Dataset))) {\r
-                        IDataset dataset = graph.adapt(datasetResource, IDataset.class);\r
-                        if(dataset != null) {\r
-                            properties.datasets.add(dataset);\r
-                            Resource axisResource = graph.getPossibleObject(datasetResource, jfree.Dataset_mapToRangeAxis);\r
-                            IAxis axis;\r
-                            if(axisMap.containsKey(axisResource)) {\r
-                                axis = axisMap.get(axisResource);\r
-                                properties.rangeMappings.put(dataset, axis);\r
-                            }\r
-\r
-                            axisResource = graph.getPossibleObject(datasetResource, jfree.Dataset_mapToDomainAxis);\r
-                            if(axisMap.containsKey(axisResource)) {\r
-                                axis = axisMap.get(axisResource);\r
-                                properties.domainMappings.put(dataset, axis);\r
-                            }\r
-                        }\r
-                    }\r
-                    getOtherProperties(graph, properties);\r
-                    return properties;\r
-\r
-                }\r
-            }, listener);\r
-        }\r
-\r
-        return plot;\r
-    }\r
-\r
-    protected class PlotProperties {\r
-        public ArrayList<IAxis> ranges;\r
-        public ArrayList<IAxis> domains;\r
-        public ArrayList<IDataset> datasets;\r
-        public HashMap<IDataset, IAxis> rangeMappings;\r
-        public HashMap<IDataset, IAxis> domainMappings;\r
-        public HashMap<String, Object> otherProperties;\r
-        \r
-        public PlotProperties() {\r
-            datasets = new ArrayList<IDataset>();\r
-            rangeMappings = new HashMap<IDataset, IAxis>();\r
-            domainMappings = new HashMap<IDataset, IAxis>();\r
-            ranges = new ArrayList<IAxis>();\r
-            domains = new ArrayList<IAxis>();\r
-            otherProperties = new HashMap<String, Object>();\r
-        }\r
-\r
-        @Override\r
-        public boolean equals(Object other) {\r
-            if(!this.getClass().equals(other.getClass()))\r
-                return false;\r
-            PlotProperties p = (PlotProperties)other;\r
-            if(!ranges.equals(p.ranges))\r
-                return false;\r
-            if(!domains.equals(p.domains))\r
-                return false;\r
-            if(!datasets.equals(p.datasets))\r
-                return false;\r
-            if(!rangeMappings.equals(p.rangeMappings))\r
-                return false;\r
-            if(!domainMappings.equals(p.domainMappings))\r
-                return false;\r
-            if(!otherProperties.equals(p.otherProperties))\r
-                return false;\r
-            return true;\r
-        }\r
-    }\r
-\r
-    private class PlotPropertyListener implements Listener<PlotProperties> {\r
-\r
-        private boolean disposed = false;\r
-\r
-        public void dispose() {\r
-            disposed = true;\r
-        }\r
-        @Override\r
-        public void execute(final PlotProperties result) {\r
-            SwingUtilities.invokeLater(new Runnable() {\r
-\r
-                @Override\r
-                public void run() {\r
-                    setPlotProperties(result);\r
-                }\r
-            });\r
-        }\r
-\r
-        @Override\r
-        public void exception(Throwable t) {\r
-            t.printStackTrace();\r
-        }\r
-\r
-        @Override\r
-        public boolean isDisposed() {\r
-            return disposed;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractRenderer.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/AbstractRenderer.java
deleted file mode 100644 (file)
index c38bd23..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-\r
-/**\r
- * Abstract renderer class for all JFreeChart renderers\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public abstract class AbstractRenderer implements IRenderer {\r
-\r
-    protected Resource resource;\r
-    \r
-    public AbstractRenderer(ReadGraph graph, Resource resource) {\r
-        this.resource = resource;\r
-    }\r
-    \r
-    @Override\r
-    public void dispose() {\r
-    }\r
-\r
-    @Override\r
-    public Resource getResource() {\r
-        return resource;\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/BarRenderer.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/BarRenderer.java
deleted file mode 100644 (file)
index 7d80fb8..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.labels.StandardCategoryToolTipGenerator;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-\r
-\r
-/**\r
- * Normal bar renderer\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class BarRenderer extends AbstractRenderer {\r
-\r
-    public BarRenderer(ReadGraph graph, Resource resource) {\r
-        super(graph, resource);\r
-    }\r
-\r
-    private org.jfree.chart.renderer.category.BarRenderer renderer;\r
-    \r
-    @Override\r
-    public org.jfree.chart.renderer.AbstractRenderer getRenderer() {\r
-        if(renderer == null) {\r
-            renderer = new org.jfree.chart.renderer.category.BarRenderer();\r
-            renderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator());\r
-        }\r
-        return renderer;\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/CategoryAxis.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/CategoryAxis.java
deleted file mode 100644 (file)
index bd58da1..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.axis.Axis;\r
-import org.jfree.chart.axis.CategoryLabelPositions;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-\r
-/**\r
- * Class representing a JFreeChart.CategoryAxis\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class CategoryAxis extends AbstractAxis {\r
-\r
-    public CategoryAxis(ReadGraph graph, Resource axisResource) {\r
-        super(graph, axisResource);\r
-    }\r
-\r
-    @Override\r
-    public Axis getAxis() {\r
-        axis = new org.jfree.chart.axis.CategoryAxis();\r
-        \r
-        if(rotate != null && rotate > 0) {\r
-            ((org.jfree.chart.axis.CategoryAxis)axis).setCategoryLabelPositions(\r
-                    CategoryLabelPositions.createUpRotationLabelPositions(Math.toRadians(rotate)));\r
-        }\r
-        \r
-        return super.getAxis();\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/CategoryDataset.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/CategoryDataset.java
deleted file mode 100644 (file)
index 258b56e..0000000
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-import javax.swing.SwingUtilities;\r
-\r
-import org.jfree.chart.plot.DefaultDrawingSupplier;\r
-import org.jfree.chart.renderer.AbstractRenderer;\r
-import org.jfree.chart.renderer.category.BarRenderer;\r
-import org.jfree.data.category.DefaultCategoryDataset;\r
-import org.jfree.data.general.Dataset;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.exception.MissingVariableException;\r
-import org.simantics.db.layer0.request.PossibleActiveExperiment;\r
-import org.simantics.db.layer0.variable.Variable;\r
-import org.simantics.db.layer0.variable.Variables;\r
-import org.simantics.db.procedure.Listener;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.modeling.ModelingResources;\r
-import org.simantics.operation.Layer0X;\r
-import org.simantics.sysdyn.Functions;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.adapter.VariableRVIUtils;\r
-import org.simantics.sysdyn.manager.SysdynDataSet;\r
-import org.simantics.ui.SimanticsUI;\r
-\r
-/**\r
- * Class representing a JFreeChart.CategoryDataset\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class CategoryDataset extends AbstractDataset {\r
-\r
-    private List<Resource> seriesList;\r
-    private String realizationURI;\r
-    private IRenderer renderer;\r
-    private DefaultCategoryDataset dataset;\r
-\r
-    public CategoryDataset(ReadGraph graph, Resource resource) {\r
-        super(graph, resource);\r
-\r
-        try {\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-            ModelingResources mr = ModelingResources.getInstance(graph);\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-\r
-            // Find the model where the chart is located\r
-            Resource model = resource;\r
-            do {\r
-                model = graph.getPossibleObject(model, l0.PartOf);\r
-            } while(model != null && !graph.isInstanceOf(model, mr.StructuralModel));\r
-\r
-            // Find the variable realization of the current experiment\r
-            realizationURI = null;\r
-            Resource realization = graph.syncRequest(new PossibleActiveExperiment(model));\r
-            if (realization == null) {\r
-                Layer0X L0X = Layer0X.getInstance(graph);\r
-                realization = graph.getPossibleObject(model, L0X.HasBaseRealization);\r
-            }\r
-            if (realization != null)\r
-                realizationURI = graph.getURI(realization);\r
-\r
-            if(realizationURI == null)\r
-                return; // No experiment -> No results\r
-\r
-            Resource seriesList = graph.getPossibleObject(resource, jfree.Dataset_seriesList);\r
-            if(seriesList != null)\r
-                this.seriesList = ListUtils.toList(graph, seriesList);\r
-\r
-            Resource rendererResource = graph.getPossibleObject(resource, jfree.Dataset_renderer);\r
-            renderer = graph.adapt(rendererResource, IRenderer.class);\r
-\r
-        } catch (DatabaseException e) {\r
-            e.printStackTrace();\r
-        }\r
-    }\r
-\r
-    private DatasetListener listener;\r
-\r
-    @Override\r
-    public Dataset getDataset() {\r
-\r
-        if(seriesList == null || seriesList.isEmpty() || SimanticsUI.getSession() == null)\r
-            return null;\r
-\r
-        if(dataset == null) {\r
-            dataset = new DefaultCategoryDataset();\r
-        }\r
-\r
-        if(listener == null || listener.isDisposed()) {\r
-            listener = new DatasetListener();\r
-            SimanticsUI.getSession().asyncRequest(new Read<ArrayList<TempSeries>>() {\r
-\r
-                @Override\r
-                public ArrayList<TempSeries> perform(ReadGraph graph) throws DatabaseException {\r
-                    JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-\r
-                    ArrayList<TempSeries> series = new ArrayList<TempSeries>();\r
-                    // Get properties for all series\r
-                    if(seriesList != null) {\r
-                        for(Resource r : seriesList) {\r
-                            String rvi = graph.getPossibleRelatedValue(r, jfree.variableRVI);\r
-                            if(rvi == null)\r
-                                continue;\r
-\r
-                            try {\r
-                                // Get a variable for the series\r
-                                Variable v = Variables.getVariable(graph, realizationURI + rvi);\r
-                                // Get values\r
-                                Variable dsVariable = v.browsePossible(graph, "#" + Functions.ACTIVE_DATASETS + "#");\r
-                                if(dsVariable == null)\r
-                                       return series;\r
-                                \r
-                                Object object = dsVariable.getValue(graph);\r
-                                \r
-                                if(object == null || !(object instanceof ArrayList<?>))\r
-                                    return series;\r
-\r
-                                ArrayList<SysdynDataSet> datasets = new ArrayList<SysdynDataSet>();\r
-\r
-                                for(Object o : (ArrayList<?>)object) {\r
-                                    if(o instanceof SysdynDataSet)\r
-                                        datasets.add((SysdynDataSet)o);\r
-                                }\r
-\r
-                                String[] filter = graph.getPossibleRelatedValue(r, jfree.variableFilter);\r
-                                if(filter != null) {\r
-                                    ArrayList<SysdynDataSet> result2 = VariableRVIUtils.getDataset(datasets, filter);\r
-                                    if(result2 != null) {\r
-                                        datasets = result2;\r
-                                    }\r
-                                }\r
-\r
-                                // Find if a specific time is set for this chart\r
-                                Double chartTime = null;\r
-                                if(!datasets.isEmpty()) {\r
-                                    Layer0 l0 = Layer0.getInstance(graph);\r
-                                    Resource datasetResource = graph.getPossibleObject(r, l0.PartOf);\r
-                                    if(datasetResource != null) {\r
-                                        Resource plot = graph.getPossibleObject(datasetResource, l0.PartOf);\r
-                                        if(plot != null) {\r
-                                            Resource chart = graph.getPossibleObject(plot, l0.PartOf);\r
-                                            if(chart != null)\r
-                                                chartTime = graph.getPossibleRelatedValue(chart, jfree.Chart_time);\r
-                                        }\r
-                                    }\r
-                                }\r
-\r
-                                for(SysdynDataSet dataset : datasets) {\r
-                                    double[] va = dataset.values;\r
-\r
-\r
-                                    if(va == null || va.length == 0)\r
-                                        continue;\r
-\r
-                                    /*\r
-                                     *  Time\r
-                                     *  \r
-                                     *  1. find time for the individual series.\r
-                                     *  2. find time for the whole chart\r
-                                     *  3. find simulation time\r
-                                     */\r
-                                    Double time = graph.getPossibleRelatedValue(r, jfree.Series_time, Bindings.DOUBLE);\r
-                                    if(time == null)\r
-                                        time = chartTime;\r
-                                    if(time == null) {\r
-                                        // Get a variable for the experiment run\r
-                                        Variable run = Variables.getVariable(graph, realizationURI);\r
-                                        if(run == null)\r
-                                            return null;\r
-                                        Variable timeVar = run.browsePossible(graph, "#" + Functions.TIME + "#");\r
-                                        if(timeVar != null)\r
-                                            time = timeVar.getValue(graph, Bindings.DOUBLE);\r
-            \r
-                                    }\r
-\r
-                                    // Value\r
-                                    Double value = null;\r
-                                    if(time == null) {\r
-                                        value = va[va.length - 1];\r
-                                    } else {\r
-                                        double[] ta = dataset.times;\r
-                                        for(int i = 0; i < ta.length; i++) {\r
-                                            double t = ta[i];\r
-                                            if(time <= t) {\r
-                                                value = va[i]; \r
-                                                break;\r
-                                            }\r
-                                        }\r
-\r
-                                        if(value == null)\r
-                                            value = va[va.length - 1];\r
-                                    }\r
-                                    String label = graph.getPossibleRelatedValue(r, Layer0.getInstance(graph).HasLabel); // Called to refresh paints when label changes\r
-                                    String name = dataset.name;\r
-                                    series.add(new TempSeries(label == null || label.isEmpty() ? name : label, dataset.result, value));\r
-                                }\r
-                            } catch (MissingVariableException e) {\r
-                                // Do nothing, if variable was not found. Move on to the next series\r
-                            }\r
-                        }\r
-                    }\r
-                    return series;\r
-                }\r
-\r
-            }, listener);\r
-        }\r
-        return dataset;\r
-    }\r
-\r
-    @Override\r
-    public AbstractRenderer getRenderer() {\r
-        return renderer.getRenderer();\r
-    }\r
-\r
-    private class DatasetListener implements Listener<ArrayList<TempSeries>> {\r
-        private boolean disposed = false;\r
-\r
-        public void dispose() {\r
-            disposed = true;\r
-        }\r
-\r
-        @Override\r
-        public void execute(final ArrayList<TempSeries> series) {\r
-            // Modify series in AWT thread to avoid synchronization problems\r
-            SwingUtilities.invokeLater(new Runnable() {\r
-\r
-                @Override\r
-                public void run() {\r
-                    // Remove all unused series\r
-                    dataset.clear();\r
-                    BarRenderer renderer = ((BarRenderer)getRenderer());\r
-                    renderer.getPlot().setDrawingSupplier(new DefaultDrawingSupplier());\r
-\r
-                    // Add found series\r
-                    for(int i = 0; i < series.size(); i++) {\r
-                        TempSeries s = series.get(i);\r
-                        if(renderer instanceof org.jfree.chart.renderer.category.StackedBarRenderer && s.name.contains("[")) {\r
-                            String category = s.name.substring(0, s.name.indexOf('['));\r
-                            if(s.result != null)\r
-                                category = category + " : " + s.result;\r
-                            String series = s.name.substring(s.name.indexOf('['));\r
-                            dataset.addValue(s.value, series, category);\r
-                        } else {\r
-                            dataset.addValue(s.value, s.result == null ? "Current" : s.result, s.name);\r
-                        }\r
-                    }\r
-                }\r
-            });\r
-        }\r
-\r
-        @Override\r
-        public void exception(Throwable t) {\r
-            t.printStackTrace();\r
-        }\r
-\r
-        @Override\r
-        public boolean isDisposed() {\r
-            return disposed;\r
-        }\r
-    };\r
-\r
-    @Override\r
-    public void dispose() {\r
-        super.dispose();\r
-        if(listener != null) {\r
-            listener.dispose();\r
-            listener = null;\r
-        }\r
-    }\r
-\r
-    /**\r
-     * Auxiliary class containing all information needed to define a single series\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TempSeries {\r
-        public String name;\r
-        public String result;\r
-        public Double value;\r
-\r
-        public TempSeries(String name, String result, Double value) {\r
-            this.name = name;\r
-            this.value = value;\r
-            this.result = result;\r
-        }\r
-\r
-        @Override\r
-        public String toString() {\r
-            return "TempSeries: " + name + ", " + value + ", " + result;\r
-        }\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/CategoryPlot.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/CategoryPlot.java
deleted file mode 100644 (file)
index 14a3795..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.axis.CategoryAxis;\r
-import org.jfree.chart.axis.ValueAxis;\r
-import org.jfree.chart.plot.Plot;\r
-import org.jfree.chart.renderer.category.CategoryItemRenderer;\r
-import org.jfree.ui.RectangleInsets;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Class representing a CategoryPlot for JFreeChart\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class CategoryPlot extends AbstractPlot {\r
-\r
-    public CategoryPlot(ReadGraph graph, Resource resource) {\r
-        super(graph, resource);\r
-    }\r
-\r
-    @Override\r
-    protected Plot newPlot() {\r
-        return new org.jfree.chart.plot.CategoryPlot(null, null, null, null);\r
-    }\r
-\r
-    @Override\r
-    protected void setPlotProperties(PlotProperties properties) {\r
-        if(!(plot instanceof org.jfree.chart.plot.CategoryPlot))\r
-            return;\r
-        \r
-        org.jfree.chart.plot.CategoryPlot cplot = (org.jfree.chart.plot.CategoryPlot) plot;\r
-        /* Support using multiple axis, but prefer using only one domain and \r
-         * one range axis\r
-         */\r
-        for(int i = 0; i < properties.ranges.size(); i++) {\r
-            cplot.setRangeAxis(i, (ValueAxis)properties.ranges.get(i).getAxis());\r
-        }\r
-        \r
-        for(int i = 0; i < properties.domains.size(); i++) {\r
-            cplot.setDomainAxis(i, (CategoryAxis)properties.domains.get(i).getAxis());\r
-        }\r
-        \r
-        IAxis axis;\r
-        for(int i = 0; i < properties.datasets.size(); i++) {\r
-            IDataset dataset = properties.datasets.get(i);\r
-            org.jfree.data.category.CategoryDataset ds = (org.jfree.data.category.CategoryDataset)dataset.getDataset();\r
-            cplot.setDataset(i, ds);\r
-//            System.out.println("setting dataset " + i + ": " + ds);\r
-            cplot.setRenderer(i, (CategoryItemRenderer)dataset.getRenderer());\r
-            axis = properties.rangeMappings.get(dataset);\r
-            if(axis != null && properties.ranges.contains(axis))\r
-                cplot.mapDatasetToRangeAxis(i, properties.ranges.indexOf(axis));\r
-            axis = properties.domainMappings.get(dataset);\r
-            if(axis != null && properties.ranges.contains(axis))\r
-                cplot.mapDatasetToDomainAxis(i, properties.domains.indexOf(axis));\r
-        }\r
-\r
-        Boolean visibleGrid = (Boolean)properties.otherProperties.get("visibleGrid");\r
-        if(visibleGrid != null) {\r
-            cplot.setRangeGridlinesVisible(visibleGrid);\r
-            cplot.setDomainGridlinesVisible(false);\r
-        }\r
-        \r
-        // Cleaner look: no outline borders\r
-        cplot.setInsets(new RectangleInsets(2,5,2,2), false);\r
-        cplot.setOutlineVisible(false);\r
-    }\r
-\r
-    @Override\r
-    protected void getOtherProperties(ReadGraph graph, PlotProperties properties) throws DatabaseException {\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Boolean visibleGrid = graph.getPossibleRelatedValue(resource, jfree.Plot_visibleGrid);\r
-        properties.otherProperties.put("visibleGrid", visibleGrid);\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ChartComposite.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ChartComposite.java
deleted file mode 100644 (file)
index 13c2522..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import java.awt.Frame;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.awt.SWT_AWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.jfree.chart.ChartPanel;\r
-import org.jfree.chart.JFreeChart;\r
-import org.simantics.Simantics;\r
-import org.simantics.db.AsyncReadGraph;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.procedure.AsyncListener;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.ui.SimanticsUI;\r
-import org.simantics.utils.RunnableWithObject;\r
-\r
-/**\r
- * Composite containing a single chart defined by a JFreeChart.Chart\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class ChartComposite extends Composite {\r
-\r
-    private Frame frame;\r
-    private ChartPanel panel;\r
-    private Composite composite;\r
-    private IJFreeChart chart;\r
-\r
-    /**\r
-     * A new ChartComposite with a definition in chartResourceURI\r
-     * @param parent Composite\r
-     * @param chartResourceURI URI for a JFreeChart.Chart definition\r
-     * @param style SWT style\r
-     */\r
-    public ChartComposite(Composite parent, final String chartResourceURI, int style) {\r
-        super(parent, style | SWT.NO_BACKGROUND | SWT.EMBEDDED);\r
-\r
-        try {\r
-            Resource chartResource = SimanticsUI.getSession().syncRequest(new Read<Resource>() {\r
-\r
-                @Override\r
-                public Resource perform(ReadGraph graph) throws DatabaseException {\r
-                    return graph.getPossibleResource(chartResourceURI);\r
-                }\r
-\r
-            });\r
-            if(chartResource != null)\r
-                CreateContent(chartResource);\r
-        } catch (DatabaseException e) {\r
-            e.printStackTrace();\r
-        }\r
-    }\r
-\r
-    /**\r
-     * A new ChartComposite with a chartResource definition\r
-     * @param parent Composite\r
-     * @param chartResource JFreeChart.Chart resource\r
-     * @param style SWT style\r
-     */\r
-    public ChartComposite(Composite parent, final Resource chartResource, int style) {\r
-        super(parent, style | SWT.NO_BACKGROUND | SWT.EMBEDDED);\r
-        CreateContent(chartResource);\r
-    }\r
-\r
-    /**\r
-     * Creates and displays the chart defined in chartResource\r
-     * @param chartResource\r
-     */\r
-    private void CreateContent(final Resource chartResource) {\r
-        composite = this;\r
-\r
-        GridLayoutFactory.fillDefaults().applyTo(composite);\r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);\r
-        frame = SWT_AWT.new_Frame(composite);\r
-\r
-        // Add a listener displaying the contents of the chart. Chart is re-drawn if the definition changes\r
-        Simantics.getSession().asyncRequest(new Read<IJFreeChart>() {\r
-\r
-            @Override\r
-            public IJFreeChart perform(ReadGraph graph) throws DatabaseException {\r
-                // Adapt chartResource to a chart (XY, pie, bar, ...)\r
-                if(graph.isInstanceOf(chartResource, JFreeChartResource.getInstance(graph).Chart)) {\r
-                    if(chart != null)\r
-                        chart.dispose();\r
-                    chart = graph.adapt(chartResource, IJFreeChart.class);\r
-                    return chart;\r
-                } else {\r
-                    return null;\r
-                }\r
-            }\r
-\r
-        } , new AsyncListener<IJFreeChart>() {\r
-\r
-            @Override\r
-            public boolean isDisposed() {\r
-                return composite.isDisposed();\r
-            }\r
-\r
-            @Override\r
-            public void execute(AsyncReadGraph graph, IJFreeChart chart) {\r
-                if(chart == null || composite.isDisposed())\r
-                    return;\r
-                \r
-                JFreeChart jfreeChart = chart.getChart();\r
-                // Display the result chart\r
-                composite.getDisplay().asyncExec(new RunnableWithObject(jfreeChart) {\r
-\r
-                    @Override\r
-                    public void run() {\r
-                        if(composite.isDisposed())\r
-                            return;\r
-                        if(panel != null)\r
-                            frame.remove(panel);\r
-                        composite.layout();\r
-                        JFreeChart chart = (JFreeChart)getObject();\r
-                        panel = new ChartPanel(chart, false, true, true, true, true);\r
-                        frame.add(panel);\r
-                        frame.repaint();\r
-                        frame.validate();\r
-                    }\r
-                });\r
-            }\r
-\r
-            @Override\r
-            public void exception(AsyncReadGraph graph, Throwable throwable) {\r
-                throwable.printStackTrace();\r
-\r
-            }\r
-        });\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ChartUtils.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ChartUtils.java
deleted file mode 100644 (file)
index 3caccec..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import java.util.ArrayList;\r
-import java.util.UUID;\r
-\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.common.utils.NameUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.request.PossibleActiveExperiment;\r
-import org.simantics.db.layer0.request.PossibleModel;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.layer0.utils.direct.GraphUtils;\r
-import org.simantics.operation.Layer0X;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Utilities for handling charts\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class ChartUtils {\r
-    \r
-    /**\r
-     * Creates a new range axis of type jfree.NumberAxis to a plot\r
-     * \r
-     * @param graph WriteGraph\r
-     * @param plot Plot resource\r
-     * @return Created number axis, null if not successful\r
-     * @throws DatabaseException\r
-     */\r
-    public static Resource createNumberRangeAxis(WriteGraph graph, Resource plot) throws DatabaseException {\r
-        Resource axis = null;\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-\r
-        if(plot != null) {\r
-            // Create range axis\r
-            axis = GraphUtils.create2(graph, jfree.NumberAxis,\r
-                    l0.HasName, "NumberAxis" + UUID.randomUUID().toString(),\r
-                    l0.HasLabel, NameUtils.findFreshLabel(graph, "Y-axis", plot),\r
-                    jfree.Plot_rangeAxis_Inverse, plot,\r
-                    l0.PartOf, plot);\r
-            \r
-            // Add range axis to the plot's range axis list\r
-            Resource axisList = graph.getPossibleObject(plot, jfree.Plot_rangeAxisList);\r
-            ArrayList<Resource> list = new ArrayList<Resource>();\r
-            list.add(axis);\r
-            if(axisList == null) {\r
-                axisList = ListUtils.create(graph, list);\r
-                graph.claim(plot, jfree.Plot_rangeAxisList, axisList);\r
-            } else {\r
-                ListUtils.insertBack(graph, axisList, list);\r
-            }\r
-        }\r
-        \r
-        return axis;\r
-        \r
-    }\r
-    \r
-    /**\r
-     * Create a XYDataset and map it to axis\r
-     * @param graph WriteGraph\r
-     * @param plot Plot resource containing the dataset\r
-     * @param domainAxis Mapped domain axis for the dataset\r
-     * @param rangeAxis Mapped range axis for the dataset\r
-     * @return created dataset or null if not successful\r
-     * @throws DatabaseException\r
-     */\r
-    public static Resource createXYDataset(WriteGraph graph, Resource plot, Resource domainAxis, Resource rangeAxis) throws DatabaseException {\r
-        if(plot == null || domainAxis == null || rangeAxis == null)\r
-            return null;\r
-        \r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        \r
-        \r
-        // Create a dataset for the axis\r
-        Resource dataset = GraphUtils.create2(graph, jfree.XYDataset,\r
-                l0.HasName, "XYDataset" + UUID.randomUUID().toString(),\r
-                jfree.Dataset_mapToDomainAxis, domainAxis,\r
-                jfree.Dataset_mapToRangeAxis, rangeAxis,\r
-                jfree.Dataset_renderer, GraphUtils.create2(graph, jfree.XYLineRenderer),\r
-                l0.PartOf, plot);\r
-        \r
-        return dataset;\r
-    }\r
-\r
-    /**\r
-     * Creates a new series to a dataset\r
-     * @param graph WriteGraph\r
-     * @param dataset Dataset for the new series\r
-     * @return created series or null if unsuccessful\r
-     * @throws DatabaseException\r
-     */\r
-    public static Resource createSeries(WriteGraph graph, Resource dataset, String rvi) throws DatabaseException {\r
-        if(dataset == null) return null;\r
-        \r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        // Create series\r
-        Resource series = GraphUtils.create2(graph, jfree.Series,\r
-                l0.HasName, "Series" + UUID.randomUUID().toString(),\r
-                jfree.variableRVI, rvi == null ? " <Write variable name>" : rvi,\r
-                l0.PartOf, dataset);\r
-\r
-        // Add series to the dataset's series list\r
-        Resource seriesList = graph.getPossibleObject(dataset, jfree.Dataset_seriesList);\r
-        ArrayList<Resource> list = new ArrayList<Resource>();\r
-        list.add(series);\r
-        if(seriesList == null) {\r
-            seriesList = ListUtils.create(graph, list);\r
-            graph.claim(dataset, jfree.Dataset_seriesList, seriesList);\r
-        } else {\r
-            ListUtils.insertBack(graph, seriesList, list);\r
-        }\r
-        \r
-        return series;\r
-    }\r
-\r
-    /**\r
-     * Find the current realization uri\r
-     * \r
-     * @param graph ReadGraph\r
-     * @param chartComponent A resource from a chart (consistsOf relation in a chart)\r
-     * @return current realization uri\r
-     * @throws DatabaseException\r
-     */\r
-    public static String getCurrentRealizationURI(ReadGraph graph, Resource chartComponent) throws DatabaseException {\r
-        // Find the model where the chart is located\r
-        Resource model = graph.syncRequest(new PossibleModel(chartComponent)); \r
-        if(model == null)\r
-            return null;\r
-        \r
-        // Find the variable realization of the current experiment\r
-        String realizationURI = null;\r
-        Resource realization = graph.syncRequest(new PossibleActiveExperiment(model));\r
-        if (realization == null) {\r
-            Layer0X L0X = Layer0X.getInstance(graph);\r
-            realization = graph.getPossibleObject(model, L0X.HasBaseRealization);\r
-        }\r
-        if (realization != null)\r
-            realizationURI = graph.getURI(realization);\r
-        \r
-        return realizationURI;        \r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ExtendedNumberAxis.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ExtendedNumberAxis.java
deleted file mode 100644 (file)
index 329faad..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.data.Range;\r
-\r
-/**\r
- * NumberAxis that supports adding only one bound, lower or upper.\r
- * The standard NumberAxis disables auto adjusting if even one of the bounds is set\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class ExtendedNumberAxis  extends org.jfree.chart.axis.NumberAxis {\r
-    private static final long serialVersionUID = 3066266986472919998L;\r
-\r
-    private Double lower = null;\r
-    private Double upper = null;\r
-    /**\r
-     * Use own lower and upper bounds to support using only one of them\r
-     */\r
-    protected void autoAdjustRange() {\r
-        super.autoAdjustRange();\r
-        Range range = getRange();\r
-        Double lower = this.lower == null ? range.getLowerBound() : this.lower;\r
-        Double upper = this.upper == null ? range.getUpperBound() : this.upper;\r
-        if(lower > upper)\r
-            upper = lower + 1;\r
-        if(upper - lower < getAutoRangeMinimumSize())\r
-            upper = lower + getAutoRangeMinimumSize();\r
-        \r
-        setRange(new Range(lower, upper), false, false);\r
-\r
-    }\r
-\r
-    public void setLower(Double lower) {\r
-        this.lower = lower;\r
-    }\r
-\r
-    public void setUpper(Double upper) {\r
-        this.upper = upper;\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IAxis.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IAxis.java
deleted file mode 100644 (file)
index a544985..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.axis.Axis;\r
-import org.simantics.db.exception.DatabaseException;\r
-\r
-/**\r
- * Interface for JFreeChart.Axis type resource\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public interface IAxis extends IJFreeChartComponent {\r
-    \r
-    /**\r
-     * Returns the axis\r
-     * \r
-     * @return\r
-     * @throws DatabaseException\r
-     */\r
-    public Axis getAxis();\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IDataset.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IDataset.java
deleted file mode 100644 (file)
index cf91dd7..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.renderer.AbstractRenderer;\r
-import org.jfree.data.general.Dataset;\r
-import org.simantics.db.Resource;\r
-\r
-/**\r
- * Interface for JFreeChart.Dataset type resource\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public interface IDataset extends IJFreeChartComponent {\r
-    \r
-    /**\r
-     * Returns the JFreeChart dataset represented by the associated resource\r
-     * \r
-     * @return JFreeChart dataset\r
-     */\r
-    public Dataset getDataset();\r
-    \r
-    \r
-    /**\r
-     * Returns the renderer for this dataset\r
-     * \r
-     * @return JFreeChart renderer\r
-     */\r
-    public AbstractRenderer getRenderer();\r
-\r
-    /**\r
-     * Returns the resource of this dataset\r
-     * \r
-     * @return\r
-     */\r
-    public Resource getResource();\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IJFreeChart.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IJFreeChart.java
deleted file mode 100644 (file)
index 9c702c4..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.JFreeChart;\r
-import org.simantics.db.exception.DatabaseException;\r
-/**\r
- * Interface for JFreeChart.Chart type resource\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public interface IJFreeChart extends IJFreeChartComponent {\r
-\r
-    /**\r
-     * Returns the chart\r
-     * \r
-     * @return\r
-     * @throws DatabaseException\r
-     */\r
-    public JFreeChart getChart();\r
-    \r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IJFreeChartComponent.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IJFreeChartComponent.java
deleted file mode 100644 (file)
index 39b42e2..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-/**\r
- * Interface for all components that are used to create JFreeCharts based on org.simantics.jfreechart ontology \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public interface IJFreeChartComponent {\r
-    \r
-    /**\r
-     * Dispose this component. Disposing a component may be useful \r
-     * if the component contains listeners that need to be disposed.\r
-     */\r
-    public void dispose();\r
-    \r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IPlot.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IPlot.java
deleted file mode 100644 (file)
index ec8386e..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.plot.Plot;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-\r
-/**\r
- * Interface for JFreeChart.Plot type resource\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public interface IPlot extends IJFreeChartComponent {\r
-\r
-    /**\r
-     * Returns the plot\r
-     * \r
-     * @return Title\r
-     * @throws DatabaseException\r
-     */\r
-    public Plot getPlot();\r
-    \r
-    /**\r
-     * Returns the resource of this plot\r
-     * \r
-     * @return\r
-     */\r
-    public Resource getResource();\r
-    \r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IRenderer.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/IRenderer.java
deleted file mode 100644 (file)
index df832a4..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.renderer.AbstractRenderer;\r
-import org.simantics.db.Resource;\r
-\r
-/**\r
- * Interface for JFreeChart.Renderer type resource\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public interface IRenderer extends IJFreeChartComponent {\r
-    \r
-    /**\r
-     * Returns the JFreeChart AbstractRenderer represented by the associated resource\r
-     * \r
-     * @return JFreeChart renderer\r
-     */\r
-    public AbstractRenderer getRenderer();\r
-    \r
-    /**\r
-     * Returns the resource of this renderer\r
-     * @return\r
-     */\r
-    public Resource getResource();\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ITitle.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/ITitle.java
deleted file mode 100644 (file)
index 0728154..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.title.Title;\r
-import org.simantics.db.exception.DatabaseException;\r
-\r
-/**\r
- * Interface for JFreeChart.Title type resource\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public interface ITitle extends IJFreeChartComponent {\r
-    \r
-    /**\r
-     * Returns the title\r
-     * \r
-     * @return Title\r
-     * @throws DatabaseException\r
-     */\r
-    public Title getTitle();\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/JFreeChart.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/JFreeChart.java
deleted file mode 100644 (file)
index 8a2f79c..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import java.awt.Color;\r
-import java.awt.Font;\r
-import java.util.Collection;\r
-\r
-import javax.swing.SwingUtilities;\r
-\r
-import org.jfree.chart.title.LegendTitle;\r
-import org.jfree.chart.title.TextTitle;\r
-import org.jfree.ui.RectangleInsets;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.request.ObjectsWithType;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.procedure.Listener;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.ui.SimanticsUI;\r
-import org.simantics.utils.datastructures.Pair;\r
-\r
-/**\r
- * Class representing a complete JFreeChart.Chart\r
- * \r
- * This class supports all types of charts. The details of the chart are \r
- * defined in plots and other adapted classes.\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class JFreeChart implements IJFreeChart {\r
-\r
-    private org.jfree.chart.JFreeChart jfreechart;\r
-    private IPlot plot;\r
-    private ITitle title;\r
-    private Resource chartResource;\r
-\r
-    /**\r
-     * \r
-     * @param graph ReadGraph\r
-     * @param chartResource Resource of type JFreeChart.Chart\r
-     */\r
-    public JFreeChart(ReadGraph graph, Resource chartResource) {\r
-        this.chartResource = chartResource;\r
-\r
-        try {\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-\r
-            Collection<Resource> plotsCollection = graph.syncRequest(new ObjectsWithType(chartResource, l0.ConsistsOf, jfree.Plot));\r
-            for(Resource plotResource : plotsCollection) {\r
-                this.plot = graph.adapt(plotResource, IPlot.class);\r
-            } \r
-\r
-        } catch(DatabaseException e) {\r
-            e.printStackTrace();\r
-        }\r
-    }\r
-\r
-\r
-    JFreeChartListener listener;\r
-\r
-    /**\r
-     * Returns a new chart using the information collected in the constructor\r
-     */\r
-    @Override\r
-    public org.jfree.chart.JFreeChart getChart() {\r
-        if(plot == null)\r
-            return null;\r
-\r
-        if(jfreechart == null)\r
-            jfreechart = new org.jfree.chart.JFreeChart(plot.getPlot());\r
-\r
-        if(listener == null) {\r
-            listener = new JFreeChartListener();\r
-            SimanticsUI.getSession().asyncRequest(new Read<Pair<ITitle, Boolean>>() {\r
-\r
-                @Override\r
-                public Pair<ITitle, Boolean> perform(ReadGraph graph) throws DatabaseException {\r
-                    if(chartResource == null || !graph.hasStatement(chartResource))\r
-                        return null;\r
-                    \r
-                    JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                    Layer0 l0 = Layer0.getInstance(graph);\r
-\r
-                    Resource titleResource = graph.syncRequest(new PossibleObjectWithType(chartResource, l0.ConsistsOf, jfree.Title));\r
-                    title = graph.adapt(titleResource, ITitle.class);\r
-                    Boolean legendVisible = graph.getPossibleRelatedValue(chartResource, jfree.Chart_visibleLegend, Bindings.BOOLEAN);\r
-                    return new Pair<ITitle, Boolean>(title, legendVisible);\r
-                }\r
-            }, listener);\r
-        }\r
-\r
-        return jfreechart;\r
-    }\r
-\r
-    @Override\r
-    public void dispose() {\r
-        // Call dispose to title and plots to disable their possible listeners\r
-        if(title != null)\r
-            title.dispose();\r
-        if(listener != null)\r
-            listener.dispose();\r
-        if(plot != null)\r
-            plot.dispose();\r
-    }\r
-\r
-\r
-    private class JFreeChartListener implements Listener<Pair<ITitle, Boolean>> {\r
-\r
-        private boolean disposed = false;\r
-        private LegendTitle legend;\r
-\r
-        public void dispose() {\r
-            disposed = true;\r
-        }\r
-\r
-        @Override\r
-        public void execute(final Pair<ITitle, Boolean> result) {\r
-            if(result == null)\r
-                return;\r
-            \r
-            SwingUtilities.invokeLater(new Runnable() {\r
-                @Override\r
-                public void run() {\r
-                    if(jfreechart == null)\r
-                        return;\r
-\r
-                    jfreechart.setBackgroundPaint(Color.WHITE);\r
-                    \r
-                    if(jfreechart.getLegend() != null && !jfreechart.getLegend().equals(legend)) {\r
-                        legend = jfreechart.getLegend(); \r
-                        legend.setBorder(0, 0, 0, 0);\r
-                        int size = legend.getItemFont().getSize();\r
-                        legend.setItemFont(new Font("helvetica", Font.PLAIN, size));\r
-                    }\r
-\r
-                    if(Boolean.FALSE.equals(result.second)) {\r
-                        jfreechart.removeLegend();\r
-                    } else if (jfreechart.getLegend() == null && legend != null){\r
-                        jfreechart.addLegend(legend);\r
-                    }\r
-\r
-                    TextTitle  t = (org.jfree.chart.title.TextTitle)result.first.getTitle();\r
-                    if(t.isVisible()) {\r
-                        t.setFont(new Font("georgia", Font.BOLD, 13));\r
-                        t.setPadding(new RectangleInsets(4, 0, 0, 0));\r
-                        jfreechart.setTitle(t);\r
-                    } else {\r
-                        jfreechart.setTitle((TextTitle)null);\r
-                    }\r
-                }\r
-            });\r
-        }\r
-\r
-        @Override\r
-        public void exception(Throwable t) {\r
-            t.printStackTrace();\r
-        }\r
-\r
-        @Override\r
-        public boolean isDisposed() {\r
-            return disposed;\r
-        }\r
-\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/NumberAxis.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/NumberAxis.java
deleted file mode 100644 (file)
index eda694f..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.axis.Axis;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-\r
-/**\r
- * Class representing a JFreeChart.NumberAxis\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class NumberAxis extends AbstractAxis {\r
-\r
-    /**\r
-     *\r
-     * @param graph ReadGraph\r
-     * @param axisResource resource of type JFreeChart.NumberAxis\r
-     */\r
-    public NumberAxis(ReadGraph graph, Resource axisResource) {\r
-        super(graph, axisResource);\r
-    }\r
-\r
-\r
-    @Override\r
-    public Axis getAxis() {\r
-        axis = new ExtendedNumberAxis();\r
-        ((ExtendedNumberAxis)axis).setLower(min);\r
-        ((ExtendedNumberAxis)axis).setUpper(max);\r
-        return super.getAxis();\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/PieDataset.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/PieDataset.java
deleted file mode 100644 (file)
index 13b3ee7..0000000
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import java.awt.Color;\r
-import java.util.ArrayList;\r
-import java.util.HashMap;\r
-import java.util.List;\r
-\r
-import javax.swing.SwingUtilities;\r
-\r
-import org.jfree.chart.renderer.AbstractRenderer;\r
-import org.jfree.data.general.Dataset;\r
-import org.jfree.data.general.DefaultPieDataset;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.exception.MissingVariableException;\r
-import org.simantics.db.layer0.request.PossibleActiveExperiment;\r
-import org.simantics.db.layer0.variable.Variable;\r
-import org.simantics.db.layer0.variable.Variables;\r
-import org.simantics.db.procedure.Listener;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.diagram.G2DUtils;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.modeling.ModelingResources;\r
-import org.simantics.operation.Layer0X;\r
-import org.simantics.sysdyn.Functions;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.adapter.VariableRVIUtils;\r
-import org.simantics.sysdyn.manager.SysdynDataSet;\r
-import org.simantics.ui.SimanticsUI;\r
-\r
-/**\r
- * Class representing a PieDataset in JFreeChart ontology\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class PieDataset extends AbstractDataset {\r
-\r
-    private List<Resource> seriesList;\r
-    private String realizationURI;\r
-    private DefaultPieDataset dataset;\r
-\r
-    private HashMap<String, Color> colorMap;\r
-    private HashMap<String, Boolean> explodedMap;\r
-\r
-    public PieDataset(ReadGraph graph, Resource resource) {\r
-        super(graph, resource);\r
-\r
-        try {\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-            ModelingResources mr = ModelingResources.getInstance(graph);\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-\r
-            // Find the model where the chart is located\r
-            Resource model = resource;\r
-            do {\r
-                model = graph.getPossibleObject(model, l0.PartOf);\r
-            } while(model != null && !graph.isInstanceOf(model, mr.StructuralModel));\r
-\r
-            // Find the variable realization of the current experiment\r
-            realizationURI = null;\r
-            Resource realization = graph.syncRequest(new PossibleActiveExperiment(model));\r
-            if (realization == null) {\r
-                Layer0X L0X = Layer0X.getInstance(graph);\r
-                realization = graph.getPossibleObject(model, L0X.HasBaseRealization);\r
-            }\r
-            if (realization != null)\r
-                realizationURI = graph.getURI(realization);\r
-\r
-            if(realizationURI == null)\r
-                return; // No experiment -> No results\r
-\r
-            Resource seriesList = graph.getPossibleObject(resource, jfree.Dataset_seriesList);\r
-            if(seriesList != null) {\r
-                this.seriesList = ListUtils.toList(graph, seriesList);\r
-            }\r
-        } catch (DatabaseException e) {\r
-            e.printStackTrace();\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * Map of colors for different slices in a pie chart. Name \r
-     * indicates the key of the value.\r
-     * @return  Map of colors for different slices in a pie chart\r
-     */\r
-    public HashMap<String, Color> getColorMap() {\r
-        return colorMap;\r
-    }\r
-\r
-    /**\r
-     * Map of exploded statuses for slices in a pie chart. Name\r
-     * indicates the key of the slice.\r
-     * @return\r
-     */\r
-    public HashMap<String, Boolean> getExplodedMap() {\r
-        return explodedMap;\r
-    }\r
-\r
-    @Override\r
-    public Dataset getDataset() {\r
-        if(seriesList == null || seriesList.isEmpty() ||  SimanticsUI.getSession() == null)\r
-            return null;\r
-\r
-        if(dataset == null) {\r
-            dataset = new DefaultPieDataset();\r
-        }\r
-\r
-        if(listener == null) {\r
-            listener = new DatasetListener();\r
-            SimanticsUI.getSession().asyncRequest(new Read<ArrayList<TempSeries>>() {\r
-\r
-                @Override\r
-                public ArrayList<TempSeries> perform(ReadGraph graph) throws DatabaseException {\r
-                    JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-\r
-                    ArrayList<TempSeries> series = new ArrayList<TempSeries>();\r
-                    // Get properties for all series\r
-                    if(seriesList != null) {\r
-\r
-                        colorMap = new HashMap<String, Color>();\r
-                        explodedMap = new HashMap<String, Boolean>();\r
-\r
-                        for(Resource r : seriesList) {\r
-                            String label = graph.getPossibleRelatedValue(r, Layer0.getInstance(graph).HasLabel);\r
-                            String rvi = graph.getPossibleRelatedValue(r, jfree.variableRVI);\r
-                            if(rvi == null)\r
-                                continue;\r
-\r
-                            try {\r
-                                // Get visual properties\r
-                                Resource c = graph.getPossibleObject(r, jfree.color);\r
-                                Color color = c == null ? null : G2DUtils.getColor(graph, c);\r
-                                Boolean exploded = graph.getPossibleRelatedValue(r, jfree.Series_exploded, Bindings.BOOLEAN);\r
-\r
-                                // Get a variable for the series\r
-                                Variable v = Variables.getVariable(graph, realizationURI + rvi);\r
-\r
-                                // Get values\r
-                                Variable dsVariable = v.browsePossible(graph, "#" + Functions.ACTIVE_DATASETS + "#");\r
-                                if(dsVariable == null)\r
-                                       return series;\r
-                                \r
-                                Object object = dsVariable.getValue(graph);\r
-                                if(object == null || !(object instanceof ArrayList<?>))\r
-                                    return series;\r
-\r
-                                ArrayList<SysdynDataSet> datasets = new ArrayList<SysdynDataSet>();\r
-\r
-                                for(Object o : (ArrayList<?>)object) {\r
-                                    if(o instanceof SysdynDataSet)\r
-                                        datasets.add((SysdynDataSet)o);\r
-                                }\r
-\r
-                                String[] filter = graph.getPossibleRelatedValue(r, jfree.variableFilter);\r
-                                if(filter != null) {\r
-                                    ArrayList<SysdynDataSet> result2 = VariableRVIUtils.getDataset(datasets, filter);\r
-                                    if(result2 != null) {\r
-                                        datasets = result2;\r
-                                    }\r
-                                }\r
-\r
-                                // Find if a specific time is set for this chart\r
-                                Double chartTime = null;\r
-                                if(!datasets.isEmpty()) {\r
-                                    Layer0 l0 = Layer0.getInstance(graph);\r
-                                    Resource datasetResource = graph.getPossibleObject(r, l0.PartOf);\r
-                                    if(datasetResource != null) {\r
-                                        Resource plot = graph.getPossibleObject(datasetResource, l0.PartOf);\r
-                                        if(plot != null) {\r
-                                            Resource chart = graph.getPossibleObject(plot, l0.PartOf);\r
-                                            if(chart != null)\r
-                                                chartTime = graph.getPossibleRelatedValue(chart, jfree.Chart_time);\r
-                                        }\r
-                                    }\r
-                                }\r
-                                \r
-                                for(SysdynDataSet dataset : datasets) {\r
-                                    double[] va = dataset.values;\r
-\r
-                                    if(va == null || va.length == 0)\r
-                                        continue;\r
-\r
-                                    /*\r
-                                     *  Time\r
-                                     *  \r
-                                     *  1. find time for the individual series.\r
-                                     *  2. find time for the whole chart\r
-                                     *  3. find simulation time\r
-                                     */\r
-                                    Double time = graph.getPossibleRelatedValue(r, jfree.Series_time, Bindings.DOUBLE);\r
-                                    if(time == null)\r
-                                        time = chartTime;\r
-                                    if(time == null) {\r
-                                        // Get a variable for the experiment run\r
-                                        Variable run = Variables.getVariable(graph, realizationURI);\r
-                                        if(run == null)\r
-                                            return null;\r
-                                        Variable timeVar = run.browsePossible(graph, "#" + Functions.TIME + "#");\r
-                                        if(timeVar != null)\r
-                                            time =  timeVar.getValue(graph, Bindings.DOUBLE);\r
-                                    }\r
-                                    \r
-                                    // Value\r
-                                    Double value = null;\r
-                                    if(time == null) {\r
-                                        value = va[va.length - 1];\r
-                                    } else {\r
-                                        double[] ta = dataset.times;\r
-                                        for(int i = 0; i < ta.length; i++) {\r
-                                            double t = ta[i];\r
-                                            if(time <= t) {\r
-                                                value = va[i]; \r
-                                                break;\r
-                                            }\r
-                                        }\r
-\r
-                                        if(value == null)\r
-                                            value = va[va.length - 1];\r
-                                    }\r
-\r
-                                    String name = label == null || label.isEmpty() ? dataset.name : label;\r
-                                    if(dataset.result != null)\r
-                                        name = name + " : " + dataset.result; \r
-                                    colorMap.put(name, color);\r
-                                    explodedMap.put(name, exploded);\r
-                                    series.add(new TempSeries(name, value));\r
-                                }\r
-                            } catch (MissingVariableException e) {\r
-                                // Do nothing, if variable was not found. Move on to the next series\r
-                            }\r
-                        }\r
-                    }\r
-                    return series;\r
-                }\r
-\r
-            }, listener);\r
-        }\r
-        return dataset;\r
-    }\r
-\r
-    private DatasetListener listener;\r
-\r
-    private class DatasetListener implements Listener<ArrayList<TempSeries>> {\r
-\r
-        private boolean disposed = false;\r
-\r
-        @Override\r
-        public void execute(final ArrayList<TempSeries> series) {\r
-            // Modify series in AWT thread to avoid synchronization problems\r
-            SwingUtilities.invokeLater(new Runnable() {\r
-\r
-                @Override\r
-                public void run() {\r
-                    // Remove all series\r
-                    dataset.clear();\r
-\r
-                    // Add found series\r
-                    for(int i = 0; i < series.size(); i++) {\r
-                        TempSeries s = series.get(i);\r
-                        dataset.setValue(s.name, s.value);\r
-                    }\r
-                }\r
-            });\r
-        }\r
-\r
-        @Override\r
-        public void exception(Throwable t) {\r
-            t.printStackTrace();\r
-        }\r
-\r
-        @Override\r
-        public boolean isDisposed() {\r
-            return disposed;\r
-        }\r
-\r
-        public void dispose() {\r
-            disposed = true;\r
-        }\r
-    }\r
-\r
-    @Override\r
-    public AbstractRenderer getRenderer() {\r
-        // No renderer for pie chart\r
-        return null;\r
-    }\r
-\r
-    @Override\r
-    public void dispose() {\r
-        super.dispose();\r
-        if(listener != null) {\r
-            listener.dispose();\r
-            listener = null;\r
-        }\r
-    }\r
-\r
-\r
-    /**\r
-     * Auxiliary class containing all information needed to define a single series\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TempSeries {\r
-        public String name;\r
-        public Double value;\r
-\r
-        public TempSeries(String name, Double value) {\r
-            this.name = name;\r
-            this.value = value;\r
-        }\r
-\r
-        @Override\r
-        public String toString() {\r
-            return "TempSeries: " + name + ", " + value;\r
-        }\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/PiePlot.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/PiePlot.java
deleted file mode 100644 (file)
index 126a018..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import java.awt.Color;\r
-import java.awt.Font;\r
-import java.util.HashMap;\r
-\r
-import org.jfree.chart.labels.StandardPieSectionLabelGenerator;\r
-import org.jfree.chart.labels.StandardPieToolTipGenerator;\r
-import org.jfree.chart.plot.DefaultDrawingSupplier;\r
-import org.jfree.chart.plot.Plot;\r
-import org.jfree.data.general.Dataset;\r
-import org.jfree.data.general.DatasetChangeEvent;\r
-import org.jfree.data.general.DatasetChangeListener;\r
-import org.jfree.ui.RectangleInsets;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Class representing a PiePlot in JFreeChart ontology\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class PiePlot extends AbstractPlot {\r
-\r
-    private org.jfree.data.general.PieDataset pieDataset;\r
-    private DatasetChangeListener listener;\r
-    \r
-    public PiePlot(ReadGraph graph, Resource resource) {\r
-        super(graph, resource);\r
-    }\r
-\r
-    /**\r
-     * Pie plot class with a stricter equals condition\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class MyPiePlot extends org.jfree.chart.plot.PiePlot {\r
-\r
-        private static final long serialVersionUID = -5917620061541212934L;\r
-\r
-        @Override\r
-        public boolean equals(Object obj) {\r
-            boolean result = super.equals(obj);\r
-            if(result == true) {\r
-                org.jfree.chart.plot.PiePlot that = (org.jfree.chart.plot.PiePlot) obj;\r
-                if (this.getDataset() != that.getDataset()) {\r
-                    return false; // Normally plot does not check this. We need this to properly update the charts\r
-                }\r
-            }\r
-\r
-            return result;\r
-        }\r
-\r
-    }\r
-\r
-    @Override\r
-    protected Plot newPlot() {\r
-        MyPiePlot plot = new MyPiePlot();\r
-        plot.setToolTipGenerator(new StandardPieToolTipGenerator());\r
-        return plot;\r
-    }\r
-\r
-    @Override\r
-    protected void getOtherProperties(ReadGraph graph, PlotProperties properties) throws DatabaseException {\r
-        Boolean labelsVisible = graph.getPossibleRelatedValue(resource, JFreeChartResource.getInstance(graph).Plot_visibleLabels, Bindings.BOOLEAN);\r
-        properties.otherProperties.put("labelsVisible", labelsVisible);\r
-    }\r
-    \r
-    @Override\r
-    protected void setPlotProperties(PlotProperties properties) {\r
-        if(!(plot instanceof MyPiePlot))\r
-            return;\r
-        \r
-        final MyPiePlot piePlot = (MyPiePlot)plot;\r
-        \r
-        if(!properties.datasets.isEmpty()) {\r
-            // We assume that a pie plot has only one dataset\r
-            final IDataset ds = properties.datasets.get(0);\r
-            Dataset dataset = ((PieDataset)ds).getDataset();\r
-            \r
-            if(dataset == null)\r
-                return;\r
-\r
-            if(pieDataset != null && listener != null) {\r
-                pieDataset.removeChangeListener(listener);\r
-            }\r
-            \r
-            pieDataset = (org.jfree.data.general.PieDataset)dataset;\r
-            piePlot.setDataset(pieDataset);\r
-            \r
-            Boolean labelsVisible = (Boolean)properties.otherProperties.get("labelsVisible");\r
-            if(Boolean.FALSE.equals(labelsVisible))\r
-                piePlot.setLabelGenerator(null);\r
-            else if(piePlot.getLabelGenerator() == null)\r
-                piePlot.setLabelGenerator(new StandardPieSectionLabelGenerator());\r
-            \r
-            listener = new DatasetChangeListener() {\r
-                \r
-                @Override\r
-                public void datasetChanged(DatasetChangeEvent event) {\r
-                    HashMap<String, Color> colorMap = ((PieDataset)ds).getColorMap();\r
-                    HashMap<String, Boolean> explodedMap = ((PieDataset)ds).getExplodedMap();\r
-                    \r
-                    for(Object o : piePlot.getDataset().getKeys()) {\r
-                        if(o instanceof Comparable) {\r
-                            Comparable<?> key = (Comparable<?>)o;\r
-                            if(explodedMap.containsKey(key) && explodedMap.get(key)) {\r
-                                piePlot.setExplodePercent(key, 0.3);\r
-\r
-                            } else {\r
-                                piePlot.setExplodePercent(key, 0);\r
-                            }\r
-                        }\r
-                    }\r
-                    \r
-                    for(String name : explodedMap.keySet()) {\r
-                        Boolean exploded = explodedMap.get(name);\r
-                        if(Boolean.TRUE.equals(exploded))\r
-                            piePlot.setExplodePercent(name, 0.3);\r
-                    } \r
-                    piePlot.clearSectionPaints(false);\r
-                    piePlot.setDrawingSupplier(new DefaultDrawingSupplier());\r
-                    for(String name : colorMap.keySet())\r
-                        piePlot.setSectionPaint(name, colorMap.get(name));\r
-                }\r
-            };\r
-            \r
-            pieDataset.addChangeListener(listener);\r
-        }\r
-        \r
-        // Cleaner look: no outline borders\r
-        piePlot.setInsets(new RectangleInsets(0,0,0,0), false);\r
-        piePlot.setOutlineVisible(false);\r
-        piePlot.setLabelBackgroundPaint(Color.WHITE);\r
-        piePlot.setLabelFont(new Font("helvetica", Font.PLAIN, 11));\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/StackedBarRenderer.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/StackedBarRenderer.java
deleted file mode 100644 (file)
index cd7f4cb..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.labels.StandardCategoryToolTipGenerator;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-\r
-/**\r
- * Stacked bar renderer\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class StackedBarRenderer extends AbstractRenderer {\r
-\r
-    public StackedBarRenderer(ReadGraph graph, Resource resource) {\r
-        super(graph, resource);\r
-    }\r
-\r
-    private org.jfree.chart.renderer.category.StackedBarRenderer renderer;\r
-    \r
-    @Override\r
-    public org.jfree.chart.renderer.AbstractRenderer getRenderer() {\r
-        if(renderer == null) {\r
-            renderer = new org.jfree.chart.renderer.category.StackedBarRenderer();\r
-            renderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator());\r
-        }\r
-        return renderer;\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/TextTitle.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/TextTitle.java
deleted file mode 100644 (file)
index 7386a86..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.title.Title;\r
-import org.jfree.ui.RectangleEdge;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Class representing a JFreeChart.TextTitle\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class TextTitle implements ITitle {\r
-    \r
-    private org.jfree.chart.title.TextTitle textTitle;\r
-    private RectangleEdge position;\r
-    private String text;\r
-    private Boolean visible;\r
-    \r
-    public TextTitle(ReadGraph graph, Resource titleResource) {\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        try {\r
-            text = graph.getPossibleRelatedValue(titleResource, l0.HasLabel, Bindings.STRING);\r
-            Resource pos = graph.getPossibleObject(titleResource, jfree.Title_position);\r
-            position = getRectangleEdgePosition(graph, pos);\r
-            visible = graph.getPossibleRelatedValue(titleResource, jfree.visible, Bindings.BOOLEAN);\r
-\r
-        } catch (DatabaseException e) {\r
-            e.printStackTrace();\r
-        }\r
-    }\r
-    \r
-    /**\r
-     * Get the RectangleEdge representation for Resource position (JFreeChart.Position)\r
-     * @param graph ReadGraph \r
-     * @param position Resource of type JFreeChart.Position\r
-     * @return RectangleEdge representation for Resource position\r
-     */\r
-    private RectangleEdge getRectangleEdgePosition(ReadGraph graph, Resource position) {\r
-        if(position == null)\r
-            return null;\r
-        \r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        if(position.equals(jfree.Top))\r
-            return RectangleEdge.TOP;\r
-        else if(position.equals(jfree.Bottom))\r
-            return RectangleEdge.BOTTOM;\r
-        else if(position.equals(jfree.Left))\r
-            return RectangleEdge.LEFT;\r
-        else if(position.equals(jfree.Right))\r
-            return RectangleEdge.RIGHT;\r
-        else\r
-            return null;\r
-                    \r
-    }\r
-\r
-    @Override\r
-    public Title getTitle() {\r
-        textTitle = new org.jfree.chart.title.TextTitle(text);\r
-        if(position != null)\r
-            textTitle.setPosition(position);\r
-        if(visible != null)\r
-            textTitle.setVisible(visible);\r
-        return textTitle;\r
-    }\r
-\r
-    @Override\r
-    public void dispose() {\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYAreaRenderer.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYAreaRenderer.java
deleted file mode 100644 (file)
index 6533778..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.labels.StandardXYToolTipGenerator;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-\r
-/**\r
- * Renderer representing jfree chart renderer for xy areas\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class XYAreaRenderer extends AbstractRenderer {\r
-\r
-    private org.jfree.chart.renderer.xy.XYAreaRenderer renderer;\r
-    \r
-    public XYAreaRenderer(ReadGraph graph, Resource resource) {\r
-        super(graph, resource);\r
-    }\r
-\r
-    @Override\r
-    public org.jfree.chart.renderer.AbstractRenderer getRenderer() {\r
-        if(renderer == null) {\r
-            renderer = new org.jfree.chart.renderer.xy.XYAreaRenderer();\r
-            renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());\r
-        }\r
-        return renderer;\r
-    }\r
-\r
-}
\ No newline at end of file
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYDataset.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYDataset.java
deleted file mode 100644 (file)
index 427fa8b..0000000
+++ /dev/null
@@ -1,501 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import java.awt.BasicStroke;\r
-import java.awt.Color;\r
-import java.awt.Paint;\r
-import java.awt.Stroke;\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-import javax.swing.SwingUtilities;\r
-\r
-import org.jfree.chart.ChartColor;\r
-import org.jfree.chart.labels.StandardXYToolTipGenerator;\r
-import org.jfree.chart.plot.DefaultDrawingSupplier;\r
-import org.jfree.chart.plot.ValueMarker;\r
-import org.jfree.chart.renderer.AbstractRenderer;\r
-import org.jfree.chart.renderer.xy.AbstractXYItemRenderer;\r
-import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;\r
-import org.jfree.data.general.Dataset;\r
-import org.jfree.data.xy.DefaultXYDataset;\r
-import org.jfree.ui.Layer;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.exception.MissingVariableException;\r
-import org.simantics.db.layer0.request.PossibleActiveExperiment;\r
-import org.simantics.db.layer0.variable.Variable;\r
-import org.simantics.db.layer0.variable.Variables;\r
-import org.simantics.db.procedure.Listener;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.diagram.G2DUtils;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.modeling.ModelingResources;\r
-import org.simantics.operation.Layer0X;\r
-import org.simantics.sysdyn.Functions;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.adapter.VariableRVIUtils;\r
-import org.simantics.sysdyn.manager.SysdynDataSet;\r
-import org.simantics.ui.SimanticsUI;\r
-import org.simantics.utils.datastructures.Pair;\r
-\r
-/**\r
- * Class representing a JFreeChart.XYDataset\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class XYDataset extends AbstractDataset {\r
-\r
-    private IRenderer renderer;\r
-\r
-    public XYDataset(ReadGraph graph, final Resource datasetResource) {\r
-        super(graph, datasetResource);\r
-    }\r
-\r
-    private DefaultXYDataset dataset;\r
-    private DataSetListener datasetListener;\r
-    private TimeListener timeListener;\r
-\r
-    @Override\r
-    public Dataset getDataset() {\r
-        if(dataset == null) {\r
-            dataset = new DefaultXYDataset();\r
-        }   \r
-\r
-        if(datasetListener == null || datasetListener.isDisposed()) {\r
-            datasetListener = new DataSetListener();\r
-            SimanticsUI.getSession().asyncRequest(new Read<Pair<ArrayList<TempSeries>, IRenderer>>() {\r
-\r
-                @Override\r
-                public Pair<ArrayList<TempSeries>, IRenderer> perform(ReadGraph graph) throws DatabaseException {\r
-                    JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-\r
-                    // Renderer\r
-                    IRenderer renderer = null;\r
-                    Resource rendererResource = graph.getPossibleObject(resource, jfree.Dataset_renderer);\r
-                    if(rendererResource != null)\r
-                        renderer = graph.adapt(rendererResource, IRenderer.class);\r
-\r
-                    ArrayList<TempSeries> series = new ArrayList<TempSeries>();\r
-\r
-                    String realizationURI = getRealizationURI(graph);\r
-\r
-                    if(realizationURI == null)\r
-                        return new Pair<ArrayList<TempSeries>, IRenderer>(series, renderer); // No experiment -> No results\r
-\r
-                    // Get a variable for the x-axis (if not time)\r
-                    double[] domainValues = null;\r
-                    Resource domainAxis = graph.getPossibleObject(resource, jfree.Dataset_mapToDomainAxis);\r
-                    if(domainAxis != null) {\r
-                        String rvi = graph.getPossibleRelatedValue(domainAxis, jfree.variableRVI);\r
-                        if(rvi != null && !rvi.isEmpty()) {\r
-                            try {\r
-                                Variable domainVariable = Variables.getVariable(graph, realizationURI + rvi);\r
-                                Variable valuesVariable = domainVariable.browsePossible(graph, "#" + Functions.VALUES +"#");\r
-                                if(valuesVariable != null) {\r
-                                       double[][] valuesArray = valuesVariable.getValue(graph);\r
-                                       if(valuesArray.length > 0)\r
-                                               domainValues = valuesArray[0];\r
-                                }\r
-                            } catch(MissingVariableException e) {\r
-                                //Do nothing, use time as domain axis\r
-                            }\r
-                        }\r
-                    }\r
-\r
-                    Resource seriesList = graph.getPossibleObject(resource, jfree.Dataset_seriesList);\r
-\r
-                    // Get properties for all series\r
-                    if(seriesList != null) {\r
-                        for(Resource r : ListUtils.toList(graph, seriesList)) {\r
-                            String rvi = graph.getPossibleRelatedValue(r, jfree.variableRVI);\r
-                            if(rvi == null)\r
-                                continue;\r
-\r
-                            try {\r
-                                // Get visual properties\r
-                                Integer width = graph.getPossibleRelatedValue(r, jfree.Series_lineWidth, Bindings.INTEGER);\r
-                                if(width == null) width = 1;\r
-\r
-                                Resource c = graph.getPossibleObject(r, jfree.color);\r
-                                Color color = c == null ? null : G2DUtils.getColor(graph, c);\r
-                                \r
-                                String label = graph.getPossibleRelatedValue(r, Layer0.getInstance(graph).HasLabel);\r
-\r
-                                // Get a variable for the series\r
-                                Variable v = Variables.getVariable(graph, realizationURI + rvi);\r
-                                if(v == null)\r
-                                    return new Pair<ArrayList<TempSeries>, IRenderer>(series, renderer);\r
-\r
-                                // Get values\r
-                                Variable dsVariable = v.browsePossible(graph, "#" + Functions.ACTIVE_DATASETS + "#");\r
-                                Object object = null;\r
-                                if(dsVariable != null)\r
-                                        object = dsVariable.getValue(graph);\r
-\r
-                                if(object == null || !(object instanceof ArrayList<?>))\r
-                                    return new Pair<ArrayList<TempSeries>, IRenderer>(series, renderer);\r
-\r
-                                ArrayList<SysdynDataSet> datasets = new ArrayList<SysdynDataSet>();\r
-\r
-                                for(Object o : (ArrayList<?>)object) {\r
-                                    if(o instanceof SysdynDataSet)\r
-                                        datasets.add((SysdynDataSet)o);\r
-                                }\r
-\r
-\r
-                                String[] filter = graph.getPossibleRelatedValue(r, jfree.variableFilter);\r
-                                if(filter != null) {\r
-                                    ArrayList<SysdynDataSet> result2 = VariableRVIUtils.getDataset(datasets, filter);\r
-                                    if(result2 != null) {\r
-                                        datasets = result2;\r
-                                    }\r
-                                }\r
-\r
-                                for(SysdynDataSet dataset : datasets) {\r
-                                    double[] va = dataset.values;\r
-\r
-                                    // Get domain axis values (time OR other variable) \r
-                                    double[] ta;\r
-                                    if(domainValues != null) {\r
-                                        ta = domainValues;\r
-\r
-                                        // If domainAxis is other than time, parameter values size is different. \r
-                                        if(domainValues.length > va.length) {\r
-                                            double value = va[0];\r
-                                            va = new double[domainValues.length];\r
-                                            for(int i = 0; i < domainValues.length; i++)\r
-                                                va[i] = value;\r
-                                        }\r
-\r
-                                        // If domainAxis is a parameter, the domainValues array is too short\r
-                                        if(domainValues.length < va.length && domainValues.length == 2 && domainValues[0] == domainValues[1]) {\r
-                                            double value = domainValues[0];\r
-                                            ta = new double[va.length];\r
-                                            for(int i = 0; i < va.length; i++)\r
-                                                ta[i] = value;\r
-                                        }\r
-\r
-                                    } else {\r
-                                        ta = dataset.times;\r
-                                    }\r
-\r
-                                    if(ta!=null && va!=null && (va.length == ta.length)) {\r
-                                        // Add series if everything OK\r
-                                        String name = dataset.name;\r
-                                        if(label != null)\r
-                                            name = label;\r
-                                        if(dataset.result != null && !dataset.result.isEmpty())\r
-                                            name = name + " : " + dataset.result;\r
-                                        series.add(new TempSeries(name, new double[][] {ta, va}, width, color));\r
-                                        if(ta.length == 0 || va.length == 0)\r
-                                            System.out.println(dataset.name + " : " + dataset.result + ". Sizes: " + va.length + " and " + ta.length);\r
-                                    }\r
-                                }\r
-\r
-                            } catch (MissingVariableException e) {\r
-                                // Do nothing, if variable was not found. Move on to the next series\r
-                            }\r
-                        }\r
-                    }\r
-                    return new Pair<ArrayList<TempSeries>, IRenderer>(series, renderer);\r
-                }\r
-\r
-            }, datasetListener); \r
-        }\r
-\r
-        if(timeListener == null || timeListener.isDisposed()) {\r
-            timeListener = new TimeListener();\r
-            SimanticsUI.getSession().asyncRequest(new Read<Double>() {\r
-                @Override\r
-                public Double perform(ReadGraph graph) throws DatabaseException {\r
-                    JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                    // Get properties for all series\r
-                    Resource series = graph.getPossibleObject(resource, jfree.Dataset_seriesList);\r
-                    if(series != null) {\r
-                        List<Resource> seriesList = ListUtils.toList(graph, series);\r
-                        if(seriesList != null) {\r
-                            String realizationURI = getRealizationURI(graph);\r
-                            for(Resource r : seriesList) {\r
-                                String rvi = graph.getPossibleRelatedValue(r, jfree.variableRVI);\r
-                                if(rvi == null)\r
-                                    continue;\r
-                                try {\r
-                                       // Get a variable for the experiment run\r
-                                       Variable v = Variables.getVariable(graph, realizationURI);\r
-                                       if(v == null)\r
-                                               return null;\r
-                                       Variable timeVar = v.browsePossible(graph, "#" + Functions.TIME + "#");\r
-                                       if(timeVar != null)\r
-                                           return timeVar.getValue(graph, Bindings.DOUBLE);\r
-                                } catch (MissingVariableException e) {\r
-                                       // Do nothing, if variable was not found.\r
-                                }\r
-                            }\r
-                        }\r
-                    }\r
-                    return null;\r
-                }\r
-\r
-            }, timeListener);\r
-        }\r
-        return dataset;\r
-    }\r
-\r
-    /**\r
-     * Class for identifying a time marker in a plot\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TimeMarker extends ValueMarker {\r
-        private static final long serialVersionUID = 2018755066561629172L;\r
-\r
-        public TimeMarker(double value, Paint paint, Stroke stroke) {\r
-            super(value, paint, stroke);\r
-        }\r
-    }\r
-\r
-    private class DataSetListener implements Listener<Pair<ArrayList<TempSeries>, IRenderer>> {\r
-\r
-        private boolean disposed = false;\r
-\r
-        public void dispose() {\r
-            disposed = true;\r
-        }\r
-\r
-        @Override\r
-        public boolean isDisposed() {\r
-            return disposed;\r
-        }\r
-\r
-        @Override\r
-        public void execute(Pair<ArrayList<TempSeries>, IRenderer> result) {\r
-            final ArrayList<TempSeries> series = result.first;\r
-            renderer = result.second;\r
-            \r
-            // Modify series in AWT thread to avoid synchronization problems\r
-            SwingUtilities.invokeLater(new Runnable() {\r
-\r
-                @Override\r
-                public void run() {\r
-\r
-                    org.jfree.chart.plot.XYPlot plot = ((AbstractXYItemRenderer)getRenderer()).getPlot();\r
-                    if(plot != null) {\r
-                        /*\r
-                         *  Drawing supplier with a modified first yellow. The default first\r
-                         *  yellow is too light to be visible against a white background\r
-                         */\r
-                        Paint[] paintSequence = ChartColor.createDefaultPaintArray();\r
-                        paintSequence[3] = new Color(0xFF, 0xDD, 0x00);\r
-                        DefaultDrawingSupplier drawingsupplier = new DefaultDrawingSupplier(\r
-                                paintSequence,\r
-                                DefaultDrawingSupplier.DEFAULT_FILL_PAINT_SEQUENCE,\r
-                                DefaultDrawingSupplier.DEFAULT_OUTLINE_PAINT_SEQUENCE,\r
-                                DefaultDrawingSupplier.DEFAULT_STROKE_SEQUENCE,\r
-                                DefaultDrawingSupplier.DEFAULT_OUTLINE_STROKE_SEQUENCE,\r
-                                DefaultDrawingSupplier.DEFAULT_SHAPE_SEQUENCE);\r
-                        plot.setDrawingSupplier(drawingsupplier);\r
-                    }\r
-                    // Remove all series\r
-                    for(int i = dataset.getSeriesCount() - 1; i >= 0; i-- ) {\r
-                        dataset.removeSeries(dataset.getSeriesKey(i));\r
-                    }\r
-\r
-                    // Add found series\r
-                    for(int i = 0; i < series.size(); i++) {\r
-                        TempSeries s = series.get(i);\r
-                        dataset.addSeries(s.name, s.values);\r
-                        getRenderer().setSeriesStroke(i, new BasicStroke((float)s.width));\r
-                        getRenderer().setSeriesPaint(i, s.color);\r
-                    } \r
-                }\r
-            });\r
-        }\r
-\r
-        @Override\r
-        public void exception(Throwable t) {\r
-            t.printStackTrace();\r
-        }\r
-\r
-    }\r
-\r
-\r
-    /**\r
-     * Listener for updating the time indicator for XY plots\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TimeListener implements Listener<Double> {\r
-\r
-        private ValueMarker marker;\r
-        private boolean disposed = false;\r
-        private Stroke dashStroke = new BasicStroke(1.0f, BasicStroke.CAP_BUTT,\r
-                BasicStroke.JOIN_MITER, 10.0f, new float[] {5.0f, 3.0f, 1.0f, 3.0f}, 0.0f);\r
-\r
-        public TimeListener() {\r
-            this.marker = new TimeMarker(0.0, Color.red, dashStroke);\r
-        }\r
-\r
-        public void dispose() {\r
-            this.disposed = true;\r
-            if(marker != null) {\r
-                org.jfree.chart.plot.XYPlot plot = ((AbstractXYItemRenderer)getRenderer()).getPlot();\r
-                if(plot != null)\r
-                    plot.removeDomainMarker(marker);\r
-            }\r
-        }\r
-\r
-        @Override\r
-        public boolean isDisposed() {\r
-            return disposed;\r
-        }\r
-\r
-        @Override\r
-        public void execute(final Double time) {\r
-            // Modify in AWT thread to avoid synchronization problems\r
-            SwingUtilities.invokeLater(new Runnable() {\r
-\r
-                @Override\r
-                public void run() {\r
-                    org.jfree.chart.plot.XYPlot plot = ((AbstractXYItemRenderer)getRenderer()).getPlot();\r
-\r
-                    if(plot == null)\r
-                        return;\r
-\r
-                    plot.removeDomainMarker(marker);\r
-                    if(time != null) {\r
-                        marker.setValue(time);\r
-                        if(plot.getDomainMarkers(Layer.FOREGROUND) == null || !plot.getDomainMarkers(Layer.FOREGROUND).contains(marker)) {\r
-                            int i = 0;\r
-                            for(i = 0; i < plot.getDatasetCount(); i++) {\r
-                                if(plot.getDataset(i) != null && plot.getDataset(i).equals(dataset))\r
-                                    break;\r
-                            }\r
-                            plot.addDomainMarker(i, marker, Layer.FOREGROUND);\r
-                        }\r
-                    }\r
-\r
-                }\r
-            });\r
-        }\r
-\r
-        @Override\r
-        public void exception(Throwable t) {\r
-            t.printStackTrace();\r
-        }\r
-\r
-    }\r
-\r
-    @Override\r
-    public void dispose() {\r
-        if(timeListener != null) {\r
-            timeListener.dispose();\r
-            timeListener = null;\r
-        }\r
-\r
-        if(datasetListener != null) {\r
-            datasetListener.dispose();\r
-            datasetListener = null;\r
-        }\r
-    }\r
-\r
-\r
-    /**\r
-     * Auxiliary class containing all information needed to define a single series\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TempSeries {\r
-        public double[][] values;\r
-        public String name;\r
-        public int width;\r
-        public Color color;\r
-\r
-        public TempSeries(String name, double[][] values, int width, Color color) {\r
-            this.name = name;\r
-            this.values = values;\r
-            this.width = width;\r
-            this.color = color;\r
-        }\r
-    }\r
-\r
-    @Override\r
-    public AbstractRenderer getRenderer() {\r
-        if(renderer == null) {\r
-\r
-            try {\r
-                renderer = SimanticsUI.getSession().syncRequest(new Read<IRenderer>() {\r
-\r
-                    @Override\r
-                    public IRenderer perform(ReadGraph graph) throws DatabaseException {\r
-                        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                        IRenderer renderer = null;\r
-                        Resource rendererResource = graph.getPossibleObject(resource, jfree.Dataset_renderer);\r
-                        if(rendererResource != null)\r
-                            renderer = graph.adapt(rendererResource, IRenderer.class);\r
-                        return renderer;\r
-                    }\r
-                });\r
-            } catch (DatabaseException e) {\r
-            }\r
-            if(renderer == null) {\r
-                XYLineAndShapeRenderer renderer = new XYLineAndShapeRenderer(true, false);\r
-                renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());\r
-                return renderer;\r
-            } else {\r
-                return renderer.getRenderer();\r
-            }\r
-        } else {\r
-            return renderer.getRenderer();\r
-        }\r
-    }\r
-\r
-    /**\r
-     * Get the realization uri of the current dataset resource\r
-     * @param graph ReadGraph\r
-     * @return realization uri for current dataset resource\r
-     * @throws DatabaseException\r
-     */\r
-    private String getRealizationURI(ReadGraph graph) throws DatabaseException {\r
-        if(resource == null)\r
-            return null;\r
-\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        ModelingResources mr = ModelingResources.getInstance(graph);\r
-\r
-        // Find the model where the chart is located\r
-        Resource model = resource;\r
-        do {\r
-            model = graph.getPossibleObject(model, l0.PartOf);\r
-        } while(model != null && !graph.isInstanceOf(model, mr.StructuralModel));\r
-\r
-        if(model == null)\r
-            return null;\r
-\r
-        // Find the variable realization of the current experiment\r
-        String realizationURI = null;\r
-        Resource realization = graph.syncRequest(new PossibleActiveExperiment(model));\r
-        if (realization == null) {\r
-            Layer0X L0X = Layer0X.getInstance(graph);\r
-            realization = graph.getPossibleObject(model, L0X.HasBaseRealization);\r
-        }\r
-        if (realization != null)\r
-            realizationURI = graph.getURI(realization);\r
-\r
-        return realizationURI;\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYLineRenderer.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYLineRenderer.java
deleted file mode 100644 (file)
index cb2a6d1..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.labels.StandardXYToolTipGenerator;\r
-import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-\r
-/**\r
- * Renderer representing jfree chart renderer for xy lines\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class XYLineRenderer extends AbstractRenderer {\r
-\r
-    XYLineAndShapeRenderer renderer;\r
-    \r
-    public XYLineRenderer(ReadGraph graph, Resource resource) {\r
-        super(graph, resource);\r
-    }\r
-\r
-    @Override\r
-    public org.jfree.chart.renderer.AbstractRenderer getRenderer() {\r
-        if(renderer == null) {\r
-            renderer = new XYLineAndShapeRenderer(true, false);\r
-            renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());\r
-        }\r
-        return renderer;\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYPlot.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/XYPlot.java
deleted file mode 100644 (file)
index bea1ce2..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart;\r
-\r
-import org.jfree.chart.axis.ValueAxis;\r
-import org.jfree.chart.plot.Plot;\r
-import org.jfree.chart.renderer.xy.XYItemRenderer;\r
-import org.jfree.data.xy.XYDataset;\r
-import org.jfree.ui.RectangleInsets;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Class representing a JFreeChart.XYPlot\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class XYPlot extends AbstractPlot {\r
-\r
-    public XYPlot(ReadGraph graph, Resource plotResource) {\r
-        super(graph, plotResource);\r
-    }\r
-\r
-    @Override\r
-    protected Plot newPlot() {\r
-        return new org.jfree.chart.plot.XYPlot(null, null, null, null);\r
-    }\r
-\r
-    @Override\r
-    protected void getOtherProperties(ReadGraph graph, PlotProperties properties) throws DatabaseException {\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Boolean visibleGrid = graph.getPossibleRelatedValue(resource, jfree.Plot_visibleGrid);\r
-        properties.otherProperties.put("visibleGrid", visibleGrid);\r
-        if(!properties.datasets.isEmpty()) {\r
-            IDataset idataset = properties.datasets.get(0);\r
-            Resource renderer = graph.getPossibleObject(idataset.getResource(), jfree.Dataset_renderer);\r
-            if(renderer != null) {\r
-                properties.otherProperties.put("renderer", graph.adapt(renderer, IRenderer.class));\r
-            }\r
-        }\r
-    }\r
-\r
-    @Override\r
-    protected void setPlotProperties(PlotProperties properties) {\r
-        if(!(plot instanceof org.jfree.chart.plot.XYPlot))\r
-            return;\r
-\r
-        org.jfree.chart.plot.XYPlot xyplot = (org.jfree.chart.plot.XYPlot)plot;\r
-        xyplot.clearDomainAxes();\r
-        xyplot.clearRangeAxes();\r
-\r
-        for(int i = 0; i < properties.ranges.size(); i++) {\r
-            xyplot.setRangeAxis(i, (ValueAxis)properties.ranges.get(i).getAxis());\r
-        }\r
-\r
-        for(int i = 0; i < properties.domains.size(); i++) {\r
-            xyplot.setDomainAxis(i, (ValueAxis)properties.domains.get(i).getAxis());\r
-        }\r
-\r
-        IAxis axis;\r
-        for(int i = 0; i < properties.datasets.size(); i++) {\r
-            IDataset dataset = properties.datasets.get(i);\r
-            xyplot.setDataset(i, (XYDataset)dataset.getDataset());\r
-            xyplot.setRenderer(i, (XYItemRenderer)dataset.getRenderer());\r
-            axis = properties.rangeMappings.get(dataset);\r
-            if(axis != null && properties.ranges.contains(axis))\r
-                xyplot.mapDatasetToRangeAxis(i, properties.ranges.indexOf(axis));\r
-            axis = properties.domainMappings.get(dataset);\r
-            if(axis != null && properties.ranges.contains(axis))\r
-                xyplot.mapDatasetToDomainAxis(i, properties.domains.indexOf(axis));\r
-        }\r
-\r
-        Boolean visibleGrid = (Boolean)properties.otherProperties.get("visibleGrid");\r
-        if(visibleGrid == null)\r
-            visibleGrid = true;\r
-\r
-        xyplot.setRangeGridlinesVisible(visibleGrid);\r
-        xyplot.setDomainGridlinesVisible(visibleGrid);\r
-\r
-        // Cleaner look: no outline borders\r
-        xyplot.setInsets(new RectangleInsets(2,5,2,10), false);\r
-        xyplot.setOutlineVisible(false);\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartBoundsOutline.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartBoundsOutline.java
deleted file mode 100644 (file)
index ef22ada..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.simantics.sysdyn.ui.trend.chart.element;\r
-\r
-import java.awt.geom.Rectangle2D;\r
-\r
-import org.simantics.g2d.diagram.IDiagram;\r
-import org.simantics.g2d.element.ElementHints;\r
-import org.simantics.g2d.element.IElement;\r
-import org.simantics.g2d.element.handler.LifeCycle;\r
-import org.simantics.g2d.element.handler.impl.BoundsOutline;\r
-\r
-/**\r
- * Outline with default bounds. Needed to avoid crashing when trying to rotate chart elements.\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class ChartBoundsOutline extends BoundsOutline implements LifeCycle {\r
-    private static final long serialVersionUID = -3819495313008722843L;\r
-    \r
-    Rectangle2D defaultBounds;\r
-    \r
-    public ChartBoundsOutline(Rectangle2D defaultBounds) {\r
-        this.defaultBounds = defaultBounds;\r
-    }\r
-\r
-    @Override\r
-    public void onElementCreated(IElement e) {\r
-        e.setHint(ElementHints.KEY_BOUNDS, defaultBounds);\r
-    }\r
-\r
-    @Override\r
-    public void onElementDestroyed(IElement e) {}\r
-    @Override\r
-    public void onElementActivated(IDiagram d, IElement e) {}\r
-    @Override\r
-    public void onElementDeactivated(IDiagram d, IElement e) {}\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartElementFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartElementFactory.java
deleted file mode 100644 (file)
index 142774e..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.element;\r
-\r
-import java.awt.BasicStroke;\r
-import java.awt.Shape;\r
-import java.awt.geom.AffineTransform;\r
-import java.awt.geom.Path2D;\r
-import java.awt.geom.QuadCurve2D;\r
-import java.awt.geom.Rectangle2D;\r
-\r
-import org.jfree.chart.JFreeChart;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.WriteRequest;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.diagram.adapter.ElementFactory;\r
-import org.simantics.diagram.adapter.ElementFactoryUtil;\r
-import org.simantics.diagram.adapter.SyncElementFactory;\r
-import org.simantics.diagram.elements.ElementPropertySetter;\r
-import org.simantics.diagram.synchronization.CompositeHintSynchronizer;\r
-import org.simantics.diagram.synchronization.IHintSynchronizer;\r
-import org.simantics.diagram.synchronization.ISynchronizationContext;\r
-import org.simantics.diagram.synchronization.SynchronizationHints;\r
-import org.simantics.diagram.synchronization.graph.DiagramGraphUtil;\r
-import org.simantics.diagram.synchronization.graph.RemoveElement;\r
-import org.simantics.diagram.synchronization.graph.TransformSynchronizer;\r
-import org.simantics.g2d.canvas.ICanvasContext;\r
-import org.simantics.g2d.diagram.IDiagram;\r
-import org.simantics.g2d.element.ElementClass;\r
-import org.simantics.g2d.element.ElementUtils;\r
-import org.simantics.g2d.element.IElement;\r
-import org.simantics.g2d.element.handler.LifeCycle;\r
-import org.simantics.g2d.element.handler.impl.DefaultTransform;\r
-import org.simantics.g2d.element.handler.impl.StaticObjectAdapter;\r
-import org.simantics.g2d.element.handler.impl.StaticSymbolImageInitializer;\r
-import org.simantics.g2d.element.handler.impl.StaticSymbolImpl;\r
-import org.simantics.g2d.image.Image;\r
-import org.simantics.g2d.image.impl.ShapeImage;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.trend.chart.IJFreeChart;\r
-import org.simantics.utils.datastructures.hints.IHintContext.Key;\r
-import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;\r
-\r
-/**\r
- * Element factory for creating chart elements to diagrams\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class ChartElementFactory extends SyncElementFactory {\r
-\r
-    private static final String         CLASS_ID            = "Chart";\r
-    public  static final ElementFactory INSTANCE            = new ChartElementFactory();\r
-    public  static final Image          STATIC_IMAGE        = new ShapeImage(getChartShape(), null, new BasicStroke(1f), true);\r
-    public  static final double         SYMBOL_CHART_SIZE   = 10.0;\r
-    public  static final Key            KEY_CHART_COMPONENT = new KeyOf(Resource.class, "CHART_COMPONENT");     \r
-    public  static final Key            KEY_CHART           = new KeyOf(JFreeChart.class, "CHART");       \r
-    \r
-    static Shape getChartShape() {\r
-        \r
-        Path2D path = new Path2D.Double();\r
-        // First create the axis for a chart symbol\r
-        path.moveTo(-SYMBOL_CHART_SIZE, -SYMBOL_CHART_SIZE);\r
-        path.lineTo(-SYMBOL_CHART_SIZE,  SYMBOL_CHART_SIZE);\r
-        path.lineTo( SYMBOL_CHART_SIZE,  SYMBOL_CHART_SIZE);\r
-\r
-        // Then a curve to the chart\r
-        QuadCurve2D curve = new QuadCurve2D.Double(\r
-                -SYMBOL_CHART_SIZE + 1,  SYMBOL_CHART_SIZE - 1,\r
-                SYMBOL_CHART_SIZE - 5,  SYMBOL_CHART_SIZE - 5,\r
-                SYMBOL_CHART_SIZE - 1, -SYMBOL_CHART_SIZE + 3);\r
-\r
-        // Connect shapes\r
-        path.append(curve, false);\r
-        return path;\r
-    }\r
-\r
-    // Hint synchronizer for synchronizing transform and bounds\r
-    private static final IHintSynchronizer HINT_SYNCHRONIZER = new CompositeHintSynchronizer(\r
-            TransformSynchronizer.INSTANCE);\r
-\r
-    public static ElementClass create(ReadGraph graph, Resource chart) throws DatabaseException {\r
-        return ElementClass.compile(\r
-                new ChartSceneGraph(),\r
-                new Initializer(chart),\r
-                new StaticObjectAdapter(JFreeChartResource.getInstance(graph).ChartElement),\r
-                DefaultTransform.INSTANCE,\r
-                StaticSymbolImageInitializer.INSTANCE,\r
-                new StaticSymbolImpl(STATIC_IMAGE),\r
-                new ChartBoundsOutline(new Rectangle2D.Double(-20, -20, 60, 40)),\r
-                new ElementPropertySetter(ChartSceneGraph.KEY_SG_NODE)\r
-                ).setId(CLASS_ID);\r
-    }\r
-\r
-    public ElementClass create(ReadGraph graph, ICanvasContext canvas, IDiagram diagram, Resource elementType) throws DatabaseException {\r
-        return create(graph, null);\r
-    }\r
-\r
-    @Override\r
-    public void load(ReadGraph g, ICanvasContext canvas, final IDiagram diagram, Resource element, final IElement e) throws DatabaseException {\r
-\r
-        Resource chartResource;\r
-        ElementPropertySetter ps = e.getElementClass().getSingleItem(ElementPropertySetter.class);\r
-        ps.loadProperties(e, element, g);\r
-        \r
-        AffineTransform at = DiagramGraphUtil.getAffineTransform(g, element);\r
-        // Hack for disabling all rotations in chart elements\r
-        double x = at.getTranslateX();\r
-        double y = at.getTranslateY();\r
-        at.setToRotation(0);\r
-        at.setToTranslation(x, y);\r
-        ElementUtils.setTransform(e, at); // Set hint transform without rotations\r
-        ps.overrideProperty(e, "Transform", at); // Set property Transform without rotations\r
-        \r
-        e.setHint(SynchronizationHints.HINT_SYNCHRONIZER, HINT_SYNCHRONIZER);\r
-        \r
-\r
-        Object o = e.getHint(KEY_CHART_COMPONENT);\r
-        if(o == null || !(o instanceof Resource)) {\r
-            chartResource = g.getPossibleObject(element, JFreeChartResource.getInstance(g).ChartElement_component);\r
-        } else {\r
-            chartResource = (Resource)o;\r
-        }\r
-\r
-        if(chartResource == null || !g.hasStatement(chartResource))  {\r
-            // Remove element if there is no chart resource for it        \r
-            final ISynchronizationContext syncContext = ElementFactoryUtil.getContextChecked(diagram); \r
-            g.asyncRequest(new WriteRequest() {\r
-                \r
-                @Override\r
-                public void perform(WriteGraph graph) throws DatabaseException {\r
-                    new RemoveElement(syncContext, diagram, e).perform(graph);                    \r
-                }\r
-            });\r
-            return;\r
-        }\r
-\r
-        IJFreeChart ichart = g.adapt(chartResource, IJFreeChart.class);\r
-\r
-        if(ichart != null) {\r
-            JFreeChart chart = ichart.getChart();\r
-            e.setHint(KEY_CHART, chart);\r
-        }\r
-\r
-    }\r
-\r
-\r
-    /**\r
-     * Initializer for setting a chart component for element\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    static class Initializer implements LifeCycle {\r
-        private static final long serialVersionUID = -5822080013184271204L;\r
-        Object component;\r
-\r
-        Initializer(Object component) {\r
-            this.component = component;\r
-        }\r
-\r
-        @Override\r
-        public void onElementCreated(IElement e) {\r
-            if(component != null) e.setHint(KEY_CHART_COMPONENT, component);\r
-        }\r
-\r
-        @Override\r
-        public void onElementActivated(IDiagram d, IElement e) {}\r
-        @Override\r
-        public void onElementDeactivated(IDiagram d, IElement e) {}\r
-        @Override\r
-        public void onElementDestroyed(IElement e) {}\r
-    };\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartElementWriter.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartElementWriter.java
deleted file mode 100644 (file)
index 31ef8da..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.element;\r
-\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.diagram.synchronization.graph.ElementWriter;\r
-import org.simantics.g2d.element.IElement;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Element writer for chart elements. ChartElementWriter stores\r
- * the reference to a chart definition into the element resource\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class ChartElementWriter implements ElementWriter {\r
-\r
-    @Override\r
-    public void addToGraph(WriteGraph graph, IElement element, Resource elementResource) throws DatabaseException {\r
-        Resource chartComponent = element.getHint(ChartElementFactory.KEY_CHART_COMPONENT);\r
-        if (chartComponent == null)\r
-            throw new IllegalArgumentException("KEY_CHART_COMPONENT hint not set");\r
-        \r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        graph.claim(elementResource, jfree.ChartElement_component, chartComponent);\r
-    }\r
-\r
-    @Override\r
-    public void removeFromGraph(WriteGraph graph, Resource elementResource) throws DatabaseException {\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartNode.java
deleted file mode 100644 (file)
index c1c0d43..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2012 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.element;\r
-\r
-import java.awt.BasicStroke;\r
-import java.awt.Color;\r
-import java.awt.Graphics2D;\r
-import java.awt.Stroke;\r
-import java.awt.geom.AffineTransform;\r
-import java.awt.geom.Line2D;\r
-import java.awt.geom.Point2D;\r
-import java.awt.geom.Rectangle2D;\r
-\r
-import javax.swing.JPanel;\r
-\r
-import org.jfree.chart.ChartPanel;\r
-import org.jfree.chart.JFreeChart;\r
-import org.simantics.scenegraph.ISelectionPainterNode;\r
-import org.simantics.scenegraph.g2d.events.EventTypes;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent.MouseButtonPressedEvent;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent.MouseButtonReleasedEvent;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent.MouseDragBegin;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent.MouseMovedEvent;\r
-import org.simantics.scenegraph.swing.ComponentNode;\r
-import org.simantics.scenegraph.utils.GeometryUtils;\r
-import org.simantics.scenegraph.utils.NodeUtil;\r
-\r
-/**\r
- * Chart node for displaying jfreechart charts in diagrams\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class ChartNode extends ComponentNode<JPanel> implements ISelectionPainterNode {\r
-\r
-    private static final long serialVersionUID = 5013911689968911010L;\r
-    private boolean hover = false;\r
-    private boolean dragging = false;\r
-\r
-    private ResizeListener resizeListener; \r
-\r
-    protected transient JFreeChart chart = null;\r
-\r
-    public boolean dragging() {\r
-        return dragging;\r
-    }\r
-\r
-    public void setChart(JFreeChart chart) {\r
-        this.chart = chart;\r
-    }\r
-\r
-    public void setResizeListener(ResizeListener listener) {\r
-        this.resizeListener = listener;\r
-    }\r
-\r
-    @SyncField({"hover"})\r
-    public void setHover(boolean hover) {\r
-        this.hover = hover;\r
-        repaint();\r
-    }\r
-\r
-    @Override\r
-    public void cleanup() {\r
-        removeEventHandler(this);\r
-        super.cleanup();\r
-    }\r
-\r
-    @Override\r
-    public void init() {\r
-        super.init();\r
-    }\r
-\r
-    public static void expand(Rectangle2D rectangle, double scaleX, double scaleY) {\r
-        GeometryUtils.expandRectangle(rectangle,\r
-                5 * scaleY > 5 ? 5 * scaleY : 5, \r
-                        3 * scaleY > 3 ? 3 * scaleY : 3, \r
-                                3 * scaleX > 3 ? 3 * scaleX : 3, \r
-                                        3 * scaleX > 3 ? 3 * scaleX : 3);\r
-    }\r
-\r
-    @Override\r
-    public void render(Graphics2D g2d) {\r
-        if (component == null && chart != null) {\r
-            // Need the chart, so this cannot be done during initialization\r
-            component = new ChartPanel(chart, false);\r
-            ((ChartPanel)component).setRefreshBuffer(false);\r
-            component.setIgnoreRepaint(true); \r
-            component.setDoubleBuffered(false);\r
-            if(bounds != null) {\r
-                component.setBounds(0, 0, 0, 0);\r
-            }\r
-            super.init();\r
-            addEventHandler(this);\r
-        }\r
-\r
-        if (component != null) {\r
-            AffineTransform ot = g2d.getTransform();\r
-            g2d.transform(transform);\r
-            double scaleX = g2d.getTransform().getScaleX();\r
-            double scaleY = g2d.getTransform().getScaleY();\r
-\r
-            AffineTransform at = new AffineTransform(transform);\r
-            synchronized(transform) {\r
-                at.setToTranslation(bounds.getMinX(), bounds.getMinY());\r
-                at.scale(1/scaleX, 1/scaleY);\r
-            }\r
-            g2d.transform(at);\r
-            int width = (int)(bounds.getWidth() * scaleX);\r
-            int height = (int)(bounds.getHeight() * scaleY);\r
-\r
-            if(hover || dragging) {\r
-                // Borders\r
-                Color orig = g2d.getColor();\r
-                BasicStroke oldStroke = (BasicStroke) g2d.getStroke();\r
-                g2d.setColor(Color.LIGHT_GRAY);\r
-                Rectangle2D b = new Rectangle2D.Double(0, 0, width, height);\r
-                Rectangle2D r = b.getBounds2D();\r
-                expand(r, 1 * scaleX, 1 * scaleY);\r
-                g2d.fill(r);\r
-\r
-                // Lower right corner for dragging\r
-                double x = r.getMaxX() - (0.33 * scaleX);\r
-                double y = r.getMaxY() - (0.33 * scaleY);\r
-\r
-                if(r.getMaxX() - x > 0.4) {                \r
-                    // if there is enough space, use decorated corner\r
-                    BasicStroke hilightStroke = new BasicStroke(oldStroke.getLineWidth() * 3);\r
-                    for(int i = 1; i < 4; i++) {\r
-                        Line2D line = new Line2D.Double(\r
-                                x - (i * scaleX), \r
-                                y, \r
-                                x, \r
-                                y - (i * scaleY));\r
-\r
-                        g2d.setStroke(hilightStroke);\r
-                        g2d.setColor(Color.GRAY);\r
-                        g2d.draw(line);\r
-\r
-                        g2d.setStroke(oldStroke);\r
-                        g2d.setColor(Color.BLACK);\r
-                        g2d.draw(line);\r
-                    }\r
-\r
-\r
-                } else {\r
-                    // not enough space, use a non-decorated corner\r
-                    float f = 3;\r
-                    Rectangle2D corner = new Rectangle2D.Double(r.getMaxX() - f, r.getMaxY() - f, f, f);\r
-                    g2d.setColor(Color.DARK_GRAY);\r
-                    g2d.fill(corner);\r
-                }\r
-\r
-                g2d.setStroke(oldStroke);\r
-                g2d.setColor(orig);\r
-            }\r
-\r
-            boolean selected = NodeUtil.isSelected(this, 1);\r
-            if (selected) {\r
-                Color orig = g2d.getColor();\r
-                Stroke origStroke = g2d.getStroke();\r
-\r
-                g2d.setColor(Color.RED);\r
-                double s = GeometryUtils.getScale(g2d.getTransform());\r
-                g2d.setStroke(new BasicStroke(1f * s < 1f ? 1f : 1f * (float)s));\r
-\r
-                Rectangle2D b = new Rectangle2D.Double(0, 0, width, height);\r
-                Rectangle2D r = b.getBounds2D();\r
-                expand(r, scaleX, scaleY);\r
-                g2d.draw(r);\r
-\r
-                g2d.setColor(orig);\r
-                g2d.setStroke(origStroke);\r
-            }\r
-\r
-            synchronized(component) {\r
-                component.setLocation((int)g2d.getTransform().getTranslateX(), (int)g2d.getTransform().getTranslateY());\r
-                if(component.getSize().getWidth() != width || component.getSize().getHeight() != height) {\r
-                    component.setSize(width, height);\r
-                }\r
-                component.paint(g2d);\r
-            }\r
-\r
-            g2d.setTransform(ot);\r
-        } else {\r
-            /*\r
-             *  Component == null\r
-             *  \r
-             *  The related chart definition ha been removed. \r
-             */\r
-            System.out.println("TÄÄLLÄ, TÄÄLLÄ");\r
-        }\r
-    }\r
-\r
-    @Override\r
-    protected boolean mouseButtonPressed(MouseButtonPressedEvent event) {\r
-        Point2D local = controlToLocal( event.controlPosition );\r
-        local = parentToLocal(local);\r
-        Rectangle2D bounds = getBoundsInLocal().getBounds2D();\r
-        expand(bounds, 1, 1);\r
-        double control = 3.0;\r
-        Rectangle2D corner = new Rectangle2D.Double(bounds.getMaxX() - control, bounds.getMaxY() - control, control, control);\r
-        if (hover && corner.contains(local)) {\r
-            dragging = true;\r
-            return true;\r
-        }\r
-        return super.mouseButtonPressed(event);\r
-    }\r
-\r
-\r
-    @Override\r
-    protected boolean mouseMoved(MouseMovedEvent e) {\r
-        if(dragging) {\r
-            Point2D local = controlToLocal( e.controlPosition );\r
-            local = parentToLocal(local);\r
-\r
-            Rectangle2D bounds = getBoundsInLocal().getBounds2D();\r
-\r
-            if(Math.abs(bounds.getMaxX() - local.getX()) > 3 ||\r
-                    Math.abs(bounds.getMaxY() - local.getY()) > 3) {\r
-                resize(local);\r
-            }\r
-            return true;\r
-        }\r
-        return false;\r
-    }\r
-\r
-    public boolean hitCorner(Point2D point) {\r
-        Rectangle2D bounds = getBoundsInLocal().getBounds2D();\r
-        expand(bounds, 1, 1);\r
-        double control = 3.0;\r
-        Rectangle2D corner = new Rectangle2D.Double(bounds.getMaxX() - control, bounds.getMaxY() - control, control, control);\r
-        return corner.contains(point);\r
-    }\r
-\r
-    private void resize(Point2D local) {\r
-        Rectangle2D bounds = getBoundsInLocal().getBounds2D();\r
-        double x = bounds.getX();\r
-        double y = bounds.getY();\r
-        double dx = local.getX() - bounds.getMaxX();\r
-        double dy = local.getY() - bounds.getMaxY();\r
-        double w = bounds.getWidth() + dx;\r
-        double h = bounds.getHeight() + dy;\r
-        bounds.setRect(\r
-                x, \r
-                y, \r
-                w > 20 ? w : 20, \r
-                        h > 20 ? h : 20\r
-                );\r
-        setBounds(bounds);\r
-    }\r
-\r
-    @Override\r
-    protected boolean mouseDragged(MouseDragBegin e) {\r
-        if(dragging) {\r
-            return true; // Eat event for faster resize\r
-        } else {\r
-            return false;\r
-        }\r
-    }\r
-    \r
-    @Override\r
-    protected boolean mouseButtonReleased(MouseButtonReleasedEvent e) {\r
-        if(dragging) {\r
-            Point2D local = controlToLocal( e.controlPosition );\r
-            local = parentToLocal(local);\r
-            if(Math.abs(bounds.getMaxX() - local.getX()) > 3 ||\r
-                    Math.abs(bounds.getMaxY() - local.getY()) > 3) {\r
-                resize(local);\r
-            }\r
-            dragging = false;\r
-            if(resizeListener != null)\r
-                resizeListener.elementResized(bounds);\r
-        }\r
-        return false;\r
-    }\r
-\r
-    @Override\r
-    public int getEventMask() {\r
-        return EventTypes.MouseButtonPressedMask\r
-                | EventTypes.MouseMovedMask\r
-                | EventTypes.MouseButtonReleasedMask\r
-                ;\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartSceneGraph.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ChartSceneGraph.java
deleted file mode 100644 (file)
index f8ea0c7..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.element;\r
-\r
-import java.awt.Shape;\r
-import java.awt.geom.AffineTransform;\r
-import java.awt.geom.Rectangle2D;\r
-\r
-import org.jfree.chart.JFreeChart;\r
-import org.simantics.g2d.canvas.ICanvasContext;\r
-import org.simantics.g2d.diagram.DiagramUtils;\r
-import org.simantics.g2d.diagram.IDiagram;\r
-import org.simantics.g2d.element.ElementHints;\r
-import org.simantics.g2d.element.ElementUtils;\r
-import org.simantics.g2d.element.IElement;\r
-import org.simantics.g2d.element.SceneGraphNodeKey;\r
-import org.simantics.g2d.element.handler.HandleMouseEvent;\r
-import org.simantics.g2d.element.handler.InternalSize;\r
-import org.simantics.g2d.element.handler.PropertySetter;\r
-import org.simantics.g2d.element.handler.SceneGraph;\r
-import org.simantics.scenegraph.Node;\r
-import org.simantics.scenegraph.g2d.G2DParentNode;\r
-import org.simantics.scenegraph.g2d.IG2DNode;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent.MouseEnterEvent;\r
-import org.simantics.scenegraph.g2d.events.MouseEvent.MouseExitEvent;\r
-import org.simantics.utils.datastructures.hints.IHintContext.Key;\r
-import org.simantics.utils.datastructures.hints.IHintListener;\r
-import org.simantics.utils.datastructures.hints.IHintObservable;\r
-\r
-/**\r
- * Chart scenegraph for chart elements in diagrams\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class ChartSceneGraph  implements SceneGraph, HandleMouseEvent, InternalSize {\r
-    private static final long serialVersionUID = 1875762898776996989L;\r
-\r
-    public static final Key KEY_SG_NODE = new SceneGraphNodeKey(Node.class, "CHART_SG_NODE");\r
-    public static final Key KEY_SG_SELECTION_NODE = new SceneGraphNodeKey(Node.class, "CHART_SG_SELECTION_NODE");\r
-\r
-    protected IHintListener hoverHintListener;\r
-\r
-    public ChartSceneGraph() {\r
-    }\r
-\r
-    /**\r
-     * Expands bounds a little to allow selecting and grabbing a chart element\r
-     * from outside the chart graphics\r
-     */\r
-    @Override\r
-    public Rectangle2D getBounds(IElement e, Rectangle2D s) {\r
-        if (s==null) s = new Rectangle2D.Double();\r
-\r
-        IG2DNode node = (IG2DNode)e.getHint(KEY_SG_NODE);\r
-        AffineTransform at = (AffineTransform)e.getHint(ElementHints.KEY_TRANSFORM);\r
-        if(at != null && node != null && node.getBoundsInLocal() != null) {\r
-            Shape shape = node.getBoundsInLocal();\r
-            Rectangle2D r = shape.getBounds2D();\r
-            double scaleX = at.getScaleX();\r
-            double scaleY = at.getScaleY();\r
-            ChartNode.expand(r, 1 * scaleX, 1 * scaleY);\r
-            shape = r;\r
-            s.setFrame(shape.getBounds2D());\r
-        } else {\r
-            s.setFrame((Rectangle2D)e.getHint(ElementHints.KEY_BOUNDS));\r
-        }\r
-        return s;\r
-    }\r
-\r
-    @Override\r
-    public void cleanup(IElement e) {\r
-        if(hoverHintListener != null)\r
-            e.removeHintListener(hoverHintListener);\r
-\r
-        Node node = e.removeHint(KEY_SG_NODE);\r
-        if (node != null)\r
-            node.remove();\r
-    }\r
-\r
-    @Override\r
-    public void init(final IElement e, G2DParentNode parent) {\r
-        ChartNode node = e.getHint(KEY_SG_NODE);\r
-        if(node == null) {\r
-            // Create a new chart node\r
-            node = parent.getOrCreateNode("chart_"+e.hashCode(), ChartNode.class);\r
-\r
-            Rectangle2D bounds = (Rectangle2D)e.getHint(ElementHints.KEY_BOUNDS);\r
-            if(bounds == null) {\r
-                bounds = new Rectangle2D.Double(-40, -40, 80, 80);\r
-                e.setHint(ElementHints.KEY_BOUNDS, bounds);\r
-            }\r
-            node.setBounds(bounds);\r
-\r
-            JFreeChart chart = e.getHint(ChartElementFactory.KEY_CHART);\r
-            if(chart != null)\r
-                node.setChart(chart);\r
-\r
-            // Add a resize listener for updating bounds information to graph after resizing\r
-            node.setResizeListener(new ResizeListener() {\r
-\r
-                @Override\r
-                public void elementResized(Rectangle2D newBounds) {\r
-                    e.setHint(ElementHints.KEY_BOUNDS, newBounds);\r
-                    IDiagram diagram = ElementUtils.getDiagram(e);\r
-                    DiagramUtils.synchronizeHintsToBackend(diagram, e);\r
-                }\r
-            });\r
-\r
-            e.setHint(KEY_SG_NODE, node);\r
-        }\r
-\r
-        // Hover listening\r
-        hoverHintListener = new IHintListener() {\r
-            @Override\r
-            public void hintRemoved(IHintObservable sender, Key key, Object oldValue) {\r
-\r
-            }\r
-\r
-            @Override\r
-            public void hintChanged(IHintObservable sender, Key key, Object oldValue, Object newValue) {\r
-                if(key == ElementHints.KEY_HOVER) {\r
-                    IElement e = (IElement)sender;\r
-                    ChartNode name = (ChartNode) e.getHint(KEY_SG_NODE);\r
-                    if (name != null)\r
-                        name.setHover(Boolean.TRUE.equals(e.getHint(ElementHints.KEY_HOVER)));\r
-                }\r
-            }\r
-        };\r
-        e.addHintListener(hoverHintListener);\r
-\r
-        update(e);\r
-    }\r
-\r
-    public void update(IElement e) {\r
-        PropertySetter setter = e.getElementClass().getSingleItem(PropertySetter.class);\r
-        setter.syncPropertiesToNode(e);\r
-    }\r
-\r
-    \r
-    @Override\r
-    public boolean handleMouseEvent(IElement e, ICanvasContext ctx, MouseEvent me) {\r
-        if (me instanceof MouseEnterEvent) {\r
-            e.setHint(ElementHints.KEY_HOVER, true);\r
-        } else if (me instanceof MouseExitEvent) {\r
-            e.setHint(ElementHints.KEY_HOVER, false);\r
-        }\r
-        return false;\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/PopulateChartDropParticipant.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/PopulateChartDropParticipant.java
deleted file mode 100644 (file)
index 168c2a2..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.element;\r
-\r
-import java.awt.datatransfer.Transferable;\r
-import java.awt.datatransfer.UnsupportedFlavorException;\r
-import java.awt.dnd.DnDConstants;\r
-import java.awt.dnd.DropTargetDragEvent;\r
-import java.awt.geom.AffineTransform;\r
-import java.io.IOException;\r
-\r
-import org.eclipse.jface.viewers.IStructuredSelection;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.Session;\r
-import org.simantics.db.common.request.UnaryRead;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.diagram.adapter.GraphToDiagramSynchronizer;\r
-import org.simantics.g2d.dnd.DnDHints;\r
-import org.simantics.g2d.dnd.ElementClassDragItem;\r
-import org.simantics.g2d.dnd.IDnDContext;\r
-import org.simantics.g2d.dnd.IDropTargetParticipant;\r
-import org.simantics.g2d.element.ElementHints;\r
-import org.simantics.modeling.ui.diagramEditor.PopulateElementDropParticipant;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.ui.dnd.LocalObjectTransfer;\r
-import org.simantics.ui.dnd.LocalObjectTransferable;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-\r
-/**\r
- * Drop participant for dropping chart definitions into diagrams\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class PopulateChartDropParticipant extends PopulateElementDropParticipant implements IDropTargetParticipant {\r
-\r
-    public PopulateChartDropParticipant(GraphToDiagramSynchronizer synchronizer) {\r
-        super(synchronizer);\r
-    }\r
-\r
-    @Override\r
-    public void dragEnter(DropTargetDragEvent dtde, final IDnDContext dp) {\r
-        Transferable tr = dtde.getTransferable();\r
-        if (tr.isDataFlavorSupported(LocalObjectTransferable.FLAVOR)) {\r
-\r
-            Session session = synchronizer.getSession();\r
-\r
-            Object obj = null;\r
-\r
-            try {\r
-                obj = tr.getTransferData(LocalObjectTransferable.FLAVOR);\r
-                \r
-                // Create a structural selection from transfer data\r
-                if (!(obj instanceof IStructuredSelection)) {\r
-                    obj = LocalObjectTransfer.getTransfer().getObject();\r
-                }\r
-\r
-                if (obj instanceof IStructuredSelection) {\r
-\r
-                    IStructuredSelection sel = (IStructuredSelection) obj;\r
-                    \r
-                    // Can drop only one chart at the time\r
-                    if (sel.size() == 1) {\r
-                        \r
-                        // Get the chart definition\r
-                        Resource chart = AdaptionUtils.adaptToSingle(sel, Resource.class);\r
-                        if (chart == null)\r
-                            return;\r
-\r
-                        ElementClassDragItem item = session.syncRequest(new UnaryRead<Resource,ElementClassDragItem>(chart) {\r
-\r
-                            @Override\r
-                            public ElementClassDragItem perform(ReadGraph graph) throws DatabaseException {\r
-                                if(graph.isInstanceOf(parameter, JFreeChartResource.getInstance(graph).Chart)) {\r
-                                    ElementClassDragItem item = new ElementClassDragItem(ChartElementFactory.create(graph, parameter));\r
-                                    AffineTransform initialTr = AffineTransform.getScaleInstance(1, 1);\r
-                                    item.getHintContext().setHint(ElementHints.KEY_TRANSFORM, initialTr);\r
-                                    return item;\r
-                                } else {\r
-                                    return null;\r
-                                }\r
-\r
-                            }\r
-                        });\r
-\r
-                        if(item != null) {\r
-                            dp.add(item);\r
-                            dp.getHints().setHint(DnDHints.KEY_DND_GRID_COLUMNS, Integer.valueOf(1));\r
-                        }\r
-\r
-                    }\r
-\r
-                }\r
-\r
-            } catch (UnsupportedFlavorException e) {\r
-                e.printStackTrace();\r
-            } catch (IOException e) {\r
-                e.printStackTrace();\r
-            } catch (DatabaseException e) {\r
-                e.printStackTrace();\r
-            }\r
-\r
-        }\r
-\r
-        dtde.acceptDrag(DnDConstants.ACTION_COPY);\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ResizeListener.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/element/ResizeListener.java
deleted file mode 100644 (file)
index 6c4116b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.element;\r
-\r
-import java.awt.geom.Rectangle2D;\r
-\r
-/**\r
- * Interface for listeners listening resize events in chart nodes\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public interface ResizeListener {\r
-    \r
-    /**\r
-     * Triggered when a node has been resized\r
-     * @param newBounds new bounds for the node\r
-     */\r
-    public void elementResized(Rectangle2D newBounds);\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/AxisChildRule.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/AxisChildRule.java
deleted file mode 100644 (file)
index 5b8c44a..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.graphexplorer;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-\r
-import org.simantics.browsing.ui.model.children.ChildRule;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.request.ObjectsWithType;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * ChildRule for finding the axis of a JFreeChart\r
- *  \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class AxisChildRule implements ChildRule {\r
-\r
-    @Override\r
-    public boolean isCompatible(Class<?> contentType) {\r
-        return contentType.equals(Resource.class);\r
-    }\r
-\r
-    @Override\r
-    public Collection<?> getChildren(ReadGraph graph, Object parent) throws DatabaseException {\r
-        ArrayList<Resource> result = new ArrayList<Resource>();\r
-        if(!(parent instanceof Resource))\r
-            return result;\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        /*\r
-         * 1. chart may have multiple plots\r
-         * 2. plot may have multiple axis\r
-         */\r
-        for(Resource plot : graph.syncRequest(new ObjectsWithType((Resource)parent, l0.ConsistsOf, jfree.Plot))) {\r
-            Resource rangeAxisList = graph.getPossibleObject(plot, jfree.Plot_rangeAxisList);\r
-            if(rangeAxisList != null)\r
-                for(Resource axis : ListUtils.toList(graph, rangeAxisList)) {\r
-                    result.add(axis);\r
-                }\r
-        }\r
-        return result;\r
-\r
-\r
-    }\r
-\r
-    @Override\r
-    public Collection<?> getParents(ReadGraph graph, Object child) throws DatabaseException {\r
-        return new ArrayList<Resource>();\r
-    }\r
-\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/AxisDropAction.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/AxisDropAction.java
deleted file mode 100644 (file)
index e6590aa..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.graphexplorer;\r
-\r
-import java.util.List;\r
-\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.WriteRequest;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.adapter.DropActionFactory;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.xyline.AxisAndVariablesExplorerComposite;\r
-import org.simantics.ui.SimanticsUI;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-\r
-/**\r
- * Action for dropping axis on top of other axis or series in {@link AxisAndVariablesExplorerComposite}\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class AxisDropAction  implements DropActionFactory {\r
-\r
-    @Override\r
-    public Runnable create(ReadGraph g, Object target, Object source) throws DatabaseException {\r
-        // Make sure that both target and source are resources\r
-        Resource t = AdaptionUtils.adaptToSingle(target, Resource.class);\r
-        Resource s = AdaptionUtils.adaptToSingle(source, Resource.class);\r
-        \r
-        if(t == null || s == null)\r
-            return null;\r
-        \r
-        // Make sure that source and target are of correct type\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(g);\r
-        if(!g.isInstanceOf(s, jfree.Axis))\r
-            return null;\r
-        if(!g.isInstanceOf(t, jfree.Series) && !g.isInstanceOf(t, jfree.Axis))\r
-            return null;\r
-        \r
-        return getRunnable(t, s);\r
-    }\r
-\r
-    /**\r
-     * Get the runnable for doing the drop action \r
-     * \r
-     * @param t target resource\r
-     * @param s source resource\r
-     * @return Runnable\r
-     */\r
-    private Runnable getRunnable(final Resource t, final Resource s) {\r
-        Runnable runnable = new Runnable() {\r
-\r
-            @Override\r
-            public void run() {\r
-                SimanticsUI.getSession().asyncRequest(new WriteRequest() {\r
-\r
-                    @Override\r
-                    public void perform(WriteGraph graph) throws DatabaseException {\r
-                        if(t == null || s == null) return;\r
-                        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                        Layer0 l0 = Layer0.getInstance(graph);\r
-                        Resource target = t;\r
-                        Resource source = s;\r
-                        \r
-                        // Dragged axis always exists in the same list with target axis, so it is safe to get the target index\r
-                        Resource plot = graph.getPossibleObject(source, l0.PartOf);\r
-                        Resource axisListResource = graph.getPossibleObject(plot, jfree.Plot_rangeAxisList);\r
-                        List<Resource> axisList = ListUtils.toList(graph, axisListResource);\r
-                        if(graph.isInstanceOf(target, jfree.Series)) {\r
-                            // Dropped a axis over a series -> get the axis of the series\r
-                            Resource dataset = graph.getPossibleObject(target, l0.PartOf);\r
-                            target = graph.getPossibleObject(dataset, jfree.Dataset_mapToRangeAxis);\r
-                        }\r
-                        \r
-                        // move axis to target position\r
-                        int targetIndex = axisList.indexOf(target);\r
-                        axisList.remove(source);\r
-                        axisList.add(targetIndex, source);\r
-                        \r
-                        // Update the range axis list\r
-                        graph.deny(plot, jfree.Plot_rangeAxisList);\r
-                        axisListResource = ListUtils.create(graph, axisList);\r
-                        graph.claim(plot, jfree.Plot_rangeAxisList, axisListResource);\r
-                    }\r
-\r
-                });\r
-            }\r
-        };\r
-        return runnable;\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/AxisLabelRule.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/AxisLabelRule.java
deleted file mode 100644 (file)
index ee3d363..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.graphexplorer;\r
-\r
-import java.util.Collections;\r
-import java.util.List;\r
-import java.util.Map;\r
-\r
-import org.simantics.browsing.ui.common.ColumnKeys;\r
-import org.simantics.browsing.ui.model.labels.LabelRule;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Label rule for range axis label\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class AxisLabelRule implements LabelRule {\r
-\r
-    @Override\r
-    public boolean isCompatible(Class<?> contentType) {\r
-        return contentType.equals(Resource.class);\r
-    }\r
-\r
-    /**\r
-     * Range axis label\r
-     * \r
-     * Options:\r
-     * 1. Label\r
-     * 2. Default\r
-     */\r
-    @Override\r
-    public Map<String, String> getLabel(ReadGraph graph, Object content) throws DatabaseException {\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        Resource resource = (Resource)content;\r
-        String label = graph.getPossibleRelatedValue(resource, l0.HasLabel, Bindings.STRING);\r
-        if(label == null || label.isEmpty()) {\r
-            label = "Range";\r
-            Resource plot = graph.getPossibleObject(resource, l0.PartOf);\r
-            if(plot != null) {\r
-                Resource axisListResource = graph.getPossibleObject(plot, jfree.Plot_rangeAxisList);\r
-                if(axisListResource != null) {\r
-                    List<Resource> axisList = ListUtils.toList(graph, axisListResource);\r
-                    if(axisList.contains(resource))\r
-                        label = label + " " + (axisList.indexOf(resource) + 1);\r
-                }\r
-            }\r
-        }\r
-        return Collections.singletonMap(ColumnKeys.SINGLE, label);\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesChildRule.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesChildRule.java
deleted file mode 100644 (file)
index a12f844..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.graphexplorer;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-\r
-import org.simantics.browsing.ui.model.children.ChildRule;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Child rule for obtaining series in a chart. \r
- * Assumes that the chart has only one plot and that plot has only one dataset\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class SeriesChildRule implements ChildRule {\r
-\r
-    @Override\r
-    public boolean isCompatible(Class<?> contentType) {\r
-        return contentType.equals(Resource.class);\r
-    }\r
-\r
-    @Override\r
-    public Collection<?> getChildren(ReadGraph graph, Object parent) throws DatabaseException {\r
-        ArrayList<Resource> result = new ArrayList<Resource>();\r
-        if(!(parent instanceof Resource))\r
-            return result;\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        /*\r
-         * 1. we assume that there is only one plot\r
-         * 2. we assume that the only plot has only one dataset\r
-         */\r
-        Resource plot = graph.syncRequest(new PossibleObjectWithType((Resource)parent, l0.ConsistsOf, jfree.Plot));\r
-        \r
-        Resource dataset = graph.syncRequest(new PossibleObjectWithType(plot, l0.ConsistsOf, jfree.Dataset));\r
-        \r
-        Resource seriesList = graph.getPossibleObject(dataset, jfree.Dataset_seriesList);\r
-        if(seriesList != null)\r
-            for(Resource series : ListUtils.toList(graph, seriesList)) {\r
-                result.add(series);\r
-            }\r
-        return result;\r
-    }\r
-    \r
-    @Override\r
-    public Collection<?> getParents(ReadGraph graph, Object child) throws DatabaseException {\r
-        return new ArrayList<Resource>();\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesDropAction.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesDropAction.java
deleted file mode 100644 (file)
index 241394b..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.graphexplorer;\r
-\r
-import java.util.Collections;\r
-import java.util.List;\r
-\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.common.request.WriteRequest;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.adapter.DropActionFactory;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.xyline.XYLineAxisAndVariablesTab;\r
-import org.simantics.ui.SimanticsUI;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-\r
-/**\r
- * Drop action for explorer in {@link XYLineAxisAndVariablesTab}. This action is used for dropping \r
- * both series on axis or another sries\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class SeriesDropAction implements DropActionFactory {\r
-\r
-    @Override\r
-    public Runnable create(ReadGraph g, Object target, Object source) throws DatabaseException {\r
-        // Make sure that both target and source are resources\r
-        Resource t = AdaptionUtils.adaptToSingle(target, Resource.class);\r
-        Resource s = AdaptionUtils.adaptToSingle(source, Resource.class);\r
-        \r
-        if(t == null || s == null)\r
-            return null;\r
-        \r
-        // Make sure that source and target are of correct type\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(g);\r
-        if(!g.isInstanceOf(s, jfree.Series))\r
-            return null;\r
-        if(!g.isInstanceOf(t, jfree.Series) && !g.isInstanceOf(t, jfree.Axis))\r
-            return null;\r
-        \r
-        return getRunnable(t, s);\r
-    }\r
-\r
-    /**\r
-     * Get the runnable for doing the drop action \r
-     * \r
-     * @param t target resource\r
-     * @param s source resource\r
-     * @return Runnable\r
-     */\r
-    private Runnable getRunnable(final Resource t, final Resource s) {\r
-        Runnable runnable = new Runnable() {\r
-\r
-            @Override\r
-            public void run() {\r
-                SimanticsUI.getSession().asyncRequest(new WriteRequest() {\r
-\r
-                    @Override\r
-                    public void perform(WriteGraph graph) throws DatabaseException {\r
-                        if(t == null || s == null) return;\r
-                        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                        Layer0 l0 = Layer0.getInstance(graph);\r
-                        Resource target = t;\r
-                        Resource source = s;\r
-                        Resource droppedOnSeries = null;\r
-\r
-                        // Dropped a series over a series -> get target dataset\r
-                        if(graph.isInstanceOf(target, jfree.Series)) {\r
-                            droppedOnSeries = target;\r
-                            Resource dataset = graph.getPossibleObject(target, l0.PartOf);\r
-                            if(dataset != null)\r
-                                target = dataset;\r
-                        }\r
-\r
-                        // Dropped a series over an axis -> get target dataset\r
-                        if(graph.isInstanceOf(target, jfree.Axis)) {\r
-                            Resource dataset = graph.syncRequest(new PossibleObjectWithType(target, jfree.Dataset_mapToRangeAxis_Inverse, jfree.Dataset));\r
-                            if(dataset != null)\r
-                                target = dataset;\r
-                        }\r
-\r
-                        // Move series to a dataset\r
-                        if(graph.isInstanceOf(target, jfree.Dataset)) {\r
-                            // Remove from old dataset if it was different than the new one\r
-                            Resource sourceDataset = graph.getPossibleObject(source, l0.PartOf);\r
-                            if(sourceDataset != null && !sourceDataset.equals(target)) {\r
-                                Resource sourceSeriesList = graph.getPossibleObject(sourceDataset, jfree.Dataset_seriesList);\r
-                                if(sourceSeriesList != null)\r
-                                    ListUtils.removeElement(graph, sourceSeriesList, source);\r
-                            }\r
-                            graph.deny(source, l0.PartOf);\r
-\r
-                            // Add to new dataset\r
-                            Resource targetSeriesList = graph.getPossibleObject(target, jfree.Dataset_seriesList);\r
-                            if(targetSeriesList == null) {\r
-                                targetSeriesList = ListUtils.create(graph, Collections.<Resource>emptyList());\r
-                                graph.claim(target, jfree.Dataset_seriesList, targetSeriesList);\r
-                            }\r
-\r
-\r
-                            // Series was dropped on another series. Move the dropped series to that place and recreate the list\r
-                            if(droppedOnSeries != null) {\r
-                                List<Resource> list = ListUtils.toList(graph, targetSeriesList);\r
-                                int targetIndex = list.indexOf(droppedOnSeries);\r
-                                if(list.contains(source))\r
-                                    list.remove(source);\r
-                                list.add(targetIndex, source);\r
-                                graph.deny(target, jfree.Dataset_seriesList);\r
-                                targetSeriesList = ListUtils.create(graph, list);\r
-                                graph.claim(target, jfree.Dataset_seriesList, targetSeriesList);\r
-                            } else {\r
-                                ListUtils.insertFront(graph, targetSeriesList, Collections.singleton(source));\r
-                            }\r
-\r
-                            graph.claim(target, l0.ConsistsOf, source);\r
-                        }\r
-                    }\r
-                });\r
-            }\r
-        };\r
-        return runnable;\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesLabelDecorationRule.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesLabelDecorationRule.java
deleted file mode 100644 (file)
index 1aebcdb..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.graphexplorer;\r
-\r
-import org.eclipse.jface.resource.FontDescriptor;\r
-import org.simantics.browsing.ui.content.LabelDecorator;\r
-import org.simantics.browsing.ui.model.labeldecorators.LabelDecorationRule;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-\r
-public class SeriesLabelDecorationRule implements LabelDecorationRule {\r
-\r
-    @Override\r
-    public boolean isCompatible(Class<?> contentType) {\r
-        return contentType.equals(Resource.class);\r
-    }\r
-\r
-    @Override\r
-    public LabelDecorator getLabelDecorator(ReadGraph graph, Object content) throws DatabaseException {\r
-        Resource resource = AdaptionUtils.adaptToSingle(content, Resource.class);\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-\r
-        if (resource != null && graph.isInstanceOf(resource, jfree.Series)) {\r
-            final String[] filter = graph.getPossibleRelatedValue(resource, jfree.variableFilter, Bindings.STRING_ARRAY);\r
-            if(filter != null) {\r
-                return new LabelDecorator.Stub() {\r
-                    @Override\r
-                    public String decorateLabel(String label, String column, int itemIndex) {\r
-                        label += " [";\r
-                        for(int i = 0; i < filter.length; i++) {\r
-                            label += filter[i];\r
-                            if(i < filter.length - 1)\r
-                                label += ", ";\r
-                        }\r
-                        label += "]";\r
-                        return label;\r
-                    }\r
-\r
-                    @SuppressWarnings("unchecked")\r
-                    @Override\r
-                    public <F> F decorateFont(F font, String column, int itemIndex) {\r
-                        return (F) ((FontDescriptor) font);\r
-                    }\r
-                };\r
-            }\r
-        }\r
-        return null;\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesLabelRule.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/SeriesLabelRule.java
deleted file mode 100644 (file)
index d334765..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.graphexplorer;\r
-\r
-import java.util.Collections;\r
-import java.util.Map;\r
-\r
-import org.simantics.browsing.ui.common.ColumnKeys;\r
-import org.simantics.browsing.ui.model.labels.LabelRule;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Label rule for dataset series\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class SeriesLabelRule implements LabelRule {\r
-\r
-    @Override\r
-    public boolean isCompatible(Class<?> contentType) {\r
-        return contentType.equals(Resource.class);\r
-    }\r
-\r
-    /**\r
-     * Options:\r
-     * 1. Label\r
-     * 2. Variable rvi\r
-     * 3. Default\r
-     */\r
-    @Override\r
-    public Map<String, String> getLabel(ReadGraph graph, Object content) throws DatabaseException {\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        Resource resource = (Resource)content;\r
-        String label = graph.getPossibleRelatedValue(resource, l0.HasLabel, Bindings.STRING);\r
-        if(label == null || label.isEmpty()) {\r
-            label = graph.getPossibleRelatedValue(resource, jfree.variableRVI);\r
-            if(label != null && !label.isEmpty() && label.length() > 1)\r
-                label = label.substring(1).replace('/', '.');\r
-            else\r
-                label = "Set variable";\r
-        }\r
-        return Collections.singletonMap(ColumnKeys.SINGLE, label);\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/VariableChildRule.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/graphexplorer/VariableChildRule.java
deleted file mode 100644 (file)
index f2cf79f..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.graphexplorer;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-\r
-import org.simantics.browsing.ui.model.children.ChildRule;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.request.ObjectsWithType;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * ChildRule for finding the series of an axis\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class VariableChildRule implements ChildRule {\r
-\r
-    @Override\r
-    public boolean isCompatible(Class<?> contentType) {\r
-        return contentType.equals(Resource.class);\r
-    }\r
-\r
-    @Override\r
-    public Collection<?> getChildren(ReadGraph graph, Object parent) throws DatabaseException {\r
-        ArrayList<Resource> result = new ArrayList<Resource>();\r
-        if(!(parent instanceof Resource))\r
-            return result;\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        Resource axis = (Resource)parent;\r
-        /*\r
-         * 1. Axis belongs to a plot\r
-         * 2. Plot may have multiple datasets\r
-         * 3. Dataset is mapped to a single range axis\r
-         * 3. Dataset may have multiple seires\r
-         */\r
-        Resource plot = graph.getPossibleObject(axis, jfree.Plot_rangeAxis_Inverse);\r
-        if(plot == null)\r
-            return result;\r
-\r
-        for(Resource dataset : graph.syncRequest(new ObjectsWithType(plot, l0.ConsistsOf, jfree.Dataset))) {\r
-            if(graph.hasStatement(dataset, jfree.Dataset_mapToRangeAxis, axis)) {\r
-                Resource seriesList = graph.getPossibleObject(dataset, jfree.Dataset_seriesList);\r
-                if(seriesList != null)\r
-                    for(Resource series : ListUtils.toList(graph, seriesList)) {\r
-                        result.add(series);\r
-                    }\r
-            }\r
-        }\r
-        return result;\r
-    }\r
-\r
-    @Override\r
-    public Collection<?> getParents(ReadGraph graph, Object child) throws DatabaseException {\r
-        return new ArrayList<Resource>();\r
-    }\r
-\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/AllVariablesOfModel.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/AllVariablesOfModel.java
deleted file mode 100644 (file)
index 66ae605..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-import java.util.Collections;\r
-import java.util.List;\r
-\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.request.ObjectsWithType;\r
-import org.simantics.db.common.utils.NameUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.simulation.ontology.SimulationResource;\r
-import org.simantics.structural.stubs.StructuralResource2;\r
-import org.simantics.sysdyn.SysdynResource;\r
-import org.simantics.utils.strings.AlphanumComparator;\r
-\r
-/**\r
- * Request for getting all variables of a model in a String array. Includes also \r
- * variables inside modules.\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class AllVariablesOfModel implements Read<String[]>{\r
-    \r
-    private Resource model;\r
-    \r
-    public AllVariablesOfModel(Resource model) {\r
-        this.model = model;\r
-    }\r
-\r
-    @Override\r
-    public String[] perform(ReadGraph graph) throws DatabaseException {\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        SimulationResource simu = SimulationResource.getInstance(graph);\r
-        SysdynResource sr = SysdynResource.getInstance(graph);\r
-        \r
-        // Find the model of this resource\r
-        Resource model = this.model;\r
-        while(model != null && !graph.isInstanceOf(model, sr.SysdynModel))\r
-            model = graph.getPossibleObject(model, l0.PartOf);\r
-        \r
-        if(model == null)\r
-            return new String[0];\r
-        \r
-        // Find the models configuration\r
-        Resource conf = graph.getSingleObject(model, simu.HasConfiguration);\r
-        List<String> items = new ArrayList<String>();\r
-        \r
-        // Recursively read all configurations and add items\r
-        ReadConfiguration(graph, conf, "", items);\r
-        \r
-        // Add time to the variable list\r
-        items.add("time");\r
-        \r
-        // Finally sort the results\r
-        Collections.sort(items, AlphanumComparator.CASE_INSENSITIVE_COMPARATOR);\r
-        return items.toArray(new String[items.size()]);\r
-    }\r
-    \r
-    /**\r
-     * Read components in a configuration and recursively all module configurations\r
-     * \r
-     * @param graph ReadGraph\r
-     * @param configuration Resource to be read\r
-     * @param path Current path from base realization\r
-     * @param items Found variables\r
-     * @throws DatabaseException\r
-     */\r
-    private void ReadConfiguration(ReadGraph graph, Resource configuration, String path, Collection<String> items) throws DatabaseException {\r
-        SysdynResource sr = SysdynResource.getInstance(graph);\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        StructuralResource2 sr2 = StructuralResource2.getInstance(graph);\r
-\r
-        String name;\r
-        for(Resource resource : graph.syncRequest(new ObjectsWithType(configuration, l0.ConsistsOf, sr.IndependentVariable))) {\r
-            name = path + NameUtils.getSafeName(graph, resource);\r
-            items.add(name);\r
-        }\r
-        \r
-        for(Resource resource : graph.syncRequest(new ObjectsWithType(configuration, l0.ConsistsOf, sr.Input))) {\r
-            name = path + NameUtils.getSafeName(graph, resource);\r
-            items.add(name);\r
-        }\r
-\r
-        for(Resource module : graph.syncRequest(new ObjectsWithType(configuration, l0.ConsistsOf, sr.Module))) {\r
-            Resource instanceOf = graph.getPossibleObject(module, l0.InstanceOf);\r
-            Resource conf = graph.getPossibleObject(instanceOf, sr2.IsDefinedBy);\r
-            if(conf != null) {\r
-                String p = path + NameUtils.getSafeName(graph, module)  + ".";\r
-                ReadConfiguration(graph, conf, p, items);\r
-            }\r
-        }\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/AxisHidePropertyComposite.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/AxisHidePropertyComposite.java
deleted file mode 100644 (file)
index f8334c7..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Group;\r
-import org.simantics.browsing.ui.swt.widgets.Button;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Class containing properties for hiding pars of an axis\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class AxisHidePropertyComposite extends Composite {\r
-\r
-    public AxisHidePropertyComposite(Composite parent, ISessionContext context, WidgetSupport support, int style) {\r
-        super(parent, style);\r
-        \r
-        GridLayoutFactory.fillDefaults().applyTo(this);\r
-        \r
-        Group hideGroup  = new Group(this, SWT.NONE);\r
-        hideGroup.setText("Hide");\r
-        GridDataFactory.fillDefaults().applyTo(hideGroup);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(2).applyTo(hideGroup);\r
-        \r
-        Button label = new Button(hideGroup, support, SWT.CHECK);\r
-        label.setText("Label");\r
-        label.setSelectionFactory(new BooleanPropertyFactory(null, JFreeChartResource.URIs.Axis_visibleLabel, true));\r
-        label.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.Axis_visibleLabel));\r
-        GridDataFactory.fillDefaults().applyTo(label.getWidget());\r
-\r
-        Button tmarks = new Button(hideGroup, support, SWT.CHECK);\r
-        tmarks.setText("Tick marks");\r
-        tmarks.setSelectionFactory(new BooleanPropertyFactory(null, JFreeChartResource.URIs.Axis_visibleTickMarks, true));\r
-        tmarks.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.Axis_visibleTickMarks));\r
-        GridDataFactory.fillDefaults().applyTo(tmarks.getWidget());\r
-        \r
-        Button axisLine = new Button(hideGroup, support, SWT.CHECK);\r
-        axisLine.setText("Axis line");\r
-        axisLine.setSelectionFactory(new BooleanPropertyFactory(null, JFreeChartResource.URIs.Axis_visibleAxisLine, true));\r
-        axisLine.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.Axis_visibleAxisLine));\r
-        GridDataFactory.fillDefaults().applyTo(axisLine.getWidget());\r
-\r
-        Button tlabels = new Button(hideGroup, support, SWT.CHECK);\r
-        tlabels.setText("Tick labels");\r
-        tlabels.setSelectionFactory(new BooleanPropertyFactory(null, JFreeChartResource.URIs.Axis_visibleTickLabels, true));\r
-        tlabels.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.Axis_visibleTickLabels));\r
-        GridDataFactory.fillDefaults().applyTo(tlabels.getWidget());\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/BooleanPropertyFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/BooleanPropertyFactory.java
deleted file mode 100644 (file)
index 00a0954..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.simantics.browsing.ui.swt.widgets.impl.ReadFactoryImpl;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.request.ObjectsWithType;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.utils.datastructures.Quad;\r
-\r
-/**\r
- * PropertyFactory for finding a boolean property. Supports also finding the \r
- * property from a first occurrence of resource ConsistsOf type HasProperty   \r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class BooleanPropertyFactory extends ReadFactoryImpl<Resource, Boolean> {\r
-\r
-    final private String propertyURI;\r
-    final private String typeURI;\r
-    final private Boolean inverse;\r
-    final private Boolean defaultValue;\r
-    \r
-    /**\r
-     * PropertyFactory for finding a boolean property with propertyURI\r
-     * \r
-     * @param propertyURI URI for the boolean property\r
-     */\r
-    public BooleanPropertyFactory(String propertyURI) {\r
-        this(null, propertyURI, false);\r
-    }\r
-    \r
-    /**\r
-     * PropertyFactory for finding a boolean property with propertyURI.\r
-     * \r
-     * Supports inverting the result (e.g. if required information is IsHidden, but database contains IsVisible)\r
-     * \r
-     * @param propertyURI URI for the boolean property\r
-     * @param inverse Invert the result?\r
-     */\r
-    public BooleanPropertyFactory(String propertyURI, boolean inverse) {\r
-        this(null, propertyURI, inverse);\r
-    }\r
-\r
-    /**\r
-     * PropertyFactory for finding a boolean property with propertyURI.\r
-     *  \r
-     * Finds the property for first ObjectWithType(resource, L0.ConsistsOf, type)\r
-     *  \r
-     * Supports inverting the result (e.g. if required information is IsHidden, but database contains IsVisible)\r
-     *  \r
-     * @param typeURI URI for a resource (resource ConsistsOf type) (null allowed)\r
-     * @param propertyURI URI for the boolean property\r
-     * @param inverse Invert the result?\r
-     */\r
-    public BooleanPropertyFactory(String typeURI, String propertyURI, boolean inverse) {\r
-        this(typeURI, propertyURI, inverse, false);\r
-    }\r
-    \r
-    /**\r
-     * PropertyFactory for finding a boolean property with propertyURI.\r
-     *  \r
-     * Finds the property for first ObjectWithType(resource, L0.ConsistsOf, type)\r
-     *  \r
-     * Supports inverting the result (e.g. if required information is IsHidden, but database contains IsVisible)\r
-     * \r
-     * @param typeURI URI for a resource (resource ConsistsOf type) (null allowed -> not used)\r
-     * @param propertyURI URI for the boolean property\r
-     * @param inverse Invert the result?\r
-     * @param defaultValue default value\r
-     */\r
-    public BooleanPropertyFactory(String typeURI, String propertyURI, boolean inverse, boolean defaultValue) {\r
-        this.propertyURI = propertyURI;\r
-        this.inverse = inverse;\r
-        this.typeURI = typeURI;\r
-        this.defaultValue = defaultValue;\r
-    }\r
-\r
-    @Override\r
-    public Object getIdentity(Object inputContents) {\r
-        return new Quad<Resource, String, Object, Boolean>((Resource) inputContents, propertyURI, getClass(), defaultValue);\r
-    }\r
-\r
-    @Override\r
-    public Boolean perform(ReadGraph graph, Resource r) throws DatabaseException {\r
-        if(typeURI == null) {\r
-            // if no typeUri, use the default resource r\r
-            return getValue(graph, r);\r
-        } else {\r
-            // typeURI was defined, find the property for the first occurence of ConsistsOf type\r
-            Resource type =  graph.getResource(typeURI);\r
-            for(Resource o : graph.syncRequest(new ObjectsWithType(r, Layer0.getInstance(graph).ConsistsOf, type))) {\r
-                // Returns the value for the first occurrence\r
-                return getValue(graph, o);\r
-            }\r
-        }\r
-        // if nothing was found with typeURI\r
-        return false;\r
-    }\r
-    \r
-    /**\r
-     * Return the value for a Boolean literal possibly inverted (or default if resource != Boolean literal) \r
-     * \r
-     * @param graph ReadGraph\r
-     * @param resource Literal Boolean resource \r
-     * @return value of the parameter (or default or inverted)\r
-     * @throws DatabaseException\r
-     */\r
-    private Boolean getValue(ReadGraph graph, Resource resource) throws DatabaseException {\r
-        Boolean value = graph.getPossibleRelatedValue(resource, graph.getResource(propertyURI), Bindings.BOOLEAN);\r
-        if(value != null) {\r
-            return !inverse.equals(value);\r
-        } else {\r
-            return defaultValue;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/BooleanSelectionListener.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/BooleanSelectionListener.java
deleted file mode 100644 (file)
index 718b9b2..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.simantics.browsing.ui.swt.widgets.impl.SelectionListenerImpl;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.ObjectsWithType;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-\r
-/**\r
- * Class for setting a boolean value when a selection occurs. (check box buttons)\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class BooleanSelectionListener extends SelectionListenerImpl<Resource> {\r
-\r
-    final private String propertyURI;\r
-    final private String typeUri;\r
-    \r
-    /**\r
-     * Boolean selection listener for property with propertyURI\r
-     * \r
-     * @param context ISessionContext\r
-     * @param propertyURI uri of the boolean property\r
-     */\r
-    public BooleanSelectionListener(ISessionContext context, String propertyURI) {\r
-        this(context, null, propertyURI);\r
-    }\r
-\r
-    /**\r
-     * Boolean selection listener for property with propertyURI\r
-     * Sets the property for all ObjectWithType(resource, L0.ConsistsOf, type)\r
-     * \r
-     * @param context ISessionContext\r
-     * @param typeUri URI for a resource (resource ConsistsOf type) (null allowed -> not used)\r
-     * @param propertyURI uri of the boolean property\r
-     */\r
-    public BooleanSelectionListener(ISessionContext context, String typeUri, String propertyURI) {\r
-        super(context);\r
-        this.propertyURI = propertyURI;\r
-        this.typeUri = typeUri;\r
-    }\r
-\r
-    @Override\r
-    public void apply(WriteGraph graph, Resource chart) throws DatabaseException {\r
-        if(typeUri == null) {\r
-            setValue(graph, chart);\r
-        } else {\r
-            Resource type =  graph.getResource(typeUri);\r
-            for(Resource object : graph.syncRequest(new ObjectsWithType(chart, Layer0.getInstance(graph).ConsistsOf, type))) {\r
-                setValue(graph, object);\r
-            }\r
-        }\r
-            \r
-    }\r
-    \r
-    /**\r
-     * Set boolean value for Boolean literal resource (inverts the current value).\r
-     * @param graph ReadGraph\r
-     * @param resource Boolean literal resource\r
-     * @throws DatabaseException\r
-     */\r
-    private void setValue(WriteGraph graph, Resource resource) throws DatabaseException {\r
-        Resource property =  graph.getResource(propertyURI);\r
-        Boolean value = graph.getPossibleRelatedValue(resource, property, Bindings.BOOLEAN);\r
-        graph.claimLiteral(resource, property, Boolean.FALSE.equals(value));\r
-    }\r
-}
\ No newline at end of file
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/ChartTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/ChartTab.java
deleted file mode 100644 (file)
index 179dbe9..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.ui.IWorkbenchSite;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.sysdyn.ui.properties.LabelPropertyTabContributor;\r
-import org.simantics.sysdyn.ui.trend.chart.ChartComposite;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-\r
-/**\r
- * Tab for displaying a chart\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class ChartTab extends LabelPropertyTabContributor implements Widget {\r
-\r
-    private Composite parent;\r
-\r
-    @Override\r
-    public void createControls(Composite body, IWorkbenchSite site, ISessionContext context, WidgetSupport support) {\r
-        support.register(this);\r
-        this.parent = body;\r
-    }\r
-\r
-    @Override\r
-    public void setInput(ISessionContext context, final Object input) {\r
-        Resource chart = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-        new ChartComposite(parent, chart, SWT.BORDER);\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/ColorPicker.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/ColorPicker.java
deleted file mode 100644 (file)
index 33b1fe9..0000000
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.events.SelectionEvent;\r
-import org.eclipse.swt.graphics.Color;\r
-import org.eclipse.swt.graphics.Device;\r
-import org.eclipse.swt.graphics.GC;\r
-import org.eclipse.swt.graphics.Image;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.graphics.RGB;\r
-import org.eclipse.swt.widgets.ColorDialog;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Display;\r
-import org.eclipse.swt.widgets.Shell;\r
-import org.simantics.browsing.ui.swt.widgets.Button;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ReadFactoryImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.SelectionListenerImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.WriteRequest;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.db.procedure.Listener;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.diagram.stubs.G2DResource;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.ui.SimanticsUI;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-import org.simantics.utils.RunnableWithObject;\r
-import org.simantics.utils.datastructures.Triple;\r
-\r
-/**\r
- * Composite for selecting a color for a chart component\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class ColorPicker extends Composite implements Widget {\r
-\r
-    Button defaultColor, customColor, color;\r
-\r
-    /**\r
-     * Create a composite containing radio buttons for default or custom color. Color chooser button is active\r
-     * when the custom radio button is selected. Color chooser uses {@link ColorDialog} to select a color \r
-     * \r
-     * @param parent Composite\r
-     * @param context ISessionContext\r
-     * @param support WidgetSupport\r
-     * @param style SWT style\r
-     */\r
-    public ColorPicker(Composite parent, ISessionContext context, WidgetSupport support, int style) {\r
-        super(parent, style);\r
-        support.register(this);\r
-        \r
-        GridLayoutFactory.fillDefaults().numColumns(4).applyTo(this);\r
-\r
-        defaultColor = new Button(this, support, SWT.RADIO);\r
-        defaultColor.setText("default");\r
-        defaultColor.setSelectionFactory(new DefaultColorSelectionFactory(false));\r
-        defaultColor.addSelectionListener(new DefaultColorSelectionListener(context));\r
-        GridDataFactory.fillDefaults().applyTo(defaultColor.getWidget());\r
-\r
-        customColor = new Button(this, support, SWT.RADIO);\r
-        customColor.setText("custom");\r
-        customColor.setSelectionFactory(new DefaultColorSelectionFactory(true));\r
-        customColor.addSelectionListener(new DefaultColorSelectionListener(context));\r
-        \r
-        GridDataFactory.fillDefaults().applyTo(customColor.getWidget());\r
-\r
-        color = new Button(this, support, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(color.getWidget());\r
-        color.setImageFactory(new ColorImageFactoryFactory(color));\r
-        color.addSelectionListener(new ColorSelectionListener(context));\r
-        color.getWidget().setEnabled(false);\r
-    }\r
-\r
-    /**\r
-     * Method for finding the resource for which the color is selected. \r
-     * \r
-     * @param graph ReadGraph\r
-     * @param input input from WidgetSupport\r
-     * @return\r
-     * @throws DatabaseException\r
-     */\r
-    protected Resource getResource(ReadGraph graph, Resource input) throws DatabaseException {\r
-        return input;\r
-    }\r
-    \r
-    /**\r
-     * Method for getting the relation with which the g2d.Color is related to a resource\r
-     * \r
-     * @param graph ReadGraph\r
-     * @return Color relation\r
-     * @throws DatabaseException\r
-     */\r
-    protected Resource getColorRelation(ReadGraph graph) throws DatabaseException {\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        return jfree.color;\r
-    }\r
-    \r
-    \r
-    @Override\r
-    public void setInput(ISessionContext context, Object input) {\r
-        final Resource resource = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-        \r
-        // Create a listener to define the enabled state of the color chooser button\r
-        context.getSession().asyncRequest(new Read<Boolean>() {\r
-\r
-            @Override\r
-            public Boolean perform(ReadGraph graph) throws DatabaseException {\r
-                // if there is a color definition, the color chooser is active\r
-                Boolean result = graph.hasStatement(getResource(graph, resource), getColorRelation(graph));\r
-                return result;\r
-            }\r
-            \r
-        }, new Listener<Boolean>() {\r
-\r
-            @Override\r
-            public void execute(Boolean result) {\r
-                if(!color.getWidget().isDisposed()) {\r
-                    color.getWidget().getDisplay().asyncExec(new RunnableWithObject(result) {\r
-                        @Override\r
-                        public void run() {\r
-                            if(!color.getWidget().isDisposed())\r
-                                color.getWidget().setEnabled((Boolean)getObject());\r
-                        }\r
-                    });\r
-                }\r
-            }\r
-\r
-            @Override\r
-            public void exception(Throwable t) {\r
-                t.printStackTrace();\r
-            }\r
-\r
-            @Override\r
-            public boolean isDisposed() {\r
-                return color.getWidget().isDisposed();\r
-            }\r
-        });\r
-    }\r
-    \r
-    /**\r
-     * Get a colored image to be displayed in the color chooser button\r
-     * \r
-     * @param device SWT Device\r
-     * @param red Red 0-255\r
-     * @param green Green 0-255\r
-     * @param blue Blue 0-255\r
-     * @return\r
-     */\r
-    private Image getColorPickerImage(Device device, int red, int green, int blue) {\r
-        Image image = new Image(device, 20, 20);\r
-        GC gc = new GC (image);\r
-        gc.setBackground (new Color(device, red, green, blue));\r
-        gc.fillRectangle (image.getBounds ());\r
-        gc.dispose ();\r
-        return image;\r
-    }\r
-\r
-    /**\r
-     * ImageFactory returning an image for color button\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class ColorImageFactoryFactory extends ReadFactoryImpl<Resource, Image> {\r
-        \r
-        Button button;\r
-        \r
-        public ColorImageFactoryFactory(Button button) {\r
-            super();\r
-            this.button = button;\r
-        }\r
-        \r
-        public Object getIdentity(Object inputContents) {\r
-            return new Triple<Object, Class<?>, Button>(inputContents, getClass(), button);\r
-        }\r
-\r
-        @Override\r
-        public Image perform(ReadGraph graph, Resource input) throws DatabaseException {\r
-            if(button.getWidget().isDisposed())\r
-                return null;\r
-            Display device = button.getWidget().getDisplay();\r
-            if(device == null)\r
-                return null;\r
-            RGB rgb = getColor(graph, getResource(graph, input));\r
-            return getColorPickerImage(device, rgb.red, rgb.green, rgb.blue);\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * Get RGB from a color literal resource. If resource is not a color resource, return blue (RGB 0, 0, 255)\r
-     * @param graph ReadGraph\r
-     * @param input Color literal resource (float[4])\r
-     * @return RGB color\r
-     * @throws DatabaseException\r
-     */\r
-    private RGB getColor(ReadGraph graph, Resource input) throws DatabaseException{\r
-        float[] colorComponents = graph.getPossibleRelatedValue(input, getColorRelation(graph));\r
-        RGB rgb;\r
-        if(colorComponents == null)\r
-            rgb = new RGB(0, 0, 255);\r
-        else\r
-            rgb = new RGB((int)(colorComponents[0] * 255.0f), \r
-                    (int)(colorComponents[1] * 255.0f), \r
-                    (int)(colorComponents[2] * 255.0f));\r
-        return rgb;\r
-    }\r
-\r
-\r
-    /**\r
-     * SelectionListener for color button. \r
-     * \r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class ColorSelectionListener extends SelectionListenerImpl<Resource> {\r
-\r
-        private SelectionEvent e;\r
-        private RGB rgb;\r
-        \r
-        /**\r
-         * \r
-         * @param context ISessionContext\r
-         */\r
-        public ColorSelectionListener(ISessionContext context) {\r
-            super(context);\r
-        }\r
-\r
-        @Override\r
-        public void widgetSelected(SelectionEvent e) {\r
-            if(color.getWidget().isDisposed())\r
-                return;\r
-            // Save the event for coordinates\r
-            this.e = e;\r
-            super.widgetSelected(e);\r
-        }\r
-\r
-        @Override\r
-        public void apply(WriteGraph graph, Resource input) throws DatabaseException {\r
-            if(color.getWidget().isDisposed())\r
-                return;\r
-            \r
-            final Resource resource = getResource(graph, input);\r
-            final Display display = color.getWidget().getDisplay();\r
-            final RGB oldRGB = getColor(graph, resource);\r
-            \r
-            display.asyncExec(new RunnableWithObject(oldRGB) {\r
-                public void run() {\r
-                    // Use color dialog to select a color\r
-                    Shell shell = new Shell(display);\r
-                    ColorDialog cd = new ColorDialog(shell);\r
-                    Point point = color.getWidget().toDisplay(e.x - 150, e.y - 150);\r
-                    cd.getParent().setLocation(point.x, point.y);\r
-                    cd.setText("Select color");\r
-                    cd.setRGB((RGB)getObject());\r
-                    rgb = cd.open();\r
-                    if(rgb == null)\r
-                        return;\r
-                    \r
-                    SimanticsUI.getSession().asyncRequest(new WriteRequest() {\r
-                        \r
-                        @Override\r
-                        public void perform(WriteGraph graph) throws DatabaseException {\r
-                            G2DResource g2d = G2DResource.getInstance(graph);\r
-                            float[] components = new float[] {(float)rgb.red / 255.0f,  (float)rgb.green / 255.0f, (float)rgb.blue / 255.0f, 1.0f};\r
-                            graph.claimLiteral(resource, getColorRelation(graph), g2d.Color, components);                            \r
-                        }\r
-                    });\r
-                    \r
-                }\r
-            });\r
-            \r
-            \r
-\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * SelectionFactory for default and custom color radio buttons\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class DefaultColorSelectionFactory extends ReadFactoryImpl<Resource, Boolean> {\r
-\r
-        private Boolean isCustom;\r
-\r
-        /**\r
-         * \r
-         * @param isCustom Is this custom button?\r
-         */\r
-        public DefaultColorSelectionFactory(Boolean isCustom) {\r
-            super();\r
-            this.isCustom = isCustom;\r
-        }\r
-\r
-        @Override\r
-        public Object getIdentity(Object inputContents) {\r
-            return new Triple<Resource, Object, Boolean>((Resource) inputContents, getClass(), isCustom);\r
-        }\r
-\r
-        @Override\r
-        public Boolean perform(ReadGraph graph, Resource input) throws DatabaseException {\r
-            Resource r = graph.getPossibleObject(getResource(graph, input), getColorRelation(graph));\r
-            boolean result = false; // Default == not selected\r
-            if(r == null && !isCustom) {\r
-                // No color definition and default-button -> selected\r
-                result =  true;\r
-            } else if(r != null && isCustom) {\r
-                // color definition and custom button -> selected\r
-                result =  true;\r
-            }\r
-            return result;\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * SelectionListener for default and custom radio buttons\r
-     * \r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class DefaultColorSelectionListener extends SelectionListenerImpl<Resource> {\r
-\r
-        private SelectionEvent e;\r
-\r
-        public DefaultColorSelectionListener(ISessionContext context) {\r
-            super(context);\r
-        }\r
-\r
-        @Override\r
-        public void widgetSelected(SelectionEvent e) {\r
-            this.e = e; \r
-            super.widgetSelected(e);\r
-        }\r
-\r
-        @Override\r
-        public void apply(WriteGraph graph, Resource input) throws DatabaseException {\r
-            Resource resource = getResource(graph, input);\r
-            if(customColor.getWidget().equals(e.widget)) {\r
-                // Custom selected. If there is no color already, create a default Blue color\r
-                G2DResource g2d = G2DResource.getInstance(graph);\r
-                if(graph.getPossibleObject(resource, getColorRelation(graph)) == null) {\r
-                    float[] components = java.awt.Color.BLUE.getColorComponents(new float[4]);\r
-                    components[3] = 1.0f;\r
-                    graph.claimLiteral(resource, getColorRelation(graph), g2d.Color, components);\r
-                }\r
-            } else {\r
-                // Default selected, remove color definition\r
-                graph.deny(resource, getColorRelation(graph));\r
-            }\r
-        }\r
-    }\r
-\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/DoubleValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/DoubleValidator.java
deleted file mode 100644 (file)
index 74b984b..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.eclipse.jface.dialogs.IInputValidator;\r
-\r
-/**\r
- * Validator for validating that an input is double.\r
- * \r
- * Can allow empty strings.\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class DoubleValidator implements IInputValidator {\r
-    \r
-    boolean allowEmpty;\r
-    \r
-    /**\r
-     * New double validator. Does not allow empty strings\r
-     */\r
-    public DoubleValidator() {\r
-        this(false);\r
-    }\r
-    \r
-    /**\r
-     * New double validator.\r
-     * @param allowEmpty Are empty strings allowed\r
-     */\r
-    public DoubleValidator(boolean allowEmpty) {\r
-        this.allowEmpty = allowEmpty;\r
-    }\r
-    \r
-    @Override\r
-    public String isValid(String newText) {\r
-        if (allowEmpty && newText.trim().isEmpty())\r
-            return null;\r
-        try {\r
-            Double.parseDouble(newText);\r
-            return null;\r
-        } catch (NumberFormatException e) {\r
-            return e.getMessage();\r
-        }\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/JFreeChartPropertyColorProvider.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/JFreeChartPropertyColorProvider.java
deleted file mode 100644 (file)
index d8dea9b..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.eclipse.jface.resource.ColorDescriptor;\r
-import org.eclipse.jface.resource.ResourceManager;\r
-import org.eclipse.swt.graphics.Color;\r
-import org.eclipse.swt.graphics.RGB;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ITrackedColorProvider;\r
-\r
-/**\r
- * ColorProvider providing coloring scheme for chart tab text widgets\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class JFreeChartPropertyColorProvider implements ITrackedColorProvider {\r
-    \r
-    private final ResourceManager resourceManager;\r
-    \r
-    private final ColorDescriptor highlightColor = ColorDescriptor.createFrom(new RGB(254, 255, 197));\r
-    private final ColorDescriptor inactiveColor = ColorDescriptor.createFrom(new RGB(255, 255, 255));\r
-    private final ColorDescriptor invalidInputColor = ColorDescriptor.createFrom(new RGB(255, 128, 128));\r
-\r
-    public JFreeChartPropertyColorProvider(ResourceManager resourceManager) {\r
-        this.resourceManager = resourceManager;\r
-    }\r
-    \r
-    @Override\r
-    public Color getEditingBackground() {\r
-        return null;\r
-    }\r
-\r
-    @Override\r
-    public Color getHoverBackground() {\r
-        return resourceManager.createColor(highlightColor);\r
-    }\r
-\r
-    @Override\r
-    public Color getInactiveBackground() {\r
-        return resourceManager.createColor(inactiveColor);\r
-    }\r
-\r
-    @Override\r
-    public Color getInvalidBackground() {\r
-        return resourceManager.createColor(invalidInputColor);\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/RVIFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/RVIFactory.java
deleted file mode 100644 (file)
index d029827..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.simantics.browsing.ui.swt.widgets.impl.ReadFactoryImpl;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Class for providing RVI content to a text field with all '/' characters changed to '.'\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class RVIFactory extends ReadFactoryImpl<Resource, String> {\r
-\r
-    @Override\r
-    public String perform(ReadGraph graph, Resource input) throws DatabaseException {\r
-        String value = graph.getPossibleRelatedValue(input, JFreeChartResource.getInstance(graph).variableRVI);\r
-        return value != null ? value = value.substring(1).replace('/', '.') : "";\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/RVIModifier.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/RVIModifier.java
deleted file mode 100644 (file)
index 27246f5..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.eclipse.jface.bindings.keys.KeyStroke;\r
-import org.eclipse.jface.bindings.keys.ParseException;\r
-import org.eclipse.jface.fieldassist.ContentProposalAdapter;\r
-import org.eclipse.jface.fieldassist.IContentProposal;\r
-import org.eclipse.jface.fieldassist.IContentProposalListener;\r
-import org.eclipse.jface.fieldassist.IContentProposalListener2;\r
-import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;\r
-import org.eclipse.jface.fieldassist.TextContentAdapter;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.simantics.browsing.ui.swt.widgets.impl.TextModifyListenerImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.TrackedModifyEvent;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * Class for modifying variable name to rvi and saving it to database.\r
- * \r
- * Modifier also adds content proposal support to the control it is added to.\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class RVIModifier extends TextModifyListenerImpl<Resource> {\r
-\r
-    private boolean active;\r
-    private Control control;\r
-    \r
-    private char[] alphaNumericCharacters = {\r
-        'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','Ã¥','ä','ö',\r
-        'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','Ã…','Ä','Ö',\r
-        '1','2','3','4','5','6','7','8','9','0','.','_'};\r
-    \r
-    /**\r
-     * Create a new RVIModifier and attach a content proposal support to control\r
-     * @param control\r
-     * @param support\r
-     */\r
-    public RVIModifier(Control control, WidgetSupport support) {\r
-        this.control = control;\r
-        this.active = true;\r
-        \r
-        KeyStroke keyStroke = null;\r
-        try {\r
-            keyStroke = KeyStroke.getInstance("Ctrl+Space");\r
-        } catch (ParseException e1) {\r
-            e1.printStackTrace();\r
-        }\r
-        \r
-        SimpleContentProposalProvider scpp = new VariableProposalProvider(control, support);\r
-        scpp.setFiltering(true);\r
-\r
-        ContentProposalAdapter adapter = new ContentProposalAdapter(\r
-                control, new TextContentAdapter(), scpp, keyStroke, alphaNumericCharacters);\r
-        adapter.setAutoActivationDelay(0);\r
-        adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);\r
-        adapter.addContentProposalListener(new IContentProposalListener2() {\r
-\r
-            @Override\r
-            public void proposalPopupOpened(ContentProposalAdapter adapter) {\r
-                if(RVIModifier.this != null)\r
-                    RVIModifier.this.deactivate();\r
-            }\r
-\r
-            @Override\r
-            public void proposalPopupClosed(ContentProposalAdapter adapter) {\r
-                if(RVIModifier.this != null)\r
-                    RVIModifier.this.activate();\r
-            }\r
-        });\r
-\r
-        adapter.addContentProposalListener(new IContentProposalListener() {\r
-\r
-            @Override\r
-            public void proposalAccepted(IContentProposal proposal) {\r
-                if(RVIModifier.this.control != null && !RVIModifier.this.control.isDisposed())\r
-                    RVIModifier.this.modifyText(new TrackedModifyEvent(RVIModifier.this.control, proposal.getContent()));\r
-            }\r
-        });\r
-    \r
-    \r
-    }\r
-    \r
-\r
-    @Override\r
-    public void applyText(WriteGraph graph, Resource resource, String text) throws DatabaseException {\r
-        if(active) {\r
-            text = "/" + text.replace('.', '/');\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            graph.claimLiteral(resource, jfree.variableRVI, text, Bindings.STRING);\r
-            graph.deny(resource, jfree.variableFilter);\r
-        }\r
-    }\r
-\r
-    public void deactivate() {\r
-        active = false;\r
-    }\r
-\r
-    public void activate() {\r
-        active = true;\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/RangeComposite.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/RangeComposite.java
deleted file mode 100644 (file)
index 9af6be3..0000000
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import java.util.HashMap;\r
-import java.util.Iterator;\r
-import java.util.LinkedHashMap;\r
-import java.util.List;\r
-import java.util.Map;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.ScrolledComposite;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.layout.GridLayout;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedCombo;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ComboModifyListenerImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ReadFactoryImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupportImpl;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.common.utils.NameUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.variable.Variable;\r
-import org.simantics.db.layer0.variable.Variables;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.db.procedure.Listener;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.SysdynResource;\r
-import org.simantics.sysdyn.ui.trend.chart.ChartUtils;\r
-import org.simantics.utils.RunnableWithObject;\r
-import org.simantics.utils.datastructures.Quad;\r
-import org.simantics.utils.datastructures.Triple;\r
-import org.simantics.utils.ui.AdaptionUtils;\r
-\r
-/**\r
- * Composite for range controls in chart series properties\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class RangeComposite extends Composite implements Widget {\r
-\r
-    private Composite composite;\r
-    \r
-    public RangeComposite(Composite parent, ISessionContext context, WidgetSupport support, int style) {\r
-        super(parent, style);\r
-        support.register(this);\r
-        GridLayoutFactory.fillDefaults().spacing(3, 0).margins(3, 3).applyTo(this);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(this);\r
-        composite = this;\r
-    }\r
-\r
-    @Override\r
-    public void setInput(final ISessionContext context, final Object input) {\r
-        if(composite == null || composite.isDisposed())\r
-            return;\r
-\r
-        final Resource series = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-\r
-        /*\r
-         *  Listen to the enumerations assigned to the variable in this series.\r
-         *  Listener is needed because the user can change the variableRVI for the series\r
-         *  and that changes the options for range\r
-         */\r
-        context.getSession().asyncRequest(new Read<LinkedHashMap<String, Resource>>() {\r
-\r
-            @Override\r
-            public LinkedHashMap<String, Resource> perform(ReadGraph graph) throws DatabaseException {\r
-                JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                SysdynResource sr = SysdynResource.getInstance(graph);\r
-\r
-                String realizationURI = ChartUtils.getCurrentRealizationURI(graph, series);\r
-                String rvi = graph.getPossibleRelatedValue(series, jfree.variableRVI);\r
-                if(rvi == null)\r
-                    return null;\r
-                \r
-                try {\r
-                    // Find the variable for the current variableRVI\r
-                    Variable v = Variables.getVariable(graph, realizationURI + rvi.trim());\r
-                    if(v == null)\r
-                        return null;\r
-                    \r
-                    // Find all enumeration replacements in the variable's path\r
-                    HashMap<Resource, Resource> redeclarations = new HashMap<Resource, Resource>();\r
-                    Variable parent = v;\r
-                    while((parent = parent.getParent(graph)) != null) {\r
-                       Resource represents = parent.getRepresents(graph);\r
-                       Resource type = graph.getSingleObject(represents, Layer0.getInstance(graph).InstanceOf);\r
-                       if(!graph.isInheritedFrom(type, sr.Module))\r
-                               break;\r
-                       \r
-                       for(Resource redeclaration : graph.getObjects(represents, sr.Module_redeclaration)) {\r
-                               redeclarations.put(\r
-                                               graph.getPossibleObject(redeclaration, sr.Redeclaration_replacedEnumeration), \r
-                                               graph.getPossibleObject(redeclaration, sr.Redeclaration_replacingEnumeration)\r
-                                               );\r
-                       }\r
-                    }\r
-                    \r
-                    \r
-                    \r
-                    \r
-                    Resource variable = v.getRepresents(graph);\r
-                    \r
-                    // Return the enumerations assigned to that variable\r
-                    Resource arrayIndexes = graph.getPossibleObject(variable, sr.Variable_arrayIndexesList);\r
-                    if(arrayIndexes != null) {\r
-                        LinkedHashMap<String, Resource> result = new LinkedHashMap<String, Resource>();\r
-                        for(Resource enumeration : ListUtils.toList(graph, arrayIndexes)) {\r
-                               \r
-                               // Find possible redeclarations for enumeration\r
-                               Resource redeclaration = enumeration;\r
-                               while(redeclarations.get(redeclaration) != null)\r
-                                       redeclaration = redeclarations.get(redeclaration);\r
-                               \r
-                            String enumerationName = NameUtils.getSafeName(graph, redeclaration);\r
-                            result.put(enumerationName, redeclaration);\r
-                        }\r
-                        return result;\r
-                    }\r
-                } catch (DatabaseException e) {\r
-                    // No variable was found, return null\r
-                }\r
-                return null;\r
-            }\r
-\r
-        }, new Listener<LinkedHashMap<String, Resource>>() {\r
-\r
-            @Override\r
-            public void execute(LinkedHashMap<String, Resource> result) {\r
-                if(isDisposed())\r
-                    return;\r
-\r
-                // Always modify the composite, even with null result\r
-                composite.getDisplay().asyncExec(new RunnableWithObject(result) {\r
-                    @Override\r
-                    public void run() {\r
-                        if(composite == null || composite.isDisposed())\r
-                            return;\r
-\r
-                        // Remove all content (even with null result)\r
-                        for(Control child : composite.getChildren())\r
-                            child.dispose();\r
-\r
-                        if(getObject() == null)\r
-                            return;\r
-\r
-                        // New widgetSupport for the combos\r
-                        WidgetSupportImpl support = new WidgetSupportImpl();\r
-\r
-                        Label label;\r
-                        TrackedCombo combo;\r
-                        LinkedHashMap<?, ?> result = (LinkedHashMap<?, ?>)getObject();\r
-                        Iterator<?> iterator = result.keySet().iterator();\r
-                        \r
-                        // For each array index (enumeration), create a label and a combo \r
-                        int index = 0;\r
-                        while(iterator.hasNext()) {\r
-                            Object key = iterator.next();\r
-                            Composite c = new Composite(composite, SWT.NONE);\r
-                            GridDataFactory.fillDefaults().applyTo(c);\r
-                            GridLayoutFactory.fillDefaults().applyTo(c);\r
-                            \r
-                            label = new Label(c, SWT.NONE);\r
-                            label.setText((String)key);\r
-                            GridDataFactory.fillDefaults().align(SWT.CENTER, SWT.END).applyTo(label);\r
-\r
-                            combo = new TrackedCombo(c, support, SWT.READ_ONLY);\r
-                            combo.setItemFactory(new RangeItemFactory(index, (Resource)result.get(key)));\r
-                            combo.setSelectionFactory(new RangeSelectionFactory(index));\r
-                            combo.addModifyListener(new RangeModifyListener(index, result.size()));\r
-                            GridDataFactory.fillDefaults().applyTo(combo.getWidget());\r
-                            index++;\r
-                        }\r
-                        \r
-                        // Set the width of the combo \r
-                        GridLayout gl = (GridLayout)composite.getLayout();\r
-                        gl.numColumns = index;\r
-                        \r
-                        // Set input for the combos\r
-                        support.fireInput(context, input);\r
-                        \r
-                        /*\r
-                         *  Find out if this composite is located in a scrolled composite. \r
-                         *  If it is, resize the scrolled composite\r
-                         */\r
-                        Composite previousParent = composite.getParent();\r
-                        for(int i = 0; i < 5; i++) {\r
-                            if(previousParent.getParent() instanceof ScrolledComposite) {\r
-                                previousParent.layout();\r
-                                ScrolledComposite sc = (ScrolledComposite) previousParent.getParent();\r
-                                Point size = previousParent.computeSize(SWT.DEFAULT, SWT.DEFAULT);\r
-                                sc.setMinSize(size);\r
-                                break;\r
-                            }\r
-                            previousParent = previousParent.getParent();\r
-                        }\r
-                    }\r
-                });                    \r
-            }\r
-\r
-            @Override\r
-            public void exception(Throwable t) {\r
-                t.printStackTrace();\r
-            }\r
-\r
-            @Override\r
-            public boolean isDisposed() {\r
-                return composite == null || composite.isDisposed();\r
-            }\r
-        });\r
-    }\r
-\r
-    /**\r
-     * \r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class RangeSelectionFactory extends ReadFactoryImpl<Resource, String> {\r
-\r
-        int index;\r
-\r
-        /**\r
-         * \r
-         * @param index Index of the enumeration in the variable\r
-         */\r
-        public RangeSelectionFactory(int index) {\r
-            this.index = index;\r
-        }\r
-\r
-        public Object getIdentity(Object inputContents) {\r
-            return new Triple<Object, Integer, Class<?>>(inputContents, index, getClass());\r
-        }\r
-\r
-        @Override\r
-        public String perform(ReadGraph graph, Resource series) throws DatabaseException {\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            String[] filter = graph.getPossibleRelatedValue(series, jfree.variableFilter, Bindings.STRING_ARRAY);\r
-            \r
-            /*\r
-             * If no filter was found or the index is not applicable, return "All"\r
-             */\r
-            if(filter == null)\r
-                return "All";\r
-            else if(filter.length < index)\r
-                return "All";\r
-            else\r
-                return filter[index];\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * RangeItemFactory finds all inexes of a given enumeration \r
-     * and adds "Sum" and "All" to the returned indexes\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class RangeItemFactory extends ReadFactoryImpl<Resource, Map<String, Object>> {\r
-\r
-        private int index;\r
-        private Resource enumeration;\r
-\r
-        /**\r
-         * \r
-         * @param index Index of the enumeration in the variable\r
-         * @param enumeration The enumeration\r
-         */\r
-        public RangeItemFactory(int index, Resource enumeration) {\r
-            this.index = index;\r
-            this.enumeration = enumeration;\r
-        }\r
-\r
-        public Object getIdentity(Object inputContents) {\r
-            return new Quad<Object, Integer, Resource, Class<?>>(inputContents, index, enumeration, getClass());\r
-        }\r
-        @Override\r
-        public Map<String, Object> perform(ReadGraph graph, Resource series) throws DatabaseException {\r
-            SysdynResource sr = SysdynResource.getInstance(graph);\r
-            LinkedHashMap<String, Object> result = new LinkedHashMap<String, Object>();\r
-            Resource enumerationIndexes = graph.getPossibleObject(enumeration, sr.Enumeration_enumerationIndexList);\r
-            List<Resource> indexes = ListUtils.toList(graph, enumerationIndexes);\r
-            // First add "All" and "Sum", then all of the enumeration indexes in order\r
-            result.put("All", "All");\r
-            result.put("Sum", "Sum");\r
-            for(Resource index : indexes) {\r
-                String name = NameUtils.getSafeName(graph, index);\r
-                result.put(name, name);\r
-            }\r
-            return result;\r
-        }\r
-    }\r
-\r
-    /**\r
-     * RangeModifyListener for modifying a range filter in chart series \r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class RangeModifyListener  extends ComboModifyListenerImpl<Resource> {\r
-        \r
-        private int index, size;\r
-\r
-        /**\r
-         * \r
-         * @param index Index of the modified range filter\r
-         * @param size Size of the whole filter (for situations where there is no filter)\r
-         */\r
-        public RangeModifyListener(int index, int size) {\r
-            this.index = index;\r
-            this.size = size;\r
-        }\r
-\r
-        @Override\r
-        public void applyText(WriteGraph graph, Resource series, String text) throws DatabaseException {\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            String[] filter = graph.getPossibleRelatedValue(series, jfree.variableFilter, Bindings.STRING_ARRAY);\r
-            \r
-            // If there is no filter, create a default filter with all indexes "All"\r
-            if(filter == null) {\r
-                filter = new String[size];\r
-                for(int i = 0; i < filter.length; i++) {\r
-                    filter[i] = "All";\r
-                }\r
-            }\r
-            \r
-            // Modify the filter index\r
-            filter[index] = text;\r
-            graph.claimLiteral(series, jfree.variableFilter, filter, Bindings.STRING_ARRAY);\r
-        }\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/TitleFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/TitleFactory.java
deleted file mode 100644 (file)
index d9a081f..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.simantics.browsing.ui.swt.widgets.impl.ReadFactoryImpl;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * TextFactory for chart title\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class TitleFactory extends ReadFactoryImpl<Resource, String>   {\r
-    @Override\r
-    public String perform(ReadGraph graph, Resource chart) throws DatabaseException {\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Resource title = graph.syncRequest(new PossibleObjectWithType(chart, l0.ConsistsOf, jfree.TextTitle));\r
-        if(title == null)\r
-            return "";\r
-        else {\r
-            String label = graph.getPossibleRelatedValue(title, l0.HasLabel, Bindings.STRING);\r
-            return label == null ? "" : label;\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/TitleModifier.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/TitleModifier.java
deleted file mode 100644 (file)
index d47fbcd..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.simantics.browsing.ui.swt.widgets.impl.TextModifyListenerImpl;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.layer0.utils.direct.GraphUtils;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-\r
-/**\r
- * TitleModifier for chart title\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class TitleModifier extends TextModifyListenerImpl<Resource> {\r
-\r
-    @Override\r
-    public void applyText(WriteGraph graph, Resource chart, String text) throws DatabaseException {\r
-        Layer0 l0 = Layer0.getInstance(graph);\r
-        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-        Resource title = graph.syncRequest(new PossibleObjectWithType(chart, l0.ConsistsOf, jfree.TextTitle));\r
-        if(title == null) {\r
-            title = GraphUtils.create2(graph, jfree.TextTitle,\r
-                    jfree.Title_position, jfree.Top);\r
-        }\r
-        graph.claimLiteral(title, l0.HasLabel, text);\r
-    }\r
-\r
-}
\ No newline at end of file
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/TrackedSpinner.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/TrackedSpinner.java
deleted file mode 100644 (file)
index b27ecd0..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.eclipse.core.runtime.ListenerList;\r
-import org.eclipse.swt.events.ModifyEvent;\r
-import org.eclipse.swt.events.ModifyListener;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Spinner;\r
-import org.simantics.browsing.ui.common.ErrorLogger;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ReadFactory;\r
-import org.simantics.browsing.ui.swt.widgets.impl.TextModifyListener;\r
-import org.simantics.browsing.ui.swt.widgets.impl.TrackedModifyEvent;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.db.procedure.Listener;\r
-import org.simantics.utils.ui.SWTUtils;\r
-\r
-/**\r
- * Class for implementing Widget behavior for SWT Spinner in Simantics.\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class TrackedSpinner implements Widget {\r
-\r
-    private Spinner         spinner;\r
-    private ListenerList    modifyListeners;\r
-    private ReadFactory<?, Integer> selectionFactory;\r
-\r
-\r
-    public TrackedSpinner(Composite parent, WidgetSupport support, int style) {\r
-        spinner = new Spinner(parent, style);\r
-        support.register(this);\r
-        \r
-        // Add a ModifyListener that uses all listeners in modifyListeners -list\r
-        spinner.addModifyListener(new ModifyListener() {\r
-            \r
-            @Override\r
-            public void modifyText(ModifyEvent e) {\r
-                if (modifyListeners != null) {\r
-                    TrackedModifyEvent event = new TrackedModifyEvent(spinner, spinner.getText());\r
-                    for (Object o : modifyListeners.getListeners()) {\r
-                        ((TextModifyListener) o).modifyText(event);\r
-                    }\r
-                }                \r
-            }\r
-        });\r
-    }\r
-\r
-    @Override\r
-    public void setInput(ISessionContext context, Object input) {\r
-\r
-        // Update all modifyListeners\r
-        if (modifyListeners != null) {\r
-            for (Object o : modifyListeners.getListeners()) {\r
-                if(o instanceof Widget) {\r
-                    ((Widget) o).setInput(context, input);\r
-                }\r
-            }\r
-        }\r
-\r
-        if (selectionFactory != null) {\r
-            // Get a value for the spinner\r
-            selectionFactory.listen(context, input, new Listener<Integer>() {\r
-                @Override\r
-                public void exception(Throwable t) {\r
-                    ErrorLogger.defaultLogError(t);\r
-                }\r
-                @Override\r
-                public void execute(final Integer selection) {\r
-                    SWTUtils.asyncExec(spinner, new Runnable() {\r
-                        @Override\r
-                        public void run() {\r
-                            if(isDisposed()) return;\r
-                            spinner.setSelection(selection);\r
-                        }\r
-                    });\r
-                }\r
-                @Override\r
-                public boolean isDisposed() {\r
-                    return spinner.isDisposed();\r
-                }\r
-            });\r
-        }\r
-\r
-    }\r
-    \r
-    /**\r
-     * Set a selection factory for the spinner\r
-     * \r
-     * @param selectionFactory ReadFactory<?, Integer> SelectionFactory\r
-     */\r
-    public void setSelectionFactory(ReadFactory<?, Integer> selectionFactory) {\r
-        this.selectionFactory = selectionFactory;\r
-    }\r
-    \r
-    /**\r
-     * Add a modifyListener for the spinner\r
-     * @param listener TextModifyListener\r
-     */\r
-    public synchronized void addModifyListener(TextModifyListener listener) {\r
-        if (modifyListeners == null) {\r
-            modifyListeners = new ListenerList(ListenerList.IDENTITY);\r
-        }\r
-        modifyListeners.add(listener);\r
-    }\r
-\r
-    /**\r
-     * Remove modifyListener from the spinner\r
-     * \r
-     * @param listener TextModifyListener\r
-     */\r
-    public synchronized void removeModifyListener(TextModifyListener listener) {\r
-        if (modifyListeners == null)\r
-            return;\r
-        modifyListeners.remove(listener);\r
-    }\r
-\r
-    /**\r
-     * Get the SWT Spinner of this TrackedSpinner widget\r
-     * @return\r
-     */\r
-    public Spinner getWidget() {\r
-        return spinner;\r
-    }\r
-    \r
-    /**\r
-     * Set minimum value \r
-     * @param value int minimum value\r
-     */\r
-    public void setMinimum(int value) {\r
-        spinner.setMinimum(value);\r
-    }\r
-    \r
-    /**\r
-     * Set maximum value\r
-     * @param value int maximum value\r
-     */\r
-    public void setMaximum(int value) {\r
-        spinner.setMaximum(value);\r
-    }\r
-    \r
-    /**\r
-     * Sets the receiver's selection, minimum value, maximum value, digits, increment and page increment all at once. \r
-     * \r
-     * @param selection the new selection value\r
-     * @param minimum the new minimum value\r
-     * @param maximum the new maximum value\r
-     * @param digits the new digits value\r
-     * @param increment the new increment value\r
-     * @param pageIncrement the new pageIncrement value\r
-     */\r
-    public void setValues(int selection, int  minimum, int  maximum, int digits, int increment, int pageIncrement) {\r
-        spinner.setValues(selection, minimum, maximum, digits, increment, pageIncrement);\r
-    }\r
-    \r
-    /**\r
-     * Sets the selection, which is the receiver's position, to the argument.\r
-     * If the argument is not within the range specified by minimum and maximum, \r
-     * it will be adjusted to fall within this range.\r
-     * \r
-     * @param value\r
-     */\r
-    public void setSelection(int value) {\r
-        spinner.setSelection(value);\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/VariableExistsValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/VariableExistsValidator.java
deleted file mode 100644 (file)
index 1247e82..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.eclipse.jface.dialogs.IInputValidator;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedText;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.db.procedure.Listener;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.SysdynResource;\r
-import org.simantics.ui.SimanticsUI;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-\r
-/**\r
- * Variable exists validator for tracked text widgets. \r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class VariableExistsValidator implements IInputValidator, Widget {\r
-\r
-    private String[] names;\r
-    private TrackedText text;\r
-    private boolean allowEmpty;\r
-    \r
-    /**\r
-     * Validate against all variables\r
-     * \r
-     * Do not allow empty input\r
-     * @param support WidgetSupport\r
-     * @param text Text widget\r
-     */\r
-    public VariableExistsValidator(WidgetSupport support, TrackedText text) {\r
-        this(support, text, false);\r
-    }\r
-    \r
-    /**\r
-     * Validate against all variables\r
-     * \r
-     * @param support WidgetSupport\r
-     * @param text Text widget\r
-     * @param allowEmpty Allow empty input text\r
-     */\r
-    public VariableExistsValidator(WidgetSupport support, TrackedText text, boolean allowEmpty) {\r
-        support.register(this);\r
-        names = new String[] {"time"};\r
-        this.text = text;\r
-        this.allowEmpty = allowEmpty;\r
-    }\r
-    \r
-    /**\r
-     * Returns null if there is a variable named newText in the model\r
-     */\r
-    @Override\r
-    public String isValid(String newText) {\r
-        if(newText == null || newText.isEmpty()) {\r
-            if(allowEmpty)\r
-                return null;\r
-            else\r
-                return "Empty name not allowed";\r
-        }\r
-        \r
-        synchronized (names) {\r
-            for(String s : names) {\r
-                if(newText.equals(s))\r
-                    return null;\r
-            }\r
-        }\r
-        \r
-        return "Not a valid variable name";\r
-    }\r
-\r
-    @Override\r
-    public void setInput(ISessionContext context, Object input) {\r
-        final Resource resource = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-        \r
-        if(resource == null) {\r
-            names = new String[] {"time"};\r
-            return;\r
-        }\r
-        \r
-        Resource model = null;\r
-        try {\r
-            /* Find the model resource. It can be found with PartOf \r
-               relations from series resource in a chart */\r
-            model  = context.getSession().syncRequest(new Read<Resource>() {\r
-\r
-                @Override\r
-                public Resource perform(ReadGraph graph) throws DatabaseException {\r
-                    Resource r = resource;\r
-                    while((r = graph.getPossibleObject(r, Layer0.getInstance(graph).PartOf)) != null) {\r
-                        if(graph.isInstanceOf(r, SysdynResource.getInstance(graph).SysdynModel))\r
-                            return r;\r
-                    }\r
-                    return null;\r
-                }\r
-                \r
-            });\r
-            \r
-            if(model != null) {\r
-                // Find all variables and set them as the reference for isValid(String)\r
-                SimanticsUI.getSession().asyncRequest(\r
-                        new AllVariablesOfModel(model)\r
-                , new Listener<String[]>() {\r
-\r
-                    @Override\r
-                    public void execute(String[] result) {\r
-                        names = result;\r
-                    }\r
-\r
-                    @Override\r
-                    public void exception(Throwable t) {\r
-                        t.printStackTrace();\r
-                    }\r
-\r
-                    @Override\r
-                    public boolean isDisposed() {\r
-                        return text.isDisposed();\r
-                    }\r
-\r
-                }); \r
-            }\r
-        } catch (DatabaseException e) {\r
-            e.printStackTrace();\r
-        }\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/VariableProposalProvider.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/VariableProposalProvider.java
deleted file mode 100644 (file)
index c073516..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties;\r
-\r
-import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.db.procedure.Listener;\r
-import org.simantics.ui.SimanticsUI;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-\r
-/**\r
- * Provides all variables a model contains\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class VariableProposalProvider extends SimpleContentProposalProvider implements Widget {\r
-\r
-    /**\r
-     * Provides all variables a model contains. Given resource needs to be\r
-     * part of a model (i.e. using PartOf leads eventually to a SysdynModel).\r
-     *  \r
-     * @param control Control that is using this provider\r
-     * @param resource A resource that is part of a model\r
-     */\r
-    public VariableProposalProvider(final Control control, WidgetSupport support) {\r
-        super(new String [] {});\r
-        support.register(this);\r
-        this.control = control;\r
-    }\r
-\r
-    private Resource resource;\r
-    private Control control;\r
-    \r
-    @Override\r
-    public void setInput(ISessionContext context, Object input) {\r
-\r
-        final Resource resource = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-        if(resource == null)\r
-            return;\r
-        this.resource = resource;\r
-        \r
-        SimanticsUI.getSession().asyncRequest(\r
-                new AllVariablesOfModel(resource)\r
-        , new Listener<String[]>() {\r
-\r
-            @Override\r
-            public void execute(String[] result) {\r
-                setProposals(result);\r
-            }\r
-\r
-            @Override\r
-            public void exception(Throwable t) {\r
-                t.printStackTrace();\r
-            }\r
-\r
-            @Override\r
-            public boolean isDisposed() {\r
-                return control == null || \r
-                        control.isDisposed() || \r
-                        !resource.equals(VariableProposalProvider.this.resource);\r
-            }\r
-\r
-        }); \r
-        \r
-    }\r
-    \r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarAxisTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarAxisTab.java
deleted file mode 100644 (file)
index c17e693..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.bar;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.jface.viewers.StructuredSelection;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.ScrolledComposite;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Group;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.swt.widgets.Spinner;\r
-import org.eclipse.ui.IWorkbenchSite;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyFactory;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyModifier;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedText;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ReadFactoryImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.TextModifyListener;\r
-import org.simantics.browsing.ui.swt.widgets.impl.TrackedModifyEvent;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupportImpl;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.common.request.ReadRequest;\r
-import org.simantics.db.common.request.WriteRequest;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.modeling.ui.chart.property.DoublePropertyFactory;\r
-import org.simantics.modeling.ui.chart.property.DoublePropertyModifier;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.properties.LabelPropertyTabContributor;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.AxisHidePropertyComposite;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.ColorPicker;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.DoubleValidator;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.JFreeChartPropertyColorProvider;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.TrackedSpinner;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-\r
-/**\r
- * Tab for bar chart axis properties\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class BarAxisTab extends LabelPropertyTabContributor implements Widget {\r
-\r
-    private TrackedSpinner angle;\r
-    private Integer angleInt = null;\r
-    private WidgetSupportImpl domainAxisSupport = new WidgetSupportImpl();\r
-    private WidgetSupportImpl rangeAxisSupport = new WidgetSupportImpl();\r
-    private TrackedText rangelabel, rangemin, rangemax;\r
-    private ScrolledComposite sc;\r
-    private Composite composite;\r
-\r
-\r
-    @Override\r
-    public void createControls(Composite body, IWorkbenchSite site, ISessionContext context, WidgetSupport support) {\r
-        support.register(this);\r
-\r
-        // Scrolled composite containing all of the properties in this tab\r
-        sc = new ScrolledComposite(body, SWT.NONE | SWT.H_SCROLL | SWT.V_SCROLL);\r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(sc);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).applyTo(sc);\r
-        sc.setExpandHorizontal(true);\r
-        sc.setExpandVertical(true);\r
-\r
-        composite = new Composite(sc, SWT.NONE);\r
-        GridLayoutFactory.fillDefaults().numColumns(2).margins(3, 3).applyTo(composite);\r
-\r
-        // Domain Axis properties\r
-        Group domainGroup = new Group(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().span(2, 1).grab(true, false).applyTo(domainGroup);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(3).applyTo(domainGroup);\r
-        domainGroup.setText("Domain axis");\r
-\r
-        // Label for x-axis\r
-        Label label = new Label(domainGroup, SWT.NONE);\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Label:");\r
-\r
-        rangelabel = new TrackedText(domainGroup, domainAxisSupport, SWT.BORDER);\r
-        rangelabel.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel, ""));\r
-        rangelabel.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasLabel));\r
-        rangelabel.setColorProvider(new JFreeChartPropertyColorProvider(rangelabel.getResourceManager()));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(rangelabel.getWidget());\r
-\r
-        Composite axisHide = new AxisHidePropertyComposite(domainGroup, context, domainAxisSupport, SWT.NONE);\r
-        GridDataFactory.fillDefaults().span(1, 3).applyTo(axisHide);\r
-\r
-        Label angleLabel = new Label(domainGroup, SWT.NONE);\r
-        angleLabel.setText("Label angle:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(angleLabel);\r
-\r
-        Composite angleComposite = new Composite(domainGroup, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(angleComposite);\r
-        GridLayoutFactory.fillDefaults().applyTo(angleComposite);\r
-        angle = new TrackedSpinner(angleComposite, domainAxisSupport, SWT.BORDER);\r
-        angle.setSelectionFactory(new AngleSelectionFactory());\r
-        angle.addModifyListener(new AngleModifyListener());\r
-        angle.setMinimum(0);\r
-        angle.setMaximum(90);\r
-        angle.getWidget().setIncrement(5);\r
-        GridDataFactory.fillDefaults().applyTo(angle.getWidget());\r
-\r
-        // Domain Color\r
-        label = new Label(domainGroup, SWT.NONE);\r
-        label.setText("Color:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-\r
-        Composite colorPicker = new ColorPicker(domainGroup, context, domainAxisSupport, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(colorPicker);\r
-\r
-        domainGroup.layout();\r
-\r
-        // Range Axis properties\r
-        Group rangeGroup = new Group(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().span(2, 1).grab(true, false).applyTo(rangeGroup);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(3).applyTo(rangeGroup);\r
-        rangeGroup.setText("Range axis");\r
-\r
-        // Label for range axis\r
-        label = new Label(rangeGroup, SWT.NONE);\r
-        label.setText("Label:");\r
-        label.setAlignment(SWT.RIGHT);\r
-        GridDataFactory.fillDefaults().hint(angleLabel.getBounds().width, SWT.DEFAULT).align(SWT.END, SWT.CENTER).applyTo(label);\r
-\r
-        rangelabel = new TrackedText(rangeGroup, rangeAxisSupport, SWT.BORDER);\r
-        rangelabel.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel, ""));\r
-        rangelabel.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasLabel));\r
-        rangelabel.setColorProvider(new JFreeChartPropertyColorProvider(rangelabel.getResourceManager()));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(rangelabel.getWidget());\r
-\r
-        axisHide = new AxisHidePropertyComposite(rangeGroup, context, rangeAxisSupport, SWT.NONE);\r
-        GridDataFactory.fillDefaults().span(1, 4).applyTo(axisHide);\r
-\r
-        // Min and max values for range axis\r
-        label = new Label(rangeGroup, SWT.NONE);\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Min:");\r
-\r
-        Composite minmax = new Composite(rangeGroup, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(minmax);\r
-        GridLayoutFactory.fillDefaults().numColumns(3).applyTo(minmax);\r
-        rangemin = new TrackedText(minmax, rangeAxisSupport, SWT.BORDER);\r
-        rangemin.setColorProvider(new JFreeChartPropertyColorProvider(rangemin.getResourceManager()));\r
-        rangemin.setTextFactory(new DoublePropertyFactory(JFreeChartResource.URIs.Axis_min));\r
-        rangemin.addModifyListener(new DoublePropertyModifier(context, JFreeChartResource.URIs.Axis_min));\r
-        rangemin.setInputValidator(new DoubleValidator(true));\r
-\r
-        label = new Label(minmax, SWT.NONE);\r
-        label.setText("Max:");\r
-        rangemax = new TrackedText(minmax, rangeAxisSupport, SWT.BORDER);\r
-        rangemax.setColorProvider(new JFreeChartPropertyColorProvider(rangemax.getResourceManager()));\r
-        rangemax.setTextFactory(new DoublePropertyFactory(JFreeChartResource.URIs.Axis_max));\r
-        rangemax.addModifyListener(new DoublePropertyModifier(context, JFreeChartResource.URIs.Axis_max));\r
-        rangemax.setInputValidator(new DoubleValidator(true));\r
-\r
-        // Range Color\r
-        label = new Label(rangeGroup, SWT.NONE);\r
-        label.setText("Color:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-\r
-        colorPicker = new ColorPicker(rangeGroup, context, rangeAxisSupport, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(colorPicker);\r
-\r
-        // Resize scrolled composite\r
-        sc.setContent(composite);\r
-        Point size = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);\r
-        sc.setMinSize(size);\r
-    }\r
-\r
-    /**\r
-     * ModifyListener for the angle {@link TrackedSpinner}\r
-     * \r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class AngleModifyListener implements TextModifyListener, Widget {\r
-\r
-        private ISessionContext context;\r
-        private Object lastInput = null;\r
-\r
-        @Override\r
-        public void modifyText(TrackedModifyEvent e) {\r
-            if(context == null)\r
-                return;\r
-\r
-            // Get the text value from spinner and associated resource (input)\r
-            Spinner spinner = (Spinner)e.getWidget();\r
-            final String textValue = spinner.getText();\r
-            final Object input = lastInput;\r
-\r
-            try {\r
-                context.getSession().syncRequest(new WriteRequest() {\r
-\r
-                    @Override\r
-                    public void perform(WriteGraph graph) throws DatabaseException {\r
-                        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                        Resource domainAxis = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-                        try {\r
-                            // usually reliable, since the spinner does all the checks\r
-                            Double value = Double.parseDouble(textValue); \r
-                            Double oldValue = graph.getPossibleRelatedValue(domainAxis, jfree.Axis_rotateLabelDegrees, Bindings.DOUBLE);\r
-                            if(oldValue == null || !oldValue.equals(value)) {\r
-                                graph.claimLiteral(domainAxis, jfree.Axis_rotateLabelDegrees, value, Bindings.DOUBLE);\r
-                                angleInt = value.intValue();\r
-                            }\r
-                        } catch (NumberFormatException e) {\r
-                            graph.claimLiteral(domainAxis, jfree.Axis_rotateLabelDegrees, 0.0, Bindings.DOUBLE);\r
-                            angleInt = 0;\r
-                        }\r
-                    }\r
-\r
-                });\r
-            } catch (DatabaseException e1) {\r
-                e1.printStackTrace();\r
-            }\r
-        }\r
-\r
-        @Override\r
-        public void setInput(ISessionContext context, Object parameter) {\r
-            this.context = context;\r
-            lastInput = parameter;\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * Class for setting the value for angle {@link TrackedSpinner}\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class AngleSelectionFactory extends ReadFactoryImpl<Resource, Integer>   {\r
-\r
-        @Override\r
-        public Integer perform(ReadGraph graph, Resource domainAxis) throws DatabaseException {\r
-            if(angleInt == null) {\r
-                Double angle = 0.0;\r
-                JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                if(domainAxis != null) {\r
-                    Double value = graph.getPossibleRelatedValue(domainAxis, jfree.Axis_rotateLabelDegrees);\r
-                    if(value != null)\r
-                        angle = value;\r
-                }\r
-                return angle.intValue();\r
-            } else {\r
-                return angleInt;\r
-            }\r
-        }\r
-\r
-    }\r
-\r
-    @Override\r
-    public void setInput(final ISessionContext context, Object input) {\r
-        final Resource chart = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-        if(chart == null)\r
-            return; \r
-\r
-        context.getSession().asyncRequest(new ReadRequest() {\r
-\r
-            @Override\r
-            public void run(ReadGraph graph) throws DatabaseException {\r
-                Layer0 l0 = Layer0.getInstance(graph);\r
-                JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                Resource plot = graph.syncRequest(new PossibleObjectWithType(chart, l0.ConsistsOf, jfree.Plot));\r
-                if(plot == null) return;\r
-                Resource rangeAxis = graph.getPossibleObject(plot, jfree.Plot_rangeAxis);\r
-                if(rangeAxis == null) return;\r
-                rangeAxisSupport.fireInput(context, new StructuredSelection(rangeAxis));\r
-\r
-                Resource domainAxis = graph.getPossibleObject(plot, jfree.Plot_domainAxis);\r
-                if(domainAxis == null) return;\r
-                domainAxisSupport.fireInput(context, new StructuredSelection(domainAxis));\r
-            }\r
-        });\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarGeneralPropertiesTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarGeneralPropertiesTab.java
deleted file mode 100644 (file)
index be09d06..0000000
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.bar;\r
-\r
-import java.util.LinkedHashMap;\r
-import java.util.Map;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.jface.layout.LayoutConstants;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.ScrolledComposite;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Group;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.ui.IWorkbenchSite;\r
-import org.simantics.browsing.ui.swt.widgets.Button;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyFactory;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyModifier;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedCombo;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedText;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ComboModifyListenerImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ReadFactoryImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.layer0.utils.direct.GraphUtils;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.properties.LabelPropertyTabContributor;\r
-import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyFactory;\r
-import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyModifier;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.BooleanPropertyFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.BooleanSelectionListener;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.DoubleValidator;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.JFreeChartPropertyColorProvider;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.TitleFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.TitleModifier;\r
-\r
-\r
-/**\r
- * General properties of a bar chart\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class BarGeneralPropertiesTab extends LabelPropertyTabContributor {\r
-\r
-    private ScrolledComposite sc;\r
-    private Composite composite;\r
-    private Button hgrid, htitle, hlegend;\r
-    private TrackedText name, title, time;\r
-    private TrackedCombo type;\r
-\r
-\r
-    @Override\r
-    public void createControls(Composite body, IWorkbenchSite site, ISessionContext context, WidgetSupport support) {    \r
-        // Scrolled composite containing all of the properties in this tab\r
-        sc = new ScrolledComposite(body, SWT.NONE | SWT.H_SCROLL | SWT.V_SCROLL);\r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(sc);\r
-        GridLayoutFactory.fillDefaults().applyTo(sc);\r
-        sc.setExpandHorizontal(true);\r
-        sc.setExpandVertical(true);\r
-\r
-        composite = new Composite(sc, SWT.NONE);\r
-        GridLayoutFactory.fillDefaults().numColumns(2).margins(3, 3).applyTo(composite);\r
-\r
-        // General properties\r
-        Group general = new Group(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(general);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(4).applyTo(general);\r
-        general.setText("General");\r
-\r
-        // first column: labels\r
-        Composite labelColumn1 = new Composite(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).applyTo(labelColumn1);\r
-        GridLayoutFactory.fillDefaults().applyTo(labelColumn1);\r
-        \r
-        // second column: name and title\r
-        Composite propertyColumn1 = new Composite(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(propertyColumn1);\r
-        GridLayoutFactory.fillDefaults().spacing(0, LayoutConstants.getSpacing().y).applyTo(propertyColumn1);\r
-        \r
-        // third column: labels\r
-        Composite labelColumn2 = new Composite(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).applyTo(labelColumn2);\r
-        GridLayoutFactory.fillDefaults().spacing(0, LayoutConstants.getSpacing().y).applyTo(labelColumn2);\r
-        \r
-        // fourth column: type and time\r
-        Composite propertyColumn2 = new Composite(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).applyTo(propertyColumn2);\r
-        GridLayoutFactory.fillDefaults().applyTo(propertyColumn2);\r
-        \r
-        // Name\r
-        Label label = new Label(labelColumn1, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Name:");\r
-\r
-        name = new org.simantics.browsing.ui.swt.widgets.TrackedText(propertyColumn1, support, SWT.BORDER);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(name.getWidget());\r
-        name.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel));\r
-        name.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasLabel));\r
-        name.setColorProvider(new JFreeChartPropertyColorProvider(name.getResourceManager()));\r
-\r
-        // Type\r
-        label = new Label(labelColumn2, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Type:");\r
-\r
-        type = new TrackedCombo(propertyColumn2, support, SWT.BORDER | SWT.READ_ONLY);\r
-        type.addModifyListener(new TypeModifyListener());\r
-        type.setItemFactory(new TypeItemFactory());\r
-        type.setSelectionFactory(new TypeSelectionFactory());\r
-        GridDataFactory.fillDefaults().applyTo(type.getWidget());\r
-\r
-        // Title (Which is different than name)\r
-        label = new Label(labelColumn1, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Title:");\r
-\r
-        title = new org.simantics.browsing.ui.swt.widgets.TrackedText(propertyColumn1, support, SWT.BORDER);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(title.getWidget());\r
-        title.setTextFactory(new TitleFactory());\r
-        title.addModifyListener(new TitleModifier());\r
-        title.setColorProvider(new JFreeChartPropertyColorProvider(name.getResourceManager()));\r
-\r
-        // Time\r
-        label = new Label(labelColumn2, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Time:");\r
-        \r
-        time = new org.simantics.browsing.ui.swt.widgets.TrackedText(propertyColumn2, support, SWT.BORDER);\r
-        GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(time.getWidget());\r
-        time.setTextFactory(new DoublePropertyFactory(JFreeChartResource.URIs.Chart_time));\r
-        time.addModifyListener(new DoublePropertyModifier(context, JFreeChartResource.URIs.Chart_time));\r
-        time.setInputValidator(new DoubleValidator(true));\r
-        time.setColorProvider(new JFreeChartPropertyColorProvider(time.getResourceManager()));\r
-        \r
-        // Group for hide options\r
-        Group hideGroup = new Group(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(hideGroup);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(2).applyTo(hideGroup);\r
-        hideGroup.setText("Hide");\r
-\r
-        hgrid = new Button(hideGroup, support, SWT.CHECK);\r
-        hgrid.setText("Grid");\r
-        hgrid.setSelectionFactory(new BooleanPropertyFactory(JFreeChartResource.URIs.Plot, JFreeChartResource.URIs.Plot_visibleGrid, true));\r
-        hgrid.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.Plot, JFreeChartResource.URIs.Plot_visibleGrid));\r
-        htitle = new Button(hideGroup, support, SWT.CHECK);\r
-        htitle.setText("Title");\r
-        htitle.setSelectionFactory(new BooleanPropertyFactory(JFreeChartResource.URIs.TextTitle, JFreeChartResource.URIs.visible, true));\r
-        htitle.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.TextTitle, JFreeChartResource.URIs.visible));\r
-        hlegend = new Button(hideGroup, support, SWT.CHECK);\r
-        hlegend.setText("Legend");\r
-        hlegend.setSelectionFactory(new BooleanPropertyFactory(null, JFreeChartResource.URIs.Chart_visibleLegend, true));\r
-        hlegend.addSelectionListener(new BooleanSelectionListener(context, null, JFreeChartResource.URIs.Chart_visibleLegend));\r
-\r
-        \r
-        \r
-        // Resize scrolled composite\r
-        sc.setContent(composite);\r
-        Point size = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);\r
-        sc.setMinSize(size);\r
-    }\r
-\r
-    /**\r
-     * \r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TypeSelectionFactory extends ReadFactoryImpl<Resource, String> {\r
-        @Override\r
-        public String perform(ReadGraph graph, Resource chart) throws DatabaseException {\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-\r
-            Resource plot = graph.syncRequest(new PossibleObjectWithType(chart, l0.ConsistsOf, jfree.CategoryPlot));\r
-            if(plot != null) {\r
-                Resource dataset = graph.syncRequest(new PossibleObjectWithType(plot, l0.ConsistsOf, jfree.CategoryDataset));\r
-\r
-                if(dataset != null) {\r
-                    Resource renderer = graph.syncRequest(new PossibleObjectWithType(dataset, jfree.Dataset_renderer, jfree.Renderer));\r
-\r
-                    if(renderer != null && graph.isInstanceOf(renderer, jfree.StackedBarRenderer))\r
-                        return "Stacked";\r
-                }\r
-            }\r
-            return "Normal";\r
-        }\r
-    }\r
-\r
-    /**\r
-     * RangeItemFactory finds all inexes of a given enumeration \r
-     * and adds "Sum" and "All" to the returned indexes\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TypeItemFactory extends ReadFactoryImpl<Resource, Map<String, Object>> {\r
-        @Override\r
-        public Map<String, Object> perform(ReadGraph graph, Resource series) throws DatabaseException {\r
-            LinkedHashMap<String, Object> result = new LinkedHashMap<String, Object>();\r
-            result.put("Normal", "Normal");\r
-            result.put("Stacked", "Stacked");\r
-            return result;\r
-        }\r
-    }\r
-\r
-    /**\r
-     * TypeModifyListener for modifying the type of a bar chart \r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TypeModifyListener  extends ComboModifyListenerImpl<Resource> {\r
-        @Override\r
-        public void applyText(WriteGraph graph, Resource chart, String text) throws DatabaseException {\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-\r
-            Resource plot = graph.syncRequest(new PossibleObjectWithType(chart, l0.ConsistsOf, jfree.CategoryPlot));\r
-            if(plot == null)\r
-                return;\r
-\r
-            Resource dataset = graph.syncRequest(new PossibleObjectWithType(plot, l0.ConsistsOf, jfree.CategoryDataset));\r
-            if(dataset == null)\r
-                return;\r
-\r
-            graph.deny(dataset, jfree.Dataset_renderer);\r
-\r
-            Resource renderer;\r
-            if(text.equals("Stacked"))\r
-                renderer = GraphUtils.create2(graph, jfree.StackedBarRenderer);\r
-            else\r
-                renderer = GraphUtils.create2(graph, jfree.BarRenderer);\r
-\r
-            graph.claim(dataset, jfree.Dataset_renderer, renderer);\r
-        }\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarSeriesPropertyComposite.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarSeriesPropertyComposite.java
deleted file mode 100644 (file)
index da07fe5..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.bar;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyFactory;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyModifier;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedText;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyFactory;\r
-import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyModifier;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.DoubleValidator;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.JFreeChartPropertyColorProvider;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RVIFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RVIModifier;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RangeComposite;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.VariableExistsValidator;\r
-\r
-/**\r
- * Composite for modifying properties of a series in a bar chart\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class BarSeriesPropertyComposite extends Composite {\r
-    \r
-    private TrackedText variable, label, time;\r
-    \r
-    public BarSeriesPropertyComposite(Composite parent, final ISessionContext context, WidgetSupport support, int style) {\r
-        super(parent, style);\r
-        \r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(2).applyTo(this);\r
-\r
-        // Variable for the series\r
-        Label label = new Label(this, SWT.NONE);\r
-        label.setText("Variable:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-\r
-        variable = new TrackedText(this, support, SWT.BORDER);\r
-        variable.setTextFactory(new RVIFactory());\r
-        variable.addModifyListener(new RVIModifier(variable.getWidget(), support));\r
-        variable.setInputValidator(new VariableExistsValidator(support, variable));\r
-        variable.setColorProvider(new JFreeChartPropertyColorProvider(this.variable.getResourceManager()));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(this.variable.getWidget());\r
-\r
-        // Range\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Range:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-        \r
-        RangeComposite rangeComposite = new RangeComposite(this, context, support, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(rangeComposite);\r
-        \r
-        \r
-        // Label to be displayed in chart for this series\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Label:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-\r
-        this.label = new TrackedText(this, support, SWT.BORDER);\r
-        this.label.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel, ""));\r
-        this.label.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasLabel));\r
-        this.label.setColorProvider(new JFreeChartPropertyColorProvider(this.label.getResourceManager()));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(this.label.getWidget());\r
-        \r
-        // Time\r
-        label = new Label(this, SWT.NONE);\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-        label.setText("Time:");\r
-        \r
-        Composite composite = new Composite(this, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(composite);\r
-        GridLayoutFactory.fillDefaults().applyTo(composite);\r
-        \r
-        time = new org.simantics.browsing.ui.swt.widgets.TrackedText(composite, support, SWT.BORDER);\r
-        time.setTextFactory(new DoublePropertyFactory(JFreeChartResource.URIs.Series_time));\r
-        time.addModifyListener(new DoublePropertyModifier(context, JFreeChartResource.URIs.Series_time));\r
-        time.setInputValidator(new DoubleValidator(true));\r
-        time.setColorProvider(new JFreeChartPropertyColorProvider(time.getResourceManager()));\r
-        GridDataFactory.fillDefaults().applyTo(time.getWidget());\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarSeriesTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/bar/BarSeriesTab.java
deleted file mode 100644 (file)
index 6196c35..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.bar;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.jface.viewers.ISelectionProvider;\r
-import org.eclipse.jface.viewers.IStructuredSelection;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.ScrolledComposite;\r
-import org.eclipse.swt.events.SelectionAdapter;\r
-import org.eclipse.swt.events.SelectionEvent;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Tree;\r
-import org.eclipse.ui.IWorkbenchSite;\r
-import org.simantics.browsing.ui.swt.SingleSelectionInputSource;\r
-import org.simantics.browsing.ui.swt.widgets.Button;\r
-import org.simantics.browsing.ui.swt.widgets.GraphExplorerComposite;\r
-import org.simantics.browsing.ui.swt.widgets.impl.SelectionListenerImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupportImpl;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.util.RemoverUtil;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.SysdynResource;\r
-import org.simantics.sysdyn.ui.properties.LabelPropertyTabContributor;\r
-import org.simantics.sysdyn.ui.trend.chart.ChartUtils;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.xyline.AxisAndVariablesExplorerComposite;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-import org.simantics.utils.datastructures.ArrayMap;\r
-\r
-/**\r
- * Tab containing the series of a bar chart\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class BarSeriesTab extends LabelPropertyTabContributor implements Widget {\r
-\r
-    private GraphExplorerComposite explorer;\r
-    private ScrolledComposite propertyContainer;\r
-    private WidgetSupportImpl additionalSupport;\r
-    private Button add, remove;\r
-    private Resource chartResource;\r
-    private BarSeriesPropertyComposite spc;\r
-\r
-\r
-    public BarSeriesTab() {\r
-        additionalSupport = new WidgetSupportImpl();\r
-    }\r
-\r
-    @Override\r
-    public void createControls(Composite body, IWorkbenchSite site, final ISessionContext context, WidgetSupport support) {\r
-        support.register(this);\r
-        Composite composite = new Composite(body, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);\r
-        GridLayoutFactory.fillDefaults().numColumns(2).margins(3, 3).applyTo(composite);\r
-\r
-        // (Ontology-based) GraphExplorer displaying variables in a bar chart\r
-        explorer = new AxisAndVariablesExplorerComposite(ArrayMap.keys(\r
-                "displaySelectors", "displayFilter").values(false, false), site, composite, support, SWT.FULL_SELECTION | SWT.BORDER | SWT.SINGLE);\r
-        explorer.setBrowseContexts(SysdynResource.URIs.BarSeriesBrowseContext);\r
-        explorer.setInputSource(new SingleSelectionInputSource(\r
-                Resource.class));\r
-        explorer.getExplorer().setAutoExpandLevel(2); // Expand everything in the beginning\r
-        explorer.finish();\r
-\r
-        ((Tree)explorer.getExplorerControl()).addSelectionListener(new SelectionAdapter() {\r
-            public void widgetSelected(SelectionEvent e) {\r
-                updateSelection(context);\r
-            }\r
-        });\r
-        GridDataFactory.fillDefaults().hint(250, SWT.DEFAULT).grab(false, true).applyTo(explorer);\r
-\r
-        // Scrolled composite for displaying properties of a selection in explorer\r
-        propertyContainer = new ScrolledComposite(composite, SWT.H_SCROLL | SWT.V_SCROLL);\r
-        GridDataFactory.fillDefaults().span(1, 2).grab(true, true).applyTo(propertyContainer);\r
-        GridLayoutFactory.fillDefaults().applyTo(propertyContainer);\r
-        propertyContainer.setExpandHorizontal(true);\r
-        propertyContainer.setExpandVertical(true);\r
-\r
-        // Buttons for adding and removing variables from a pie plot\r
-        Composite buttonComposite = new Composite(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(buttonComposite);\r
-        GridLayoutFactory.fillDefaults().numColumns(3).applyTo(buttonComposite);\r
-\r
-        add = new Button(buttonComposite, additionalSupport, SWT.NONE);\r
-        add.setText("Add");\r
-        add.addSelectionListener(new NewVariableListener(context));\r
-\r
-        remove = new Button(buttonComposite, additionalSupport, SWT.NONE);\r
-        remove.setText("Remove");\r
-        remove.addSelectionListener(new RemoveListener(context));\r
-    }\r
-\r
-    /**\r
-     * Updates the content of propertyContainer  \r
-     * @param context\r
-     */\r
-    private void updateSelection(ISessionContext context) {\r
-        ISelectionProvider selectionProvider = (ISelectionProvider)explorer.getAdapter(ISelectionProvider.class);\r
-        IStructuredSelection selection = (IStructuredSelection)selectionProvider.getSelection();\r
-        final Resource resource = AdaptionUtils.adaptToSingle(selection, Resource.class);\r
-        if(resource == null)\r
-            return;\r
-\r
-        for(Control child : propertyContainer.getChildren()) {\r
-            child.dispose();\r
-        }\r
-        spc = new BarSeriesPropertyComposite(propertyContainer, context, additionalSupport, SWT.NONE);\r
-\r
-        additionalSupport.fireInput(context, selection);\r
-\r
-        propertyContainer.setContent(spc);\r
-        Point size = spc.computeSize(SWT.DEFAULT, SWT.DEFAULT);\r
-        propertyContainer.setMinSize(size);\r
-    }\r
-\r
-    /**\r
-     * SelectionListener for adding a new variable to a plot\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class NewVariableListener extends SelectionListenerImpl<Resource> {\r
-\r
-        public NewVariableListener(ISessionContext context) {\r
-            super(context);\r
-        }\r
-\r
-        @Override\r
-        public void apply(WriteGraph graph, Resource input) throws DatabaseException {\r
-            Resource dataset = null;\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-\r
-            if(input == null) {\r
-                if(chartResource != null) {\r
-                    Resource plot = graph.syncRequest(new PossibleObjectWithType(chartResource, l0.ConsistsOf, jfree.Plot));\r
-                    if(plot != null)\r
-                        dataset = graph.syncRequest(new PossibleObjectWithType(plot, l0.ConsistsOf, jfree.Dataset));\r
-                }\r
-            } else {\r
-                if(graph.isInstanceOf(input, jfree.Series)) {\r
-                    dataset = graph.getPossibleObject(input, l0.PartOf);\r
-                }\r
-            }\r
-\r
-            if(dataset != null) {\r
-                // Create series with no rvi\r
-                ChartUtils.createSeries(graph, dataset, null);\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * SelectionListener for remove button\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class RemoveListener extends SelectionListenerImpl<Resource> {\r
-\r
-        public RemoveListener(ISessionContext context) {\r
-            super(context);\r
-        }\r
-\r
-        /**\r
-         * Removes selected resource from explorer\r
-         */\r
-        @Override\r
-        public void apply(WriteGraph graph, Resource input) throws DatabaseException {\r
-            if(input == null)\r
-                return; \r
-\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-            Resource list = null;\r
-            if(graph.isInstanceOf(input, jfree.Series)) {\r
-                // Remove series from dataset and seriesList\r
-                Resource dataset = graph.getPossibleObject(input, l0.PartOf);\r
-                if(dataset != null)\r
-                    list = graph.getPossibleObject(dataset, jfree.Dataset_seriesList);\r
-\r
-                if(list != null)\r
-                    ListUtils.removeElement(graph, list, input);\r
-                RemoverUtil.remove(graph, input);\r
-            }\r
-        }\r
-    }\r
-\r
-    @Override\r
-    public void setInput(ISessionContext context, Object input) {\r
-        chartResource = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-    }\r
-\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/pie/PieGeneralPropertiesTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/pie/PieGeneralPropertiesTab.java
deleted file mode 100644 (file)
index 10b034a..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.pie;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.jface.layout.LayoutConstants;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.ScrolledComposite;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Group;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.ui.IWorkbenchSite;\r
-import org.simantics.browsing.ui.swt.widgets.Button;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyFactory;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyModifier;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedText;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.properties.LabelPropertyTabContributor;\r
-import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyFactory;\r
-import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyModifier;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.BooleanPropertyFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.BooleanSelectionListener;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.DoubleValidator;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.JFreeChartPropertyColorProvider;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.TitleFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.TitleModifier;\r
-\r
-/**\r
- * General properties of a pie chart\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class PieGeneralPropertiesTab extends LabelPropertyTabContributor {\r
-\r
-    private ScrolledComposite sc;\r
-    private Composite composite;\r
-    private Button htitle, hlegend, hlabels;\r
-    private TrackedText name, title, time;\r
-\r
-    @Override\r
-    public void createControls(Composite body, IWorkbenchSite site, ISessionContext context, WidgetSupport support) {    \r
-        // Scrolled composite containing all of the properties in this tab\r
-        sc = new ScrolledComposite(body, SWT.NONE | SWT.H_SCROLL | SWT.V_SCROLL);\r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(sc);\r
-        GridLayoutFactory.fillDefaults().applyTo(sc);\r
-        sc.setExpandHorizontal(true);\r
-        sc.setExpandVertical(true);\r
-\r
-        composite = new Composite(sc, SWT.NONE);\r
-        GridLayoutFactory.fillDefaults().numColumns(2).margins(3, 3).applyTo(composite);\r
-\r
-        // General properties\r
-        Group general = new Group(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(general);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(4).applyTo(general);\r
-        general.setText("General");\r
-\r
-        // first column: labels\r
-        Composite labelColumn1 = new Composite(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).applyTo(labelColumn1);\r
-        GridLayoutFactory.fillDefaults().applyTo(labelColumn1);\r
-        \r
-        // first column: name and title\r
-        Composite propertyColumn1 = new Composite(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(propertyColumn1);\r
-        GridLayoutFactory.fillDefaults().spacing(0, LayoutConstants.getSpacing().y).applyTo(propertyColumn1);\r
-        \r
-        // first column: labels\r
-        Composite labelColumn2 = new Composite(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).applyTo(labelColumn2);\r
-        GridLayoutFactory.fillDefaults().spacing(0, LayoutConstants.getSpacing().y).applyTo(labelColumn2);\r
-        \r
-        // first column: type and time\r
-        Composite propertyColumn2 = new Composite(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).applyTo(propertyColumn2);\r
-        GridLayoutFactory.fillDefaults().applyTo(propertyColumn2);\r
-        \r
-        // Name\r
-        Label label = new Label(labelColumn1, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Name:");\r
-\r
-        name = new org.simantics.browsing.ui.swt.widgets.TrackedText(propertyColumn1, support, SWT.BORDER);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(name.getWidget());\r
-        name.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel));\r
-        name.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasLabel));\r
-        name.setColorProvider(new JFreeChartPropertyColorProvider(name.getResourceManager()));\r
-\r
-        // Dummy data for now. Waiting for different pie chart types\r
-        label = new Label(labelColumn2, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).applyTo(label);\r
-        label.setText("");\r
-        \r
-        label = new Label(propertyColumn2, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).applyTo(label);\r
-        label.setText("");\r
-        \r
-        // Title (Which is different than name)\r
-        label = new Label(labelColumn1, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Title:");\r
-\r
-        title = new org.simantics.browsing.ui.swt.widgets.TrackedText(propertyColumn1, support, SWT.BORDER);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(title.getWidget());\r
-        title.setTextFactory(new TitleFactory());\r
-        title.addModifyListener(new TitleModifier());\r
-        title.setColorProvider(new JFreeChartPropertyColorProvider(name.getResourceManager()));\r
-\r
-        // Time\r
-        label = new Label(labelColumn2, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(false, true).align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Time:");\r
-        \r
-        time = new org.simantics.browsing.ui.swt.widgets.TrackedText(propertyColumn2, support, SWT.BORDER);\r
-        GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(time.getWidget());\r
-        time.setTextFactory(new DoublePropertyFactory(JFreeChartResource.URIs.Chart_time));\r
-        time.addModifyListener(new DoublePropertyModifier(context, JFreeChartResource.URIs.Chart_time));\r
-        time.setInputValidator(new DoubleValidator(true));\r
-        time.setColorProvider(new JFreeChartPropertyColorProvider(time.getResourceManager()));\r
-\r
-        // Group for hide options\r
-        Group hideGroup = new Group(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(hideGroup);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(2).applyTo(hideGroup);\r
-        hideGroup.setText("Hide");\r
-\r
-        htitle = new Button(hideGroup, support, SWT.CHECK);\r
-        htitle.setText("Title");\r
-        htitle.setSelectionFactory(new BooleanPropertyFactory(JFreeChartResource.URIs.TextTitle, JFreeChartResource.URIs.visible, true));\r
-        htitle.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.TextTitle, JFreeChartResource.URIs.visible));\r
-        hlegend = new Button(hideGroup, support, SWT.CHECK);\r
-        hlegend.setText("Legend");\r
-        hlegend.setSelectionFactory(new BooleanPropertyFactory(null, JFreeChartResource.URIs.Chart_visibleLegend, true));\r
-        hlegend.addSelectionListener(new BooleanSelectionListener(context, null, JFreeChartResource.URIs.Chart_visibleLegend));\r
-        hlabels = new Button(hideGroup, support, SWT.CHECK);\r
-        hlabels.setText("Section labels");\r
-        hlabels.setSelectionFactory(new BooleanPropertyFactory(JFreeChartResource.URIs.Plot, JFreeChartResource.URIs.Plot_visibleLabels, true));\r
-        hlabels.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.Plot, JFreeChartResource.URIs.Plot_visibleLabels));\r
-        \r
-        sc.setContent(composite);\r
-        Point size = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);\r
-        sc.setMinSize(size);\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/pie/PieSeriesPropertyComposite.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/pie/PieSeriesPropertyComposite.java
deleted file mode 100644 (file)
index 7ea26a4..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.pie;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.simantics.browsing.ui.swt.widgets.Button;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyFactory;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyModifier;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedText;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyFactory;\r
-import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyModifier;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.BooleanPropertyFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.BooleanSelectionListener;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.ColorPicker;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.DoubleValidator;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.JFreeChartPropertyColorProvider;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RVIFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RVIModifier;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RangeComposite;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.VariableExistsValidator;\r
-\r
-/**\r
- * Composite containing the properties of a series\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class PieSeriesPropertyComposite extends Composite {\r
-    \r
-    private TrackedText variable, label, time;\r
-    \r
-    public PieSeriesPropertyComposite(Composite parent, ISessionContext context, WidgetSupport support, int style) {\r
-        super(parent, style);\r
-        \r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(2).applyTo(this);\r
-\r
-        // Variable for the series\r
-        Label label = new Label(this, SWT.NONE);\r
-        label.setText("Variable:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-\r
-        variable = new TrackedText(this, support, SWT.BORDER);\r
-        variable.setTextFactory(new RVIFactory());\r
-        variable.addModifyListener(new RVIModifier(variable.getWidget(), support));\r
-        variable.setInputValidator(new VariableExistsValidator(support, variable));\r
-        variable.setColorProvider(new JFreeChartPropertyColorProvider(this.variable.getResourceManager()));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(this.variable.getWidget());\r
-\r
-        // Range\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Range:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-        \r
-        RangeComposite rangeComposite = new RangeComposite(this, context, support, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(rangeComposite);\r
-        \r
-        \r
-        // Label to be displayed in chart for this series\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Label:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-\r
-        this.label = new TrackedText(this, support, SWT.BORDER);\r
-        this.label.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel, ""));\r
-        this.label.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasLabel));\r
-        this.label.setColorProvider(new JFreeChartPropertyColorProvider(this.label.getResourceManager()));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(this.label.getWidget());\r
-\r
-        // Color\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Color:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-\r
-        Composite colorPicker = new ColorPicker(this, context, support, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(colorPicker);\r
-\r
-        // Time\r
-        label = new Label(this, SWT.NONE);\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-        label.setText("Time:");\r
-        \r
-        Composite composite = new Composite(this, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(composite);\r
-        GridLayoutFactory.fillDefaults().applyTo(composite);\r
-        \r
-        time = new org.simantics.browsing.ui.swt.widgets.TrackedText(composite, support, SWT.BORDER);\r
-        time.setTextFactory(new DoublePropertyFactory(JFreeChartResource.URIs.Series_time));\r
-        time.addModifyListener(new DoublePropertyModifier(context, JFreeChartResource.URIs.Series_time));\r
-        time.setInputValidator(new DoubleValidator(true));\r
-        time.setColorProvider(new JFreeChartPropertyColorProvider(time.getResourceManager()));\r
-        GridDataFactory.fillDefaults().applyTo(time.getWidget());\r
-        \r
-        // Exploded\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-        \r
-        Button exploded = new Button(this, support, SWT.CHECK);\r
-        exploded.setText("Exploded");\r
-        exploded.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.Series_exploded));\r
-        exploded.setSelectionFactory(new BooleanPropertyFactory(JFreeChartResource.URIs.Series_exploded));\r
-        GridDataFactory.fillDefaults().applyTo(exploded.getWidget());\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/pie/PieSeriesTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/pie/PieSeriesTab.java
deleted file mode 100644 (file)
index d05e5d2..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.pie;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.jface.viewers.ISelectionProvider;\r
-import org.eclipse.jface.viewers.IStructuredSelection;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.ScrolledComposite;\r
-import org.eclipse.swt.events.SelectionAdapter;\r
-import org.eclipse.swt.events.SelectionEvent;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Tree;\r
-import org.eclipse.ui.IWorkbenchSite;\r
-import org.simantics.browsing.ui.swt.SingleSelectionInputSource;\r
-import org.simantics.browsing.ui.swt.widgets.Button;\r
-import org.simantics.browsing.ui.swt.widgets.GraphExplorerComposite;\r
-import org.simantics.browsing.ui.swt.widgets.impl.SelectionListenerImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupportImpl;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.util.RemoverUtil;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.SysdynResource;\r
-import org.simantics.sysdyn.ui.properties.LabelPropertyTabContributor;\r
-import org.simantics.sysdyn.ui.trend.chart.ChartUtils;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.xyline.AxisAndVariablesExplorerComposite;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-import org.simantics.utils.datastructures.ArrayMap;\r
-\r
-/**\r
- * Tab for modifying series in a pie chart configuration\r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class PieSeriesTab extends LabelPropertyTabContributor implements Widget {\r
-\r
-    private GraphExplorerComposite explorer;\r
-    private ScrolledComposite propertyContainer;\r
-    private WidgetSupportImpl additionalSupport;\r
-    private Button add, remove;\r
-    private Resource chartResource;\r
-\r
-    public PieSeriesTab() {\r
-        additionalSupport = new WidgetSupportImpl();\r
-    }\r
-\r
-    @Override\r
-    public void createControls(Composite body, IWorkbenchSite site, final ISessionContext context, WidgetSupport support) {\r
-        support.register(this);\r
-        Composite composite = new Composite(body, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);\r
-        GridLayoutFactory.fillDefaults().numColumns(2).margins(3, 3).applyTo(composite);\r
-\r
-        // (Ontology-based) GraphExplorer displaying variables of a pie chart\r
-        explorer = new AxisAndVariablesExplorerComposite(ArrayMap.keys(\r
-                "displaySelectors", "displayFilter").values(false, false), site, composite, support, SWT.FULL_SELECTION | SWT.BORDER | SWT.SINGLE);\r
-        explorer.setBrowseContexts(SysdynResource.URIs.PieSeriesBrowseContext);\r
-        explorer.setInputSource(new SingleSelectionInputSource(\r
-                Resource.class));\r
-        explorer.getExplorer().setAutoExpandLevel(2); // Expand everything in the beginning\r
-        explorer.finish();\r
-\r
-        ((Tree)explorer.getExplorerControl()).addSelectionListener(new SelectionAdapter() {\r
-            public void widgetSelected(SelectionEvent e) {\r
-                updateSelection(context);\r
-            }\r
-        });\r
-        GridDataFactory.fillDefaults().hint(250, SWT.DEFAULT).grab(false, true).applyTo(explorer);\r
-\r
-        // Scrolled composite for displaying properties of a selection in explorer\r
-        propertyContainer = new ScrolledComposite(composite, SWT.H_SCROLL | SWT.V_SCROLL);\r
-        GridDataFactory.fillDefaults().span(1, 2).grab(true, true).applyTo(propertyContainer);\r
-        GridLayoutFactory.fillDefaults().applyTo(propertyContainer);\r
-        propertyContainer.setExpandHorizontal(true);\r
-        propertyContainer.setExpandVertical(true);\r
-\r
-\r
-        // Buttons for adding and removing variables from a pie plot\r
-        Composite buttonComposite = new Composite(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(buttonComposite);\r
-        GridLayoutFactory.fillDefaults().numColumns(3).applyTo(buttonComposite);\r
-\r
-        add = new Button(buttonComposite, additionalSupport, SWT.NONE);\r
-        add.setText("Add");\r
-        add.addSelectionListener(new NewVariableListener(context));\r
-\r
-        remove = new Button(buttonComposite, additionalSupport, SWT.NONE);\r
-        remove.setText("Remove");\r
-        remove.addSelectionListener(new RemoveListener(context));\r
-    }\r
-\r
-    /**\r
-     * Updates the content of propertyContainer  \r
-     * @param context\r
-     */\r
-    private void updateSelection(ISessionContext context) {\r
-        ISelectionProvider selectionProvider = (ISelectionProvider)explorer.getAdapter(ISelectionProvider.class);\r
-        IStructuredSelection selection = (IStructuredSelection)selectionProvider.getSelection();\r
-        final Resource resource = AdaptionUtils.adaptToSingle(selection, Resource.class);\r
-        if(resource == null)\r
-            return;\r
-\r
-        for(Control child : propertyContainer.getChildren()) {\r
-            child.dispose();\r
-        }\r
-\r
-        PieSeriesPropertyComposite spc = new PieSeriesPropertyComposite(propertyContainer, context, additionalSupport, SWT.NONE);\r
-        propertyContainer.setContent(spc);\r
-        Point size = spc.computeSize(SWT.DEFAULT, SWT.DEFAULT);\r
-        propertyContainer.setMinSize(size);\r
-\r
-        additionalSupport.fireInput(context, selection);\r
-    }\r
-\r
-\r
-    /**\r
-     * SelectionListener for adding a new variable to a plot\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class NewVariableListener extends SelectionListenerImpl<Resource> {\r
-\r
-        public NewVariableListener(ISessionContext context) {\r
-            super(context);\r
-        }\r
-\r
-        @Override\r
-        public void apply(WriteGraph graph, Resource input) throws DatabaseException {\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-            Resource dataset = null;\r
-            if(input == null) {\r
-                if(chartResource != null) {\r
-                    Resource plot = graph.syncRequest(new PossibleObjectWithType(chartResource, l0.ConsistsOf, jfree.Plot));\r
-                    if(plot != null)\r
-                        dataset = graph.syncRequest(new PossibleObjectWithType(plot, l0.ConsistsOf, jfree.Dataset));\r
-                }\r
-            } else {\r
-                if(graph.isInstanceOf(input, jfree.Series)) {\r
-                    dataset = graph.getPossibleObject(input, l0.PartOf);\r
-                }\r
-            }\r
-            if(dataset != null) {\r
-                // Create series with no rvi\r
-                Resource series = ChartUtils.createSeries(graph, dataset, null);\r
-                graph.claimLiteral(series, jfree.Series_exploded, false);\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * SelectionListener for remove button\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class RemoveListener extends SelectionListenerImpl<Resource> {\r
-\r
-        public RemoveListener(ISessionContext context) {\r
-            super(context);\r
-        }\r
-\r
-        /**\r
-         * Removes selected resource from explorer\r
-         */\r
-        @Override\r
-        public void apply(WriteGraph graph, Resource input) throws DatabaseException {\r
-            if(input == null)\r
-                return; \r
-\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-            Resource list = null;\r
-            if(graph.isInstanceOf(input, jfree.Series)) {\r
-                // Remove series from dataset and seriesList\r
-                Resource dataset = graph.getPossibleObject(input, l0.PartOf);\r
-                if(dataset != null)\r
-                    list = graph.getPossibleObject(dataset, jfree.Dataset_seriesList);\r
-\r
-                if(list != null)\r
-                    ListUtils.removeElement(graph, list, input);\r
-                RemoverUtil.remove(graph, input);\r
-            }\r
-        }\r
-    }\r
-    \r
-    @Override\r
-    public void setInput(ISessionContext context, Object input) {\r
-        chartResource = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/AxisAndVariablesExplorerComposite.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/AxisAndVariablesExplorerComposite.java
deleted file mode 100644 (file)
index a3ee7e6..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.xyline;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Map;\r
-\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.ui.IWorkbenchSite;\r
-import org.simantics.browsing.ui.NodeContext;\r
-import org.simantics.browsing.ui.common.ErrorLogger;\r
-import org.simantics.browsing.ui.model.InvalidContribution;\r
-import org.simantics.browsing.ui.model.dnd.DndBrowseContext;\r
-import org.simantics.browsing.ui.swt.widgets.GraphExplorerComposite;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.request.ReadRequest;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.procedure.Procedure;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.structural.ui.modelBrowser.ModelBrowser2;\r
-import org.simantics.ui.SimanticsUI;\r
-\r
-/**\r
- * ExplorerComposite allowing ontology-based DnD definitions. DnD Copied from {@link ModelBrowser2}\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class AxisAndVariablesExplorerComposite extends GraphExplorerComposite {\r
-\r
-    volatile DndBrowseContext dndBrowseContext;\r
-    \r
-    public AxisAndVariablesExplorerComposite(Map<String, Object> args, IWorkbenchSite site, Composite parent,\r
-            WidgetSupport support, int style) {\r
-        super(args, site, parent, support, style);\r
-        \r
-        SimanticsUI.getSession().asyncRequest(new ReadRequest() {\r
-            @Override\r
-            public void run(ReadGraph graph) throws DatabaseException { \r
-                ArrayList<Resource> browseContexts = new ArrayList<Resource>();\r
-                for (String uri : getBrowseContexts()) {\r
-                    Resource browseContext = graph.getPossibleResource(uri);\r
-                    if (browseContext != null)\r
-                        browseContexts.add(browseContext);\r
-                }\r
-                try {\r
-                    dndBrowseContext = DndBrowseContext.create(graph, browseContexts);\r
-                } catch (InvalidContribution e) {\r
-                    ErrorLogger.defaultLogError(e);\r
-                }\r
-            }\r
-        });\r
-    }\r
-    \r
-    @Override\r
-    protected void handleDrop(final Object data, final NodeContext target) {\r
-        if (target == null)\r
-            return;\r
-\r
-        SimanticsUI.getSession().asyncRequest(new Read<Runnable>() {\r
-            @Override\r
-            public Runnable perform(ReadGraph graph) throws DatabaseException {\r
-                if (dndBrowseContext == null)\r
-                    return null;\r
-                return dndBrowseContext.getAction(graph, target, data);\r
-            }\r
-        }, new Procedure<Runnable>() {\r
-            @Override\r
-            public void execute(Runnable result) {\r
-                if (result != null)\r
-                    result.run();\r
-            }\r
-\r
-            @Override\r
-            public void exception(Throwable t) {\r
-                ErrorLogger.defaultLogError(t);\r
-            }\r
-        });\r
-    }\r
-\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/AxisPropertyComposite.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/AxisPropertyComposite.java
deleted file mode 100644 (file)
index 22228fd..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.xyline;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.simantics.browsing.ui.swt.widgets.Button;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyFactory;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyModifier;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedText;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.modeling.ui.chart.property.DoublePropertyFactory;\r
-import org.simantics.modeling.ui.chart.property.DoublePropertyModifier;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.AxisHidePropertyComposite;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.ColorPicker;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.DoubleValidator;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.JFreeChartPropertyColorProvider;\r
-\r
-/**\r
- * Composite for displaying axis properties in {@link XYLineAxisAndVariablesTab}\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class AxisPropertyComposite extends Composite {\r
-\r
-    TrackedText name, units, min, max;\r
-    Button tlabels, tmarks;\r
-    \r
-    public AxisPropertyComposite(Composite parent, ISessionContext context, WidgetSupport support, int style) {\r
-        super(parent, style);\r
-        \r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(2).applyTo(this);\r
-        \r
-        // Label (units)\r
-        Label label = new Label(this, SWT.NONE);\r
-        label.setText("Label: ");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-        \r
-        units = new TrackedText(this, support, SWT.BORDER);\r
-        units.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel, "")); // FIXME: Units \r
-        units.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasLabel)); // FIXME: Units \r
-        units.setColorProvider(new JFreeChartPropertyColorProvider(units.getResourceManager()));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(units.getWidget());\r
-        \r
-        \r
-        // Minimum and maximum values\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Min:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-        Composite minmax = new Composite(this, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(minmax);\r
-        GridLayoutFactory.fillDefaults().numColumns(3).applyTo(minmax);\r
-        min = new TrackedText(minmax, support, SWT.BORDER);\r
-        min.setColorProvider(new JFreeChartPropertyColorProvider(min.getResourceManager()));\r
-        min.setTextFactory(new DoublePropertyFactory(JFreeChartResource.URIs.Axis_min));\r
-        min.addModifyListener(new DoublePropertyModifier(context, JFreeChartResource.URIs.Axis_min));\r
-        min.setInputValidator(new DoubleValidator(true));\r
-\r
-        label = new Label(minmax, SWT.NONE);\r
-        label.setText("Max:");\r
-        max = new TrackedText(minmax, support, SWT.BORDER);\r
-        max.setColorProvider(new JFreeChartPropertyColorProvider(max.getResourceManager()));\r
-        max.setTextFactory(new DoublePropertyFactory(JFreeChartResource.URIs.Axis_max));\r
-        max.addModifyListener(new DoublePropertyModifier(context, JFreeChartResource.URIs.Axis_max));\r
-        max.setInputValidator(new DoubleValidator(true));\r
-\r
-        \r
-        // Color\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Color:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-        \r
-        Composite colorPicker = new ColorPicker(this, context, support, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(colorPicker);\r
-        \r
-        // Tick and label visibility\r
-        Composite c = new Composite(this, SWT.NONE);\r
-        GridDataFactory.fillDefaults().span(2, 1).applyTo(c);\r
-        GridLayoutFactory.fillDefaults().applyTo(c);\r
-        Composite axisHide = new AxisHidePropertyComposite(c, context, support, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(axisHide);\r
-    }\r
-    \r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/SeriesPropertyComposite.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/SeriesPropertyComposite.java
deleted file mode 100644 (file)
index 1dbe6d4..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.xyline;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.swt.widgets.Spinner;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyFactory;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyModifier;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedText;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ReadFactoryImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.TextModifyListener;\r
-import org.simantics.browsing.ui.swt.widgets.impl.TrackedModifyEvent;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.WriteRequest;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.ColorPicker;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.JFreeChartPropertyColorProvider;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RVIFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RVIModifier;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RangeComposite;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.TrackedSpinner;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.VariableExistsValidator;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-\r
-/**\r
- * Composite for displaying series properties in {@link XYLineAxisAndVariablesTab}\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class SeriesPropertyComposite extends Composite {\r
-\r
-    private TrackedText variable, label;\r
-    private TrackedSpinner width;\r
-\r
-    public SeriesPropertyComposite(Composite parent, ISessionContext context, WidgetSupport support, int style) {\r
-        super(parent, style);\r
-\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(2).applyTo(this);\r
-\r
-        // Variable for the series\r
-        Label label = new Label(this, SWT.NONE);\r
-        label.setText("Variable:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-\r
-        variable = new TrackedText(this, support, SWT.BORDER);\r
-        variable.setTextFactory(new RVIFactory());\r
-        variable.addModifyListener(new RVIModifier(variable.getWidget(), support));\r
-        variable.setColorProvider(new JFreeChartPropertyColorProvider(this.variable.getResourceManager()));\r
-        variable.setInputValidator(new VariableExistsValidator(support, variable));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(this.variable.getWidget());\r
-\r
-        // Range\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Range:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-        \r
-        RangeComposite rangeComposite = new RangeComposite(this, context, support, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(rangeComposite);\r
-        \r
-        // Label to be displayed in chart for this series \r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Label:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-\r
-        this.label = new TrackedText(this, support, SWT.BORDER);\r
-        this.label.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel, ""));\r
-        this.label.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasLabel));\r
-        this.label.setColorProvider(new JFreeChartPropertyColorProvider(this.label.getResourceManager()));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(this.label.getWidget());\r
-\r
-        // Color\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Color:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-\r
-        Composite colorPicker = new ColorPicker(this, context, support, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(colorPicker);\r
-\r
-        // Line width\r
-        label = new Label(this, SWT.NONE);\r
-        label.setText("Line width:");\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.FILL).applyTo(label);\r
-\r
-        width = new TrackedSpinner(this, support, SWT.BORDER);\r
-        width.setSelectionFactory(new WidthSelectionFactory());\r
-        width.addModifyListener(new WidthModifyListener());\r
-        width.setMinimum(1);\r
-        width.setMaximum(10);\r
-\r
-    }\r
-\r
-\r
-    /**\r
-     * ModifyListener for the width {@link TrackedSpinner}\r
-     * \r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class WidthModifyListener implements TextModifyListener, Widget {\r
-\r
-        private ISessionContext context;\r
-        private Object lastInput = null;\r
-\r
-        @Override\r
-        public void modifyText(TrackedModifyEvent e) {\r
-            if(context == null)\r
-                return;\r
-\r
-            // Get the text value from spinner and associated resource (input)\r
-            Spinner spinner = (Spinner)e.getWidget();\r
-            final String textValue = spinner.getText();\r
-            final Object input = lastInput;\r
-\r
-            try {\r
-                context.getSession().syncRequest(new WriteRequest() {\r
-\r
-                    @Override\r
-                    public void perform(WriteGraph graph) throws DatabaseException {\r
-                        // Apply with (textValue) to the series (input)\r
-                        Resource series = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-                        JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                        try {\r
-                            // usually reliable, since the spinner does all the checks\r
-                            Integer value = Integer.parseInt(textValue); \r
-                            graph.claimLiteral(series, jfree.Series_lineWidth, value, Bindings.INTEGER);\r
-                        } catch (NumberFormatException e) {\r
-                            e.printStackTrace();\r
-                        }\r
-                    }\r
-\r
-                });\r
-            } catch (DatabaseException e1) {\r
-                e1.printStackTrace();\r
-            }\r
-        }\r
-\r
-        @Override\r
-        public void setInput(ISessionContext context, Object parameter) {\r
-            this.context = context;\r
-            lastInput = parameter;\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * Class for setting the value for width {@link TrackedSpinner}\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class WidthSelectionFactory extends ReadFactoryImpl<Resource, Integer>   {\r
-\r
-        @Override\r
-        public Integer perform(ReadGraph graph, Resource axis) throws DatabaseException {\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Integer width = graph.getPossibleRelatedValue(axis, jfree.Series_lineWidth);\r
-            if(width == null)\r
-                // Default width == 1\r
-                width = 1;\r
-            return width;\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/XYLineAxisAndVariablesTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/XYLineAxisAndVariablesTab.java
deleted file mode 100644 (file)
index 3081abb..0000000
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.xyline;\r
-\r
-import java.util.List;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.jface.viewers.ISelectionProvider;\r
-import org.eclipse.jface.viewers.IStructuredSelection;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.ScrolledComposite;\r
-import org.eclipse.swt.events.SelectionAdapter;\r
-import org.eclipse.swt.events.SelectionEvent;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Tree;\r
-import org.eclipse.ui.IWorkbenchSite;\r
-import org.simantics.browsing.ui.NodeContext;\r
-import org.simantics.browsing.ui.swt.SingleSelectionInputSource;\r
-import org.simantics.browsing.ui.swt.widgets.Button;\r
-import org.simantics.browsing.ui.swt.widgets.GraphExplorerComposite;\r
-import org.simantics.browsing.ui.swt.widgets.impl.SelectionListenerImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupportImpl;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.common.utils.ListUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.util.RemoverUtil;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.SysdynResource;\r
-import org.simantics.sysdyn.ui.properties.LabelPropertyTabContributor;\r
-import org.simantics.sysdyn.ui.trend.chart.ChartUtils;\r
-import org.simantics.ui.SimanticsUI;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-import org.simantics.utils.datastructures.ArrayMap;\r
-\r
-/**\r
- * PropertyTab displaying properties of axis and variables of a chart\r
- *  \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class XYLineAxisAndVariablesTab extends LabelPropertyTabContributor {\r
-\r
-    private GraphExplorerComposite explorer;\r
-    private ScrolledComposite propertyContainer;\r
-    private Button addAxis, addVariable, remove;\r
-    private WidgetSupportImpl additionalSupport;\r
-\r
-    public XYLineAxisAndVariablesTab() {\r
-        additionalSupport = new WidgetSupportImpl();\r
-    }\r
-\r
-    @Override\r
-    public void createControls(Composite body, IWorkbenchSite site, final ISessionContext context, WidgetSupport support) {\r
-        Composite composite = new Composite(body, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);\r
-        GridLayoutFactory.fillDefaults().numColumns(2).margins(3, 3).applyTo(composite);\r
-\r
-        // (Ontology-based) GraphExplorer displaying range axis and variables mapped to those axis\r
-        explorer = new AxisAndVariablesExplorerComposite(ArrayMap.keys(\r
-                "displaySelectors", "displayFilter").values(false, false), site, composite, support, SWT.FULL_SELECTION | SWT.BORDER | SWT.SINGLE);\r
-        explorer.setBrowseContexts(SysdynResource.URIs.ChartAxisAndVariablesBrowseContext);\r
-        explorer.setInputSource(new SingleSelectionInputSource(\r
-                Resource.class));\r
-        explorer.getExplorer().setAutoExpandLevel(2); // Expand everything in the beginning\r
-        explorer.finish();\r
-\r
-        ((Tree)explorer.getExplorerControl()).addSelectionListener(new SelectionAdapter() {\r
-            public void widgetSelected(SelectionEvent e) {\r
-                updateSelection(context);\r
-            }\r
-        });\r
-        GridDataFactory.fillDefaults().hint(250, SWT.DEFAULT).grab(false, true).applyTo(explorer);\r
-\r
-        // Scrolled composite for displaying properties of a selection in explorer\r
-        propertyContainer = new ScrolledComposite(composite, SWT.H_SCROLL | SWT.V_SCROLL);\r
-        GridDataFactory.fillDefaults().span(1, 2).grab(true, true).applyTo(propertyContainer);\r
-        GridLayoutFactory.fillDefaults().applyTo(propertyContainer);\r
-        propertyContainer.setExpandHorizontal(true);\r
-        propertyContainer.setExpandVertical(true);\r
-\r
-        // Buttons for adding axis and variables and removing selected items from explorer\r
-        Composite buttonComposite = new Composite(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(buttonComposite);\r
-        GridLayoutFactory.fillDefaults().numColumns(3).applyTo(buttonComposite);\r
-\r
-        addAxis = new Button(buttonComposite, support, SWT.NONE);\r
-        addAxis.setText("Add axis");\r
-        addAxis.addSelectionListener(new NewAxisListener(context));\r
-\r
-        addVariable = new Button(buttonComposite, additionalSupport, SWT.NONE);\r
-        addVariable.setText("Add variable");\r
-        addVariable.addSelectionListener(new NewVariableListener(context));\r
-\r
-        remove = new Button(buttonComposite, additionalSupport, SWT.NONE);\r
-        remove.setText("Remove");\r
-        remove.addSelectionListener(new RemoveListener(context));\r
-    }\r
-\r
-    /**\r
-     * Updates the content of propertyContainer  \r
-     * @param context\r
-     */\r
-    private void updateSelection(ISessionContext context) {\r
-        ISelectionProvider selectionProvider = (ISelectionProvider)explorer.getAdapter(ISelectionProvider.class);\r
-        IStructuredSelection selection = (IStructuredSelection)selectionProvider.getSelection();\r
-        final Resource resource = AdaptionUtils.adaptToSingle(selection, Resource.class);\r
-        if(resource == null)\r
-            return;\r
-\r
-        // Get the type of the selected node (axis or series)\r
-        String typeUri = null;\r
-        try {\r
-            typeUri = SimanticsUI.getSession().syncRequest(new Read<String>() {\r
-\r
-                @Override\r
-                public String perform(ReadGraph graph) throws DatabaseException {\r
-                    JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                    if(graph.isInstanceOf(resource, jfree.Axis))\r
-                        return graph.getURI(jfree.Axis);\r
-                    else if (graph.isInstanceOf(resource, jfree.Series))\r
-                        return graph.getURI(jfree.Series);\r
-                    return null;\r
-                }\r
-\r
-            });\r
-        } catch (DatabaseException e) {\r
-            e.printStackTrace();\r
-        }\r
-\r
-        // Create a PropertyComposite for the selected node\r
-        if(typeUri != null) {\r
-\r
-            for(Control child : propertyContainer.getChildren()) {\r
-                child.dispose();\r
-            }\r
-\r
-            if(typeUri.equals(JFreeChartResource.URIs.Axis)) {\r
-                AxisPropertyComposite apc = new AxisPropertyComposite(propertyContainer, context, additionalSupport, SWT.NONE);\r
-                propertyContainer.setContent(apc);\r
-                Point size = apc.computeSize(SWT.DEFAULT, SWT.DEFAULT);\r
-                propertyContainer.setMinSize(size);\r
-            } else if(typeUri.equals(JFreeChartResource.URIs.Series)) {\r
-                SeriesPropertyComposite spc = new SeriesPropertyComposite(propertyContainer, context, additionalSupport, SWT.NONE);\r
-                propertyContainer.setContent(spc);\r
-                Point size = spc.computeSize(SWT.DEFAULT, SWT.DEFAULT);\r
-                propertyContainer.setMinSize(size);\r
-            }\r
-        }\r
-\r
-        additionalSupport.fireInput(context, selection);\r
-    }\r
-\r
-    /**\r
-     * SelectionListener for adding a new range axis to a plot\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class NewAxisListener extends SelectionListenerImpl<Resource> {\r
-\r
-        public NewAxisListener(ISessionContext context) {\r
-            super(context);\r
-        }\r
-\r
-        @Override\r
-        public void apply(WriteGraph graph, Resource chart) throws DatabaseException {\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-            Resource plot = graph.syncRequest(new PossibleObjectWithType(chart, l0.ConsistsOf, jfree.Plot));\r
-            if(plot != null) {\r
-                Resource rangeAxis = ChartUtils.createNumberRangeAxis(graph, plot);\r
-                if(rangeAxis != null) {\r
-                    Resource domainAxis = graph.getPossibleObject(plot, jfree.Plot_domainAxis);\r
-                    ChartUtils.createXYDataset(graph, plot, domainAxis, rangeAxis);\r
-                }\r
-            }\r
-        }\r
-    }\r
-\r
-\r
-    /**\r
-     * SelectionListener for adding a new variable to a plot\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class NewVariableListener extends SelectionListenerImpl<Resource> {\r
-\r
-        public NewVariableListener(ISessionContext context) {\r
-            super(context);\r
-        }\r
-\r
-        @Override\r
-        public void apply(WriteGraph graph, Resource input) throws DatabaseException {\r
-            NodeContext nc = explorer.getExplorer().getRoot();\r
-            if(nc == null)\r
-                return;\r
-            \r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-            \r
-            if(input == null) {\r
-                Resource chart = AdaptionUtils.adaptToSingle(nc, Resource.class);\r
-                if(chart == null) return;\r
-                Resource plot = graph.syncRequest(new PossibleObjectWithType(chart, l0.ConsistsOf, jfree.Plot));\r
-                if(plot == null) return;\r
-                Resource rangelist = graph.getPossibleObject(plot, jfree.Plot_rangeAxisList);\r
-                if(rangelist == null) return;\r
-                List<Resource> list = ListUtils.toList(graph, rangelist);\r
-                if(list == null || list.isEmpty()) return;\r
-                input = list.get(0);\r
-            }\r
-            \r
-            Resource dataset;\r
-            if(graph.isInstanceOf(input, jfree.Series)) {\r
-                // Selected resource is series. Add to same dataset\r
-                dataset = graph.getPossibleObject(input, l0.PartOf);\r
-            } else {\r
-                // Selected resource is axis. Find the dataset it is mapped to or create dataset if not created already\r
-                dataset = graph.getPossibleObject(input, jfree.Dataset_mapToRangeAxis_Inverse);\r
-                if(dataset == null) {\r
-                    Resource plot = graph.getPossibleObject(input, l0.PartOf);\r
-                    if(plot == null) return;\r
-                    Resource domainAxis = graph.getPossibleObject(plot, jfree.Plot_domainAxis);\r
-                    if(domainAxis == null) return;\r
-                    ChartUtils.createXYDataset(graph, plot, domainAxis, input);\r
-                }\r
-            }\r
-\r
-            if(dataset != null) {\r
-                // Create series with no rvi\r
-                ChartUtils.createSeries(graph, dataset, null);\r
-            }\r
-        }\r
-    }\r
-\r
-\r
-    /**\r
-     * SelectionListener for remove button\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class RemoveListener extends SelectionListenerImpl<Resource> {\r
-\r
-        public RemoveListener(ISessionContext context) {\r
-            super(context);\r
-        }\r
-\r
-        /**\r
-         * Removes selected resource from explorer\r
-         */\r
-        @Override\r
-        public void apply(WriteGraph graph, Resource input) throws DatabaseException {\r
-            if(input == null)\r
-                return; \r
-\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-            Resource list = null;\r
-            if(graph.isInstanceOf(input, jfree.Series)) {\r
-                // Remove series from dataset and seriesList\r
-                Resource dataset = graph.getPossibleObject(input, l0.PartOf);\r
-                if(dataset != null)\r
-                    list = graph.getPossibleObject(dataset, jfree.Dataset_seriesList);\r
-            } else {\r
-                // Remove associated dataset\r
-                Resource dataset = graph.getPossibleObject(input, jfree.Dataset_mapToRangeAxis_Inverse);\r
-                if(dataset != null) {\r
-                    graph.deny(dataset, jfree.Dataset_mapToDomainAxis);\r
-                    graph.deny(dataset, jfree.Dataset_mapToRangeAxis);\r
-                    RemoverUtil.remove(graph, dataset);\r
-                }\r
-\r
-                // Remove axis from plot and rangeAxisList\r
-                Resource plot = graph.getPossibleObject(input, l0.PartOf);\r
-                if(plot != null)\r
-                    list = graph.getPossibleObject(plot, jfree.Plot_rangeAxisList);\r
-            }\r
-            if(list != null)\r
-                ListUtils.removeElement(graph, list, input);\r
-            RemoverUtil.remove(graph, input);\r
-        }\r
-    }\r
-}\r
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/XYLineGeneralPropertiesTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/chart/properties/xyline/XYLineGeneralPropertiesTab.java
deleted file mode 100644 (file)
index 9bba7fc..0000000
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.sysdyn.ui.trend.chart.properties.xyline;\r
-\r
-import java.util.Collection;\r
-import java.util.LinkedHashMap;\r
-import java.util.Map;\r
-\r
-import org.eclipse.jface.layout.GridDataFactory;\r
-import org.eclipse.jface.layout.GridLayoutFactory;\r
-import org.eclipse.jface.viewers.StructuredSelection;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.ScrolledComposite;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Group;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.ui.IWorkbenchSite;\r
-import org.simantics.browsing.ui.swt.widgets.Button;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyFactory;\r
-import org.simantics.browsing.ui.swt.widgets.StringPropertyModifier;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedCombo;\r
-import org.simantics.browsing.ui.swt.widgets.TrackedText;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ComboModifyListenerImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.ReadFactoryImpl;\r
-import org.simantics.browsing.ui.swt.widgets.impl.Widget;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;\r
-import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupportImpl;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.ObjectsWithType;\r
-import org.simantics.db.common.request.PossibleObjectWithType;\r
-import org.simantics.db.common.request.ReadRequest;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.management.ISessionContext;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.layer0.utils.direct.GraphUtils;\r
-import org.simantics.modeling.ui.chart.property.DoublePropertyFactory;\r
-import org.simantics.modeling.ui.chart.property.DoublePropertyModifier;\r
-import org.simantics.sysdyn.JFreeChartResource;\r
-import org.simantics.sysdyn.ui.properties.LabelPropertyTabContributor;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.AxisHidePropertyComposite;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.BooleanPropertyFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.BooleanSelectionListener;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.DoubleValidator;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.JFreeChartPropertyColorProvider;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RVIFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.RVIModifier;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.TitleFactory;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.TitleModifier;\r
-import org.simantics.sysdyn.ui.trend.chart.properties.VariableExistsValidator;\r
-import org.simantics.ui.utils.AdaptionUtils;\r
-\r
-/**\r
- * PropertyTab displaying general properties and x-axis properties of a chart\r
- * \r
- * @author Teemu Lempinen\r
- *\r
- */\r
-public class XYLineGeneralPropertiesTab extends LabelPropertyTabContributor implements Widget {\r
-\r
-    private ScrolledComposite sc;\r
-    private Composite composite;\r
-    private TrackedText name, title, xlabel, xvariable, xmin, xmax;\r
-    private TrackedCombo type;\r
-    private Button hgrid, htitle, hlegend;\r
-    private WidgetSupportImpl domainAxisSupport = new WidgetSupportImpl();\r
-\r
-    @Override\r
-    public void createControls(Composite body, IWorkbenchSite site, ISessionContext context, WidgetSupport support) {    \r
-        support.register(this);\r
-\r
-        // Scrolled composite containing all of the properties in this tab\r
-        sc = new ScrolledComposite(body, SWT.NONE | SWT.H_SCROLL | SWT.V_SCROLL);\r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(sc);\r
-        GridLayoutFactory.fillDefaults().applyTo(sc);\r
-        sc.setExpandHorizontal(true);\r
-        sc.setExpandVertical(true);\r
-\r
-        composite = new Composite(sc, SWT.NONE);\r
-        GridLayoutFactory.fillDefaults().numColumns(2).margins(3, 3).applyTo(composite);\r
-\r
-        // General properties\r
-        Group general = new Group(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(general);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(2).applyTo(general);\r
-        general.setText("General");\r
-\r
-        // Name\r
-        Label nameLabel = new Label(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(nameLabel);\r
-        nameLabel.setText("Name:");\r
-        nameLabel.setAlignment(SWT.RIGHT);\r
-\r
-        Composite c = new Composite(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(c);\r
-        GridLayoutFactory.fillDefaults().numColumns(3).applyTo(c);\r
-\r
-        name = new org.simantics.browsing.ui.swt.widgets.TrackedText(c, support, SWT.BORDER);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(name.getWidget());\r
-        name.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel));\r
-        name.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasLabel));\r
-        name.setColorProvider(new JFreeChartPropertyColorProvider(name.getResourceManager()));\r
-\r
-        // Type\r
-        Label label = new Label(c, SWT.NONE);\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Type:");\r
-\r
-        type = new TrackedCombo(c, support, SWT.BORDER | SWT.READ_ONLY);\r
-        type.addModifyListener(new TypeModifyListener());\r
-        type.setItemFactory(new TypeItemFactory());\r
-        type.setSelectionFactory(new TypeSelectionFactory());\r
-        GridDataFactory.fillDefaults().applyTo(type.getWidget());\r
-\r
-        // Title (Which is different than name)\r
-        label = new Label(general, SWT.NONE);\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Title:");\r
-\r
-        title = new org.simantics.browsing.ui.swt.widgets.TrackedText(general, support, SWT.BORDER);\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(title.getWidget());\r
-        title.setTextFactory(new TitleFactory());\r
-        title.addModifyListener(new TitleModifier());\r
-        title.setColorProvider(new JFreeChartPropertyColorProvider(name.getResourceManager()));\r
-\r
-        // Group for hide options\r
-        Group hideGroup = new Group(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(hideGroup);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(2).applyTo(hideGroup);\r
-        hideGroup.setText("Hide");\r
-\r
-        hgrid = new Button(hideGroup, support, SWT.CHECK);\r
-        hgrid.setText("Grid");\r
-        hgrid.setSelectionFactory(new BooleanPropertyFactory(JFreeChartResource.URIs.Plot, JFreeChartResource.URIs.Plot_visibleGrid, true));\r
-        hgrid.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.Plot, JFreeChartResource.URIs.Plot_visibleGrid));\r
-        htitle = new Button(hideGroup, support, SWT.CHECK);\r
-        htitle.setText("Title");\r
-        htitle.setSelectionFactory(new BooleanPropertyFactory(JFreeChartResource.URIs.TextTitle, JFreeChartResource.URIs.visible, true));\r
-        htitle.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.TextTitle, JFreeChartResource.URIs.visible));\r
-        hlegend = new Button(hideGroup, support, SWT.CHECK);\r
-        hlegend.setText("Legend");\r
-        hlegend.setSelectionFactory(new BooleanPropertyFactory(null, JFreeChartResource.URIs.Chart_visibleLegend, true));\r
-        hlegend.addSelectionListener(new BooleanSelectionListener(context, null, JFreeChartResource.URIs.Chart_visibleLegend));\r
-\r
-\r
-        // X-Axis properties\r
-        Group xgroup = new Group(composite, SWT.NONE);\r
-        GridDataFactory.fillDefaults().span(2, 1).grab(true, false).applyTo(xgroup);\r
-        GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(3).applyTo(xgroup);\r
-        xgroup.setText("X-axis");\r
-\r
-        // Variable for x-axis (default: empty == time)\r
-        Label xVariableLabel = new Label(xgroup, SWT.NONE);\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(xVariableLabel);\r
-        xVariableLabel.setText("Variable:");\r
-\r
-        xvariable = new TrackedText(xgroup, domainAxisSupport, SWT.BORDER);\r
-        xvariable.setTextFactory(new RVIFactory());\r
-        xvariable.addModifyListener(new RVIModifier(xvariable.getWidget(), domainAxisSupport));\r
-        xvariable.setColorProvider(new JFreeChartPropertyColorProvider(xvariable.getResourceManager()));\r
-        xvariable.setInputValidator(new VariableExistsValidator(support, xvariable, true));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(xvariable.getWidget());\r
-        \r
-        Composite axisHide = new AxisHidePropertyComposite(xgroup, context, domainAxisSupport, SWT.NONE);\r
-        GridDataFactory.fillDefaults().span(1, 3).applyTo(axisHide);\r
-\r
-        // Label for x-axis\r
-        label = new Label(xgroup, SWT.NONE);\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Label:");\r
-\r
-        xlabel = new TrackedText(xgroup, domainAxisSupport, SWT.BORDER);\r
-        xlabel.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel, ""));\r
-        xlabel.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasLabel));\r
-        xlabel.setColorProvider(new JFreeChartPropertyColorProvider(xlabel.getResourceManager()));\r
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(xlabel.getWidget());\r
-\r
-        // Min and max values for x-axis\r
-        label = new Label(xgroup, SWT.NONE);\r
-        GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(label);\r
-        label.setText("Min:");\r
-\r
-        Composite minmax = new Composite(xgroup, SWT.NONE);\r
-        GridDataFactory.fillDefaults().applyTo(minmax);\r
-        GridLayoutFactory.fillDefaults().numColumns(3).applyTo(minmax);\r
-        xmin = new TrackedText(minmax, domainAxisSupport, SWT.BORDER);\r
-        xmin.setColorProvider(new JFreeChartPropertyColorProvider(xmin.getResourceManager()));\r
-        xmin.setTextFactory(new DoublePropertyFactory(JFreeChartResource.URIs.Axis_min));\r
-        xmin.addModifyListener(new DoublePropertyModifier(context, JFreeChartResource.URIs.Axis_min));\r
-        xmin.setInputValidator(new DoubleValidator(true));\r
-\r
-        label = new Label(minmax, SWT.NONE);\r
-        label.setText("Max:");\r
-        xmax = new TrackedText(minmax, domainAxisSupport, SWT.BORDER);\r
-        xmax.setColorProvider(new JFreeChartPropertyColorProvider(xmax.getResourceManager()));\r
-        xmax.setTextFactory(new DoublePropertyFactory(JFreeChartResource.URIs.Axis_max));\r
-        xmax.addModifyListener(new DoublePropertyModifier(context, JFreeChartResource.URIs.Axis_max));\r
-        xmax.setInputValidator(new DoubleValidator(true));\r
-\r
-        // Set the same width to both label rows\r
-        composite.layout();\r
-        GridDataFactory.fillDefaults().hint(xVariableLabel.getBounds().width, SWT.DEFAULT).align(SWT.END, SWT.CENTER).applyTo(nameLabel);\r
-        \r
-        sc.setContent(composite);\r
-        Point size = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);\r
-        sc.setMinSize(size);\r
-    }\r
-\r
-    @Override\r
-    public void setInput(final ISessionContext context, Object input) {\r
-        final Resource chart = AdaptionUtils.adaptToSingle(input, Resource.class);\r
-        if(chart == null)\r
-            return; \r
-\r
-        context.getSession().asyncRequest(new ReadRequest() {\r
-\r
-            @Override\r
-            public void run(ReadGraph graph) throws DatabaseException {\r
-                Layer0 l0 = Layer0.getInstance(graph);\r
-                JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-                Resource plot = graph.syncRequest(new PossibleObjectWithType(chart, l0.ConsistsOf, jfree.Plot));\r
-                if(plot == null) return;\r
-                Resource domainAxis = graph.getPossibleObject(plot, jfree.Plot_domainAxis);\r
-                if(domainAxis == null) return;\r
-                domainAxisSupport.fireInput(context, new StructuredSelection(domainAxis));\r
-            }\r
-        });\r
-    }\r
-    \r
-    /**\r
-     * \r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TypeSelectionFactory extends ReadFactoryImpl<Resource, String> {\r
-        @Override\r
-        public String perform(ReadGraph graph, Resource chart) throws DatabaseException {\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-\r
-            Resource plot = graph.syncRequest(new PossibleObjectWithType(chart, l0.ConsistsOf, jfree.XYPlot));\r
-            if(plot != null) {\r
-                Collection<Resource> datasets = graph.syncRequest(new ObjectsWithType(plot, l0.ConsistsOf, jfree.XYDataset));\r
-                if(!datasets.isEmpty()) {\r
-                    Resource dataset = datasets.iterator().next();\r
-                    if(dataset != null) {\r
-                        Resource renderer = graph.syncRequest(new PossibleObjectWithType(dataset, jfree.Dataset_renderer, jfree.Renderer));\r
-                        if(renderer != null && graph.isInstanceOf(renderer, jfree.XYAreaRenderer))\r
-                            return "Area";\r
-                    }\r
-                }\r
-            }\r
-            return "Line";\r
-        }\r
-    }\r
-\r
-    /**\r
-     * RangeItemFactory finds all inexes of a given enumeration \r
-     * and adds "Sum" and "All" to the returned indexes\r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TypeItemFactory extends ReadFactoryImpl<Resource, Map<String, Object>> {\r
-        @Override\r
-        public Map<String, Object> perform(ReadGraph graph, Resource series) throws DatabaseException {\r
-            LinkedHashMap<String, Object> result = new LinkedHashMap<String, Object>();\r
-            result.put("Line", "Line");\r
-            result.put("Area", "Area");\r
-//            result.put("Stacked Area", "Stacked Area");\r
-            return result;\r
-        }\r
-    }\r
-\r
-    /**\r
-     * TypeModifyListener for modifying the type of a bar chart \r
-     * @author Teemu Lempinen\r
-     *\r
-     */\r
-    private class TypeModifyListener  extends ComboModifyListenerImpl<Resource> {\r
-        @Override\r
-        public void applyText(WriteGraph graph, Resource chart, String text) throws DatabaseException {\r
-            JFreeChartResource jfree = JFreeChartResource.getInstance(graph);\r
-            Layer0 l0 = Layer0.getInstance(graph);\r
-\r
-            Resource plot = graph.syncRequest(new PossibleObjectWithType(chart, l0.ConsistsOf, jfree.XYPlot));\r
-            if(plot == null)\r
-                return;\r
-\r
-            Collection<Resource> datasets = graph.syncRequest(new ObjectsWithType(plot, l0.ConsistsOf, jfree.XYDataset));\r
-            if(datasets == null || datasets.isEmpty())\r
-                return;\r
-\r
-            for(Resource dataset : datasets) {\r
-                graph.deny(dataset, jfree.Dataset_renderer);\r
-\r
-                Resource renderer;\r
-                if(text.equals("Area"))\r
-                    renderer = GraphUtils.create2(graph, jfree.XYAreaRenderer);\r
-                else\r
-                    renderer = GraphUtils.create2(graph, jfree.XYLineRenderer);\r
-\r
-                graph.claim(dataset, jfree.Dataset_renderer, renderer);\r
-            }\r
-        }\r
-    }\r
-\r
-}
\ No newline at end of file