From: lempinen Date: Fri, 20 Jan 2012 12:46:06 +0000 (+0000) Subject: Drag & drop ordering for bar and pie chart series (refs #3082) X-Git-Tag: simantics-1.6~44 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=2e2aa788a09936c1c6fe7251864afc897da0c11f;p=simantics%2Fsysdyn.git Drag & drop ordering for bar and pie chart series (refs #3082) git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@24015 ac1ea38d-2e2b-0410-8846-a27921b304fc --- diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg index 61bd5b20..ee7e7de2 100644 Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ diff --git a/org.simantics.sysdyn.ontology/graph/ChartViewpoints.pgraph b/org.simantics.sysdyn.ontology/graph/ChartViewpoints.pgraph index 44b844d0..a0d99b4b 100644 --- a/org.simantics.sysdyn.ontology/graph/ChartViewpoints.pgraph +++ b/org.simantics.sysdyn.ontology/graph/ChartViewpoints.pgraph @@ -73,8 +73,8 @@ BSBC BSBC @VP.customLabelDecorationRule JFREE.Series BSBC.SeriesLabelDecorationRule -//BSBC -// @VP.dropActionContribution JFREE.Series BSAC.Actions.SeriesDropAction 1.0 +BSBC + @VP.dropActionContribution JFREE.Series BSAC.Actions.SeriesDropAction 1.0 BSBC VP.BrowseContext.HasVisualsContribution _ : VP.VisualsContribution @@ -82,7 +82,7 @@ BSBC VP.VisualsContribution.HasRule VP.PassThruSorterRule BSAC.Actions : L0.Library -//BSAC.Actions.SeriesDropAction : ACT.DropAction +BSAC.Actions.SeriesDropAction : ACT.DropAction /////////////////////////////////////////////// @@ -105,8 +105,8 @@ PSBC PSBC @VP.customLabelDecorationRule JFREE.Series PSBC.SeriesLabelDecorationRule -//PSBC -// @VP.dropActionContribution JFREE.Series PSAC.Actions.SeriesDropAction 1.0 +PSBC + @VP.dropActionContribution JFREE.Series PSAC.Actions.SeriesDropAction 1.0 PSBC VP.BrowseContext.HasVisualsContribution _ : VP.VisualsContribution @@ -114,4 +114,4 @@ PSBC VP.VisualsContribution.HasRule VP.PassThruSorterRule PSAC.Actions : L0.Library -//PSAC.Actions.SeriesDropAction : ACT.DropAction +PSAC.Actions.SeriesDropAction : ACT.DropAction diff --git a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java index 17524a49..f2ec58c3 100644 --- a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java +++ b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java @@ -20,6 +20,7 @@ public class SysdynResource { public final Resource AvailableVariableIndexes; public final Resource BarSeriesActionContext; public final Resource BarSeriesActionContext_Actions; + public final Resource BarSeriesActionContext_Actions_SeriesDropAction; public final Resource BarSeriesBrowseContext; public final Resource BarSeriesBrowseContext_SeriesChildRule; public final Resource BarSeriesBrowseContext_SeriesLabelDecorationRule; @@ -172,6 +173,7 @@ public class SysdynResource { public final Resource ParameterExpression; public final Resource PieSeriesActionContext; public final Resource PieSeriesActionContext_Actions; + public final Resource PieSeriesActionContext_Actions_SeriesDropAction; public final Resource PieSeriesBrowseContext; public final Resource PieSeriesBrowseContext_SeriesChildRule; public final Resource PieSeriesBrowseContext_SeriesLabelDecorationRule; @@ -314,6 +316,7 @@ public class SysdynResource { public static final String AvailableVariableIndexes = "http://www.simantics.org/Sysdyn-1.1/AvailableVariableIndexes"; public static final String BarSeriesActionContext = "http://www.simantics.org/Sysdyn-1.1/BarSeriesActionContext"; public static final String BarSeriesActionContext_Actions = "http://www.simantics.org/Sysdyn-1.1/BarSeriesActionContext/Actions"; + public static final String BarSeriesActionContext_Actions_SeriesDropAction = "http://www.simantics.org/Sysdyn-1.1/BarSeriesActionContext/Actions/SeriesDropAction"; public static final String BarSeriesBrowseContext = "http://www.simantics.org/Sysdyn-1.1/BarSeriesBrowseContext"; public static final String BarSeriesBrowseContext_SeriesChildRule = "http://www.simantics.org/Sysdyn-1.1/BarSeriesBrowseContext/SeriesChildRule"; public static final String BarSeriesBrowseContext_SeriesLabelDecorationRule = "http://www.simantics.org/Sysdyn-1.1/BarSeriesBrowseContext/SeriesLabelDecorationRule"; @@ -466,6 +469,7 @@ public class SysdynResource { public static final String ParameterExpression = "http://www.simantics.org/Sysdyn-1.1/ParameterExpression"; public static final String PieSeriesActionContext = "http://www.simantics.org/Sysdyn-1.1/PieSeriesActionContext"; public static final String PieSeriesActionContext_Actions = "http://www.simantics.org/Sysdyn-1.1/PieSeriesActionContext/Actions"; + public static final String PieSeriesActionContext_Actions_SeriesDropAction = "http://www.simantics.org/Sysdyn-1.1/PieSeriesActionContext/Actions/SeriesDropAction"; public static final String PieSeriesBrowseContext = "http://www.simantics.org/Sysdyn-1.1/PieSeriesBrowseContext"; public static final String PieSeriesBrowseContext_SeriesChildRule = "http://www.simantics.org/Sysdyn-1.1/PieSeriesBrowseContext/SeriesChildRule"; public static final String PieSeriesBrowseContext_SeriesLabelDecorationRule = "http://www.simantics.org/Sysdyn-1.1/PieSeriesBrowseContext/SeriesLabelDecorationRule"; @@ -618,6 +622,7 @@ public class SysdynResource { AvailableVariableIndexes = getResourceOrNull(graph, URIs.AvailableVariableIndexes); BarSeriesActionContext = getResourceOrNull(graph, URIs.BarSeriesActionContext); BarSeriesActionContext_Actions = getResourceOrNull(graph, URIs.BarSeriesActionContext_Actions); + BarSeriesActionContext_Actions_SeriesDropAction = getResourceOrNull(graph, URIs.BarSeriesActionContext_Actions_SeriesDropAction); BarSeriesBrowseContext = getResourceOrNull(graph, URIs.BarSeriesBrowseContext); BarSeriesBrowseContext_SeriesChildRule = getResourceOrNull(graph, URIs.BarSeriesBrowseContext_SeriesChildRule); BarSeriesBrowseContext_SeriesLabelDecorationRule = getResourceOrNull(graph, URIs.BarSeriesBrowseContext_SeriesLabelDecorationRule); @@ -770,6 +775,7 @@ public class SysdynResource { ParameterExpression = getResourceOrNull(graph, URIs.ParameterExpression); PieSeriesActionContext = getResourceOrNull(graph, URIs.PieSeriesActionContext); PieSeriesActionContext_Actions = getResourceOrNull(graph, URIs.PieSeriesActionContext_Actions); + PieSeriesActionContext_Actions_SeriesDropAction = getResourceOrNull(graph, URIs.PieSeriesActionContext_Actions_SeriesDropAction); PieSeriesBrowseContext = getResourceOrNull(graph, URIs.PieSeriesBrowseContext); PieSeriesBrowseContext_SeriesChildRule = getResourceOrNull(graph, URIs.PieSeriesBrowseContext_SeriesChildRule); PieSeriesBrowseContext_SeriesLabelDecorationRule = getResourceOrNull(graph, URIs.PieSeriesBrowseContext_SeriesLabelDecorationRule); diff --git a/org.simantics.sysdyn.ui/adapters.xml b/org.simantics.sysdyn.ui/adapters.xml index ecd9bdd0..ac87af2b 100644 --- a/org.simantics.sysdyn.ui/adapters.xml +++ b/org.simantics.sysdyn.ui/adapters.xml @@ -10,5 +10,5 @@ VTT Technical Research Centre of Finland - initial API and implementation --> - none 0 fill 1 + none 0 fill 1 \ No newline at end of file