Remove unused profile throtting setting & assert diameter as Double

gitlab #59

Change-Id: I6e3af4a268e1906be2753bbc0aa57e6c892b511d
(cherry picked from commit b6f289e20a2105cedbe103723de93d1116654ee2)

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 33408b2f863a25a7fdede3d2614f1daaad9ec402..b16248f2d3d1efd2ded0f59e99aea72fd138e3bb 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -139,8 +139,8 @@ DN.Edge <T DN.Element
         @defProperty "K Supply" L0.Double
     >-- DN.Edge.HasTGround
         @defProperty "T Ground" L0.Double
         @defProperty "K Supply" L0.Double
     >-- DN.Edge.HasTGround
         @defProperty "T Ground" L0.Double

-    @L0.assert DN.Edge.HasDiameter 100
-    @L0.assert DN.Edge.HasOuterDiameter 125
+    @L0.assert DN.Edge.HasDiameter 100.0
+    @L0.assert DN.Edge.HasOuterDiameter 125.0

 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
index c3d7cdfe1d451d4546a33a2492e24bb5bd2f7fc2..2a735b4210846cf3bd42ed662b3ee7672bab56e4 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
@@ -47,15 +47,17 @@ DN.Diagram
     >-- DN.Diagram.hasVisualisation --> DN.Diagram.Visualisations <R L0.HasProperty
         L0.HasLabel "Visualisation"
     >-- DN.Diagram.hasActiveVisualisation --> DN.Diagram.Visualisations <R L0.HasProperty
     >-- DN.Diagram.hasVisualisation --> DN.Diagram.Visualisations <R L0.HasProperty
         L0.HasLabel "Visualisation"
     >-- DN.Diagram.hasActiveVisualisation --> DN.Diagram.Visualisations <R L0.HasProperty

-    >-- DN.Diagram.profileUpdateInterval ==> "Long" <R L0.HasProperty : SEL.GenericParameterType
-        L0.HasLabel "Profile update interval"
+// Removed by Jani as the intervalled profile update is not currently working
+//    >-- DN.Diagram.profileUpdateInterval ==> "Long" <R L0.HasProperty : SEL.GenericParameterType
+//        L0.HasLabel "Profile update interval"

 
     @L0.assert DN.Diagram.arrowLengthGain 1.0
     @L0.assert DN.Diagram.arrowLengthBias 0.0
     @L0.assert DN.Diagram.arrowLengthProperty DN.Edge.ArrowLengthProperty.FlowRate
     @L0.assert DN.Diagram.drawMapEnabled true
 
     @L0.assert DN.Diagram.arrowLengthGain 1.0
     @L0.assert DN.Diagram.arrowLengthBias 0.0
     @L0.assert DN.Diagram.arrowLengthProperty DN.Edge.ArrowLengthProperty.FlowRate
     @L0.assert DN.Diagram.drawMapEnabled true

-    @L0.assert DN.Diagram.profileUpdateInterval
-        2000 : L0.Long
+// Removed by Jani as the intervalled profile update is not currently working
+//    @L0.assert DN.Diagram.profileUpdateInterval
+//        2000 : L0.Long

     @L0.assert DN.Diagram.DefaultPipeTechTypeId 0
 
 // ----------------------------------------------------------------------------
     @L0.assert DN.Diagram.DefaultPipeTechTypeId 0
 
 // ----------------------------------------------------------------------------

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 e40e24e8a14f258d93d7313cf85d697e7977a04c..1dab3bd87ff0bdb93e0384178a14b1eef2ff8f1c 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
@@ -115,8 +115,6 @@ public class DistrictNetworkResource {
     public final Resource Diagram_hasActiveVisualisation_Inverse;
     public final Resource Diagram_hasVisualisation;
     public final Resource Diagram_hasVisualisation_Inverse;
     public final Resource Diagram_hasActiveVisualisation_Inverse;
     public final Resource Diagram_hasVisualisation;
     public final Resource Diagram_hasVisualisation_Inverse;

-    public final Resource Diagram_profileUpdateInterval;
-    public final Resource Diagram_profileUpdateInterval_Inverse;

     public final Resource Diagram_splitToMultipleEnabled;
     public final Resource Diagram_splitToMultipleEnabled_Inverse;
     public final Resource Diagram_trackChangesEnabled;
     public final Resource Diagram_splitToMultipleEnabled;
     public final Resource Diagram_splitToMultipleEnabled_Inverse;
     public final Resource Diagram_trackChangesEnabled;


@@ -530,8 +528,6 @@ public class DistrictNetworkResource {
         public static final String Diagram_hasActiveVisualisation_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/hasActiveVisualisation/Inverse";
         public static final String Diagram_hasVisualisation = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/hasVisualisation";
         public static final String Diagram_hasVisualisation_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/hasVisualisation/Inverse";
         public static final String Diagram_hasActiveVisualisation_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/hasActiveVisualisation/Inverse";
         public static final String Diagram_hasVisualisation = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/hasVisualisation";
         public static final String Diagram_hasVisualisation_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/hasVisualisation/Inverse";

-        public static final String Diagram_profileUpdateInterval = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/profileUpdateInterval";
-        public static final String Diagram_profileUpdateInterval_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/profileUpdateInterval/Inverse";

         public static final String Diagram_splitToMultipleEnabled = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/splitToMultipleEnabled";
         public static final String Diagram_splitToMultipleEnabled_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/splitToMultipleEnabled/Inverse";
         public static final String Diagram_trackChangesEnabled = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/trackChangesEnabled";
         public static final String Diagram_splitToMultipleEnabled = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/splitToMultipleEnabled";
         public static final String Diagram_splitToMultipleEnabled_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/splitToMultipleEnabled/Inverse";
         public static final String Diagram_trackChangesEnabled = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/trackChangesEnabled";


@@ -955,8 +951,6 @@ public class DistrictNetworkResource {
         Diagram_hasActiveVisualisation_Inverse = getResourceOrNull(graph, URIs.Diagram_hasActiveVisualisation_Inverse);
         Diagram_hasVisualisation = getResourceOrNull(graph, URIs.Diagram_hasVisualisation);
         Diagram_hasVisualisation_Inverse = getResourceOrNull(graph, URIs.Diagram_hasVisualisation_Inverse);
         Diagram_hasActiveVisualisation_Inverse = getResourceOrNull(graph, URIs.Diagram_hasActiveVisualisation_Inverse);
         Diagram_hasVisualisation = getResourceOrNull(graph, URIs.Diagram_hasVisualisation);
         Diagram_hasVisualisation_Inverse = getResourceOrNull(graph, URIs.Diagram_hasVisualisation_Inverse);

-        Diagram_profileUpdateInterval = getResourceOrNull(graph, URIs.Diagram_profileUpdateInterval);
-        Diagram_profileUpdateInterval_Inverse = getResourceOrNull(graph, URIs.Diagram_profileUpdateInterval_Inverse);

         Diagram_splitToMultipleEnabled = getResourceOrNull(graph, URIs.Diagram_splitToMultipleEnabled);
         Diagram_splitToMultipleEnabled_Inverse = getResourceOrNull(graph, URIs.Diagram_splitToMultipleEnabled_Inverse);
         Diagram_trackChangesEnabled = getResourceOrNull(graph, URIs.Diagram_trackChangesEnabled);
         Diagram_splitToMultipleEnabled = getResourceOrNull(graph, URIs.Diagram_splitToMultipleEnabled);
         Diagram_splitToMultipleEnabled_Inverse = getResourceOrNull(graph, URIs.Diagram_splitToMultipleEnabled_Inverse);
         Diagram_trackChangesEnabled = getResourceOrNull(graph, URIs.Diagram_trackChangesEnabled);

diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/ThrottledStyleBase.java b/org.simantics.district.network/src/org/simantics/district/network/profile/ThrottledStyleBase.java
index f697a73f4322301e117503562aadc0052de470e1..8e5421a84b3693b8362778266206a61916f3302d 100644 (file)
--- a/org.simantics.district.network/src/org/simantics/district/network/profile/ThrottledStyleBase.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/profile/ThrottledStyleBase.java
@@ -95,7 +95,8 @@ public abstract class ThrottledStyleBase<Result> extends StyleBase<Optional<Resu
             DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
             Long interval = DEFAULT_INTERVAL;
             if (configuration != null) {
             DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
             Long interval = DEFAULT_INTERVAL;
             if (configuration != null) {

-                interval = graph.getPossibleRelatedValue(configuration, DN.Diagram_profileUpdateInterval, Bindings.LONG);
+                // TODO: take back to use when throttled profile is actually working
+                // interval = graph.getPossibleRelatedValue(configuration, DN.Diagram_profileUpdateInterval, Bindings.LONG);

             }
             return interval != null ? interval : DEFAULT_INTERVAL;
         }
             }
             return interval != null ? interval : DEFAULT_INTERVAL;
         }