Remove deprecated profiles in favor of DNVisualisationStyle

gitlab #59

Change-Id: Id1b5e55d39241dd288c8fb8fe4ffb3a187e87e59
(cherry picked from commit 63ca3304ae8ef41b9bae9a97b8ff04adc6ad0371)

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
index 0c7acb2487c192ddda54d43601dc17c2f725e03c..2d253bd3678e5557a60ffeb8bbb383e5ed1380d2 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
@@ -13,25 +13,25 @@ DATATYPES = <http://www.simantics.org/Datatypes-1.1>
 
 // ----------------------------------------------------------------------------
 
-DN.ArrowLengthPropertyParameterType <T SEL.GenericParameterType
-    @L0.assert SEL.HasDisplayValue
-        _ : SEL.DisplayValue
-            SEL.HasEnumerationValues DN.Functions.arrowLengthPropertyEnumerationValues : L0.Function
-            SEL.HasCustomModifier DN.Functions.arrowLengthPropertyModifier : L0.Function
-
-DN.Edge.ArrowLengthProperty <T L0.Value
-    @L0.assert L0.ConvertsToValueWith DN.Functions.convertToValue
-    >-- DN.Edge.ArrowLengthProperty.value ==> "Resource -> <ReadGraph> Maybe Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.readOnly true
-    >-- DN.Edge.ArrowLengthProperty.gain --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
-        L0.readOnly true
-    >-- DN.Edge.ArrowLengthProperty.bias --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
-        L0.readOnly true
-    @L0.assert DN.Edge.ArrowLengthProperty.gain 1.0
-    @L0.assert DN.Edge.ArrowLengthProperty.bias 0.0
+//DN.ArrowLengthPropertyParameterType <T SEL.GenericParameterType
+//    @L0.assert SEL.HasDisplayValue
+//        _ : SEL.DisplayValue
+//            SEL.HasEnumerationValues DN.Functions.arrowLengthPropertyEnumerationValues : L0.Function
+//            SEL.HasCustomModifier DN.Functions.arrowLengthPropertyModifier : L0.Function
+
+//DN.Edge.ArrowLengthProperty <T L0.Value
+//    @L0.assert L0.ConvertsToValueWith DN.Functions.convertToValue
+//    >-- DN.Edge.ArrowLengthProperty.value ==> "Resource -> <ReadGraph> Maybe Double" <R L0.HasProperty : SEL.GenericParameterType
+//        L0.readOnly true
+//    >-- DN.Edge.ArrowLengthProperty.gain --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
+//        L0.readOnly true
+//    >-- DN.Edge.ArrowLengthProperty.bias --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
+//        L0.readOnly true
+//    @L0.assert DN.Edge.ArrowLengthProperty.gain 1.0
+//    @L0.assert DN.Edge.ArrowLengthProperty.bias 0.0
 
 // these should be deprecated
-DN.Edge.ThicknessProperty <T L0.Value
+//DN.Edge.ThicknessProperty <T L0.Value
 
 DN.Diagram
     >-- DN.Diagram.backgroundColor --> DATATYPES.RGB.Integer <R L0.HasProperty : SEL.ColorParameterType

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetworkProfiles.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetworkProfiles.pgraph
index d268272a27ec5e2b2621066fb38e9df90253dd59..d17219de171b6a474ee4dc5e72c3b0c8521d3158 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetworkProfiles.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetworkProfiles.pgraph
@@ -21,11 +21,12 @@ DN.Groups.VertexGroup : DIA.TypeGroup
 DN.Groups.EdgeGroup : DIA.TypeGroup
     DIA.TypeGroup.HasType DN.Edge
 
-DN.ElementColoringStyle : DIA.Style
-DN.ElementSizingStyle : DIA.Style
+// 21.10.2019 by Jani: DNVisualisationStyle deprecates these
+//DN.ElementColoringStyle : DIA.Style
+//DN.ElementSizingStyle : DIA.Style
 
-DN.ArrowLengthStyle : DIA.Style
-DN.HideStyle : DIA.Style
+//DN.ArrowLengthStyle : DIA.Style
+//DN.HideStyle : DIA.Style
 DN.VertexSymbolStyle : DIA.Style
 DN.ConnectionLineStyle : DIA.Style
 DN.ElevationRectangleStyle : DIA.Style

diff --git a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
index 89087af13ee60058370d633ed9b3d53440dc742f..abcf4482c574b98aa206fbde2275520cdb8b3a8b 100644 (file)
--- a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
+++ b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
@@ -15,8 +15,6 @@ public class DistrictNetworkResource {
     public final Resource Actions;
     public final Resource Actions_NewDNDiagram;
     public final Resource AddLayerToDNDiagramTemplate;
-    public final Resource ArrowLengthPropertyParameterType;
-    public final Resource ArrowLengthStyle;
     public final Resource BrowseContext;
     public final Resource Composite;
     public final Resource Connection;
@@ -168,13 +166,6 @@ public class DistrictNetworkResource {
     public final Resource EdgeDefaultMapping;
     public final Resource EdgeDefaultMapping_Inverse;
     public final Resource EdgeMappingParameterType;
-    public final Resource Edge_ArrowLengthProperty;
-    public final Resource Edge_ArrowLengthProperty_bias;
-    public final Resource Edge_ArrowLengthProperty_bias_Inverse;
-    public final Resource Edge_ArrowLengthProperty_gain;
-    public final Resource Edge_ArrowLengthProperty_gain_Inverse;
-    public final Resource Edge_ArrowLengthProperty_value;
-    public final Resource Edge_ArrowLengthProperty_value_Inverse;
     public final Resource Edge_HasDiameter;
     public final Resource Edge_HasDiameter_Inverse;
     public final Resource Edge_HasElevation;
@@ -195,14 +186,9 @@ public class DistrictNetworkResource {
     public final Resource Edge_HasOuterDiameter_Inverse;
     public final Resource Edge_HasTGround;
     public final Resource Edge_HasTGround_Inverse;
-    public final Resource Edge_ThicknessProperty;
     public final Resource Element;
-    public final Resource ElementColoringStyle;
-    public final Resource ElementSizingStyle;
     public final Resource ElevationRectangleStyle;
     public final Resource Functions;
-    public final Resource Functions_arrowLengthPropertyEnumerationValues;
-    public final Resource Functions_arrowLengthPropertyModifier;
     public final Resource Functions_compositeInstantiator;
     public final Resource Functions_constantOne;
     public final Resource Functions_convertToValue;
@@ -233,7 +219,6 @@ public class DistrictNetworkResource {
     public final Resource HasStartVertex_Inverse;
     public final Resource HasSymbolFunction;
     public final Resource HasSymbolFunction_Inverse;
-    public final Resource HideStyle;
     public final Resource Images;
     public final Resource Images_MapImage;
     public final Resource InLayer;
@@ -466,8 +451,6 @@ public class DistrictNetworkResource {
         public static final String Actions = "http://www.simantics.org/DistrictNetwork-1.0/Actions";
         public static final String Actions_NewDNDiagram = "http://www.simantics.org/DistrictNetwork-1.0/Actions/NewDNDiagram";
         public static final String AddLayerToDNDiagramTemplate = "http://www.simantics.org/DistrictNetwork-1.0/AddLayerToDNDiagramTemplate";
-        public static final String ArrowLengthPropertyParameterType = "http://www.simantics.org/DistrictNetwork-1.0/ArrowLengthPropertyParameterType";
-        public static final String ArrowLengthStyle = "http://www.simantics.org/DistrictNetwork-1.0/ArrowLengthStyle";
         public static final String BrowseContext = "http://www.simantics.org/DistrictNetwork-1.0/BrowseContext";
         public static final String Composite = "http://www.simantics.org/DistrictNetwork-1.0/Composite";
         public static final String Connection = "http://www.simantics.org/DistrictNetwork-1.0/Connection";
@@ -619,13 +602,6 @@ public class DistrictNetworkResource {
         public static final String EdgeDefaultMapping = "http://www.simantics.org/DistrictNetwork-1.0/EdgeDefaultMapping";
         public static final String EdgeDefaultMapping_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/EdgeDefaultMapping/Inverse";
         public static final String EdgeMappingParameterType = "http://www.simantics.org/DistrictNetwork-1.0/EdgeMappingParameterType";
-        public static final String Edge_ArrowLengthProperty = "http://www.simantics.org/DistrictNetwork-1.0/Edge/ArrowLengthProperty";
-        public static final String Edge_ArrowLengthProperty_bias = "http://www.simantics.org/DistrictNetwork-1.0/Edge/ArrowLengthProperty/bias";
-        public static final String Edge_ArrowLengthProperty_bias_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Edge/ArrowLengthProperty/bias/Inverse";
-        public static final String Edge_ArrowLengthProperty_gain = "http://www.simantics.org/DistrictNetwork-1.0/Edge/ArrowLengthProperty/gain";
-        public static final String Edge_ArrowLengthProperty_gain_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Edge/ArrowLengthProperty/gain/Inverse";
-        public static final String Edge_ArrowLengthProperty_value = "http://www.simantics.org/DistrictNetwork-1.0/Edge/ArrowLengthProperty/value";
-        public static final String Edge_ArrowLengthProperty_value_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Edge/ArrowLengthProperty/value/Inverse";
         public static final String Edge_HasDiameter = "http://www.simantics.org/DistrictNetwork-1.0/Edge/HasDiameter";
         public static final String Edge_HasDiameter_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Edge/HasDiameter/Inverse";
         public static final String Edge_HasElevation = "http://www.simantics.org/DistrictNetwork-1.0/Edge/HasElevation";
@@ -646,14 +622,9 @@ public class DistrictNetworkResource {
         public static final String Edge_HasOuterDiameter_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Edge/HasOuterDiameter/Inverse";
         public static final String Edge_HasTGround = "http://www.simantics.org/DistrictNetwork-1.0/Edge/HasTGround";
         public static final String Edge_HasTGround_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Edge/HasTGround/Inverse";
-        public static final String Edge_ThicknessProperty = "http://www.simantics.org/DistrictNetwork-1.0/Edge/ThicknessProperty";
         public static final String Element = "http://www.simantics.org/DistrictNetwork-1.0/Element";
-        public static final String ElementColoringStyle = "http://www.simantics.org/DistrictNetwork-1.0/ElementColoringStyle";
-        public static final String ElementSizingStyle = "http://www.simantics.org/DistrictNetwork-1.0/ElementSizingStyle";
         public static final String ElevationRectangleStyle = "http://www.simantics.org/DistrictNetwork-1.0/ElevationRectangleStyle";
         public static final String Functions = "http://www.simantics.org/DistrictNetwork-1.0/Functions";
-        public static final String Functions_arrowLengthPropertyEnumerationValues = "http://www.simantics.org/DistrictNetwork-1.0/Functions/arrowLengthPropertyEnumerationValues";
-        public static final String Functions_arrowLengthPropertyModifier = "http://www.simantics.org/DistrictNetwork-1.0/Functions/arrowLengthPropertyModifier";
         public static final String Functions_compositeInstantiator = "http://www.simantics.org/DistrictNetwork-1.0/Functions/compositeInstantiator";
         public static final String Functions_constantOne = "http://www.simantics.org/DistrictNetwork-1.0/Functions/constantOne";
         public static final String Functions_convertToValue = "http://www.simantics.org/DistrictNetwork-1.0/Functions/convertToValue";
@@ -684,7 +655,6 @@ public class DistrictNetworkResource {
         public static final String HasStartVertex_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasStartVertex_Inverse";
         public static final String HasSymbolFunction = "http://www.simantics.org/DistrictNetwork-1.0/HasSymbolFunction";
         public static final String HasSymbolFunction_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasSymbolFunction/Inverse";
-        public static final String HideStyle = "http://www.simantics.org/DistrictNetwork-1.0/HideStyle";
         public static final String Images = "http://www.simantics.org/DistrictNetwork-1.0/Images";
         public static final String Images_MapImage = "http://www.simantics.org/DistrictNetwork-1.0/Images/MapImage";
         public static final String InLayer = "http://www.simantics.org/DistrictNetwork-1.0/InLayer";
@@ -927,8 +897,6 @@ public class DistrictNetworkResource {
         Actions = getResourceOrNull(graph, URIs.Actions);
         Actions_NewDNDiagram = getResourceOrNull(graph, URIs.Actions_NewDNDiagram);
         AddLayerToDNDiagramTemplate = getResourceOrNull(graph, URIs.AddLayerToDNDiagramTemplate);
-        ArrowLengthPropertyParameterType = getResourceOrNull(graph, URIs.ArrowLengthPropertyParameterType);
-        ArrowLengthStyle = getResourceOrNull(graph, URIs.ArrowLengthStyle);
         BrowseContext = getResourceOrNull(graph, URIs.BrowseContext);
         Composite = getResourceOrNull(graph, URIs.Composite);
         Connection = getResourceOrNull(graph, URIs.Connection);
@@ -1080,13 +1048,6 @@ public class DistrictNetworkResource {
         EdgeDefaultMapping = getResourceOrNull(graph, URIs.EdgeDefaultMapping);
         EdgeDefaultMapping_Inverse = getResourceOrNull(graph, URIs.EdgeDefaultMapping_Inverse);
         EdgeMappingParameterType = getResourceOrNull(graph, URIs.EdgeMappingParameterType);
-        Edge_ArrowLengthProperty = getResourceOrNull(graph, URIs.Edge_ArrowLengthProperty);
-        Edge_ArrowLengthProperty_bias = getResourceOrNull(graph, URIs.Edge_ArrowLengthProperty_bias);
-        Edge_ArrowLengthProperty_bias_Inverse = getResourceOrNull(graph, URIs.Edge_ArrowLengthProperty_bias_Inverse);
-        Edge_ArrowLengthProperty_gain = getResourceOrNull(graph, URIs.Edge_ArrowLengthProperty_gain);
-        Edge_ArrowLengthProperty_gain_Inverse = getResourceOrNull(graph, URIs.Edge_ArrowLengthProperty_gain_Inverse);
-        Edge_ArrowLengthProperty_value = getResourceOrNull(graph, URIs.Edge_ArrowLengthProperty_value);
-        Edge_ArrowLengthProperty_value_Inverse = getResourceOrNull(graph, URIs.Edge_ArrowLengthProperty_value_Inverse);
         Edge_HasDiameter = getResourceOrNull(graph, URIs.Edge_HasDiameter);
         Edge_HasDiameter_Inverse = getResourceOrNull(graph, URIs.Edge_HasDiameter_Inverse);
         Edge_HasElevation = getResourceOrNull(graph, URIs.Edge_HasElevation);
@@ -1107,14 +1068,9 @@ public class DistrictNetworkResource {
         Edge_HasOuterDiameter_Inverse = getResourceOrNull(graph, URIs.Edge_HasOuterDiameter_Inverse);
         Edge_HasTGround = getResourceOrNull(graph, URIs.Edge_HasTGround);
         Edge_HasTGround_Inverse = getResourceOrNull(graph, URIs.Edge_HasTGround_Inverse);
-        Edge_ThicknessProperty = getResourceOrNull(graph, URIs.Edge_ThicknessProperty);
         Element = getResourceOrNull(graph, URIs.Element);
-        ElementColoringStyle = getResourceOrNull(graph, URIs.ElementColoringStyle);
-        ElementSizingStyle = getResourceOrNull(graph, URIs.ElementSizingStyle);
         ElevationRectangleStyle = getResourceOrNull(graph, URIs.ElevationRectangleStyle);
         Functions = getResourceOrNull(graph, URIs.Functions);
-        Functions_arrowLengthPropertyEnumerationValues = getResourceOrNull(graph, URIs.Functions_arrowLengthPropertyEnumerationValues);
-        Functions_arrowLengthPropertyModifier = getResourceOrNull(graph, URIs.Functions_arrowLengthPropertyModifier);
         Functions_compositeInstantiator = getResourceOrNull(graph, URIs.Functions_compositeInstantiator);
         Functions_constantOne = getResourceOrNull(graph, URIs.Functions_constantOne);
         Functions_convertToValue = getResourceOrNull(graph, URIs.Functions_convertToValue);
@@ -1145,7 +1101,6 @@ public class DistrictNetworkResource {
         HasStartVertex_Inverse = getResourceOrNull(graph, URIs.HasStartVertex_Inverse);
         HasSymbolFunction = getResourceOrNull(graph, URIs.HasSymbolFunction);
         HasSymbolFunction_Inverse = getResourceOrNull(graph, URIs.HasSymbolFunction_Inverse);
-        HideStyle = getResourceOrNull(graph, URIs.HideStyle);
         Images = getResourceOrNull(graph, URIs.Images);
         Images_MapImage = getResourceOrNull(graph, URIs.Images_MapImage);
         InLayer = getResourceOrNull(graph, URIs.InLayer);

diff --git a/org.simantics.district.network/adapters.xml b/org.simantics.district.network/adapters.xml
index 997bed16cadb52a279c0de7bb03a9f69e31eb71f..fafb39e8aebc926e7343a9b7e4952b817cc07544 100644 (file)
--- a/org.simantics.district.network/adapters.xml
+++ b/org.simantics.district.network/adapters.xml
@@ -8,7 +8,7 @@
                        <this />
                </type>
        </target>
-       <target interface="org.simantics.scenegraph.profile.Style">
+<!-- <target interface="org.simantics.scenegraph.profile.Style">
                <resource uri="http://www.simantics.org/DistrictNetwork-1.0/ElementColoringStyle"
                        class="org.simantics.district.network.profile.DNElementColorStyle">
                </resource>
@@ -25,6 +25,7 @@
                        class="org.simantics.district.network.profile.VertexSymbolStyle">
                </resource>
        </target>
+ -->
        <target interface="org.simantics.scenegraph.profile.Group">
                <type
                        uri="http://www.simantics.org/DistrictNetwork-1.0/DistrictNodeGroup"