From: jsimomaa <jani.simomaa@gmail.com>
Date: Mon, 30 Jul 2018 12:39:20 +0000 (+0300)
Subject: Save solver module name for later use after mapping
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F74%2F1974%2F2;p=simantics%2Fdistrict.git

Save solver module name for later use after mapping

gitlab #4

Change-Id: I48e3b96eab01bd29435993ff4bf5d9f7d0076500
---

diff --git a/org.simantics.district.network.ontology/graph.tg b/org.simantics.district.network.ontology/graph.tg
index 2bda23f8..53418330 100644
Binary files a/org.simantics.district.network.ontology/graph.tg and b/org.simantics.district.network.ontology/graph.tg differ
diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 64dbb60f..5c165085 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -56,6 +56,11 @@ DN.HasId <R L0.HasProperty : SEL.GenericParameterType
     L0.HasRange L0.String
     L0.readOnly false
 
+DN.HasSolverRVI <R L0.HasProperty
+    L0.HasLabel "Solver RVI"
+    L0.HasRange L0.String
+    L0.readOnly true
+
 DN.Vertex.HasElevation <R L0.HasProperty : SEL.GenericParameterType
     L0.HasLabel "Elevation"
     L0.HasRange L0.Double
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 d1e9ebd1..accd2264 100644
--- 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
@@ -69,6 +69,8 @@ public class DistrictNetworkResource {
     public final Resource HasSRID_Inverse;
     public final Resource HasSRTEXT;
     public final Resource HasSRTEXT_Inverse;
+    public final Resource HasSolverRVI;
+    public final Resource HasSolverRVI_Inverse;
     public final Resource HasSpatialRefSystem;
     public final Resource HasSpatialRefSystem_Inverse;
     public final Resource HasStartVertex;
@@ -260,6 +262,8 @@ public class DistrictNetworkResource {
         public static final String HasSRID_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasSRID/Inverse";
         public static final String HasSRTEXT = "http://www.simantics.org/DistrictNetwork-1.0/HasSRTEXT";
         public static final String HasSRTEXT_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasSRTEXT/Inverse";
+        public static final String HasSolverRVI = "http://www.simantics.org/DistrictNetwork-1.0/HasSolverRVI";
+        public static final String HasSolverRVI_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasSolverRVI/Inverse";
         public static final String HasSpatialRefSystem = "http://www.simantics.org/DistrictNetwork-1.0/HasSpatialRefSystem";
         public static final String HasSpatialRefSystem_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasSpatialRefSystem/Inverse";
         public static final String HasStartVertex = "http://www.simantics.org/DistrictNetwork-1.0/HasStartVertex";
@@ -461,6 +465,8 @@ public class DistrictNetworkResource {
         HasSRID_Inverse = getResourceOrNull(graph, URIs.HasSRID_Inverse);
         HasSRTEXT = getResourceOrNull(graph, URIs.HasSRTEXT);
         HasSRTEXT_Inverse = getResourceOrNull(graph, URIs.HasSRTEXT_Inverse);
+        HasSolverRVI = getResourceOrNull(graph, URIs.HasSolverRVI);
+        HasSolverRVI_Inverse = getResourceOrNull(graph, URIs.HasSolverRVI_Inverse);
         HasSpatialRefSystem = getResourceOrNull(graph, URIs.HasSpatialRefSystem);
         HasSpatialRefSystem_Inverse = getResourceOrNull(graph, URIs.HasSpatialRefSystem_Inverse);
         HasStartVertex = getResourceOrNull(graph, URIs.HasStartVertex);
diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
index 03080275..a088ca90 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
@@ -65,7 +65,7 @@ public class DistrictNetworkEdgeNode extends G2DNode {
             if (scaleStroke && STROKE instanceof BasicStroke) {
                 double str;
                 if (stroke != null)
-                    str = stroke;
+                    str = Math.abs(stroke);
                 else
                     str = 1.0;
                 BasicStroke bs = GeometryUtils.scaleStroke(STROKE, (float) (str / GeometryUtils.getScale(g2d.getTransform())));