]> gerrit.simantics Code Review - simantics/district.git/commitdiff
Add MappedComponent and remove HasSolverRVI 00/2100/1
authorjsimomaa <jani.simomaa@gmail.com>
Sun, 2 Sep 2018 21:29:28 +0000 (00:29 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tue, 4 Sep 2018 10:25:49 +0000 (10:25 +0000)
gitlab #7

Change-Id: I53ab1801acf719a483d7d45de6eaadeb26a13527
(cherry picked from commit f2ed416a826b3d24d7bffe41563a202d1be78bda)

org.simantics.district.network.ontology/graph.tg
org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java

index dcc422bf507a0062f0c1c4d99bf6df0f6e480e7a..fc089f4ab81b00cc21313d3b70c72ba3f19e7327 100644 (file)
Binary files a/org.simantics.district.network.ontology/graph.tg and b/org.simantics.district.network.ontology/graph.tg differ
index b7b5d04363a98ec220d847f4724db592971f86c7..8b42129cb035cc2fefd4a968268053e77b35daa6 100644 (file)
@@ -56,11 +56,6 @@ 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
@@ -210,8 +205,11 @@ DN.HasInLayerTag <R L0.HasProperty
 
 DN.Connection <T DIA.Connection
 
+// For associating typical diagram source and instance structures with each other
 DN.Diagram.MappedDiagram <R L0.IsWeaklyRelatedTo
+    L0.InverseOf DN.Diagram.MappedFromDiagram <R L0.IsWeaklyRelatedTo
 DN.MappedComponent <R L0.IsWeaklyRelatedTo
+    L0.InverseOf DN.MappedFromElement <R L0.IsWeaklyRelatedTo
 
 DN.Diagram <T DIA.Diagram
 
index d23f9d0ceaf1014f6cfe2809c7562e996aa452d8..5859e2fdc9836a0762c36151c00d8efe1756d63f 100644 (file)
@@ -69,8 +69,6 @@ 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;
@@ -266,8 +264,6 @@ 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";
@@ -473,8 +469,6 @@ 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);