Make sure sysdyn modules can and will have subrelations

gitlab #55

Change-Id: Iaa61ffd646b8dbf093ecc37a2bc2f0cbec2a0716

diff --git a/bundles/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/bundles/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 965ec3d58f4edcaa5f393f9b22a554002e79a52c..8037feceefda00def6376db5150a0bfe73e105a2 100644 (file)
--- a/bundles/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/bundles/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -155,7 +155,9 @@ SYSDYN.Variable <T SYSDYN.Component
         L0.valueAccessor FUNCTIONS.equationPropertyValue : L0.ExternalValue
     @L0.assert SYSDYN.Variable.equation 
         _ : L0.Value
-
+//Modules can have subrelations
+SYSDYN.subIsHeadOf <R SYSDYN.Variable.isHeadOf
+SYSDYN.subIsTailOf <R SYSDYN.Variable.isTailOf
 FUNCTIONS.valuePropertyProperties : L0.ExternalValue
 FUNCTIONS.valuePropertyValue : L0.ExternalValue
     

diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/newActions/NewModuleTypeAction.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/newActions/NewModuleTypeAction.java
index b15bcfa222633b350970a8aa1c7fba50b0f8e547..ac5243806ba9868e75d95e69d9cdc87debd941f1 100644 (file)
--- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/newActions/NewModuleTypeAction.java
+++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/newActions/NewModuleTypeAction.java
@@ -118,12 +118,25 @@ public class NewModuleTypeAction implements ActionFactory{
         };
     }
 
-    public static Resource createTerminalRelation(WriteGraph graph, Resource symbol, Resource connectionRelation, Resource configurationRelation) throws DatabaseException {
+    public static Resource createTerminalRelation(WriteGraph graph, Resource symbol, Resource connectionRelation, Resource configurationRelationBase) throws DatabaseException {
         StructuralResource2 STR = StructuralResource2.getInstance(graph);
         ModelingResources MOD = ModelingResources.getInstance(graph);
         Layer0 L0 = Layer0.getInstance(graph);
-
-
+        
+        Resource configurationRelationBaseInverse = graph.getSingleObject(configurationRelationBase, L0.InverseOf);
+        
+        Resource configurationRelation = GraphUtils.create(graph,
+                L0.SubrelationOf, configurationRelationBase,
+                L0.PartOf, symbol,
+                L0.HasName, NameUtils.getSafeName(graph, configurationRelationBase)
+                );
+        
+        Resource configurationRelationInverse = GraphUtils.create(graph,
+                L0.PartOf, configurationRelation, 
+                L0.SubrelationOf, configurationRelationBaseInverse,
+                L0.HasName, "Inverse",
+                L0.InverseOf, configurationRelation);
+        
         Resource terminalRelation = null;
         terminalRelation = GraphUtils.create(graph,
                 MOD.DiagramConnectionRelationToConnectionRelation, configurationRelation,