Fixes to SCLLabelRule definitions

refs #7315

Change-Id: I9e1ae08ab39a440c60e5abf3d37edfeb4419e96f

diff --git a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
index cd3f1f31f996a4d8eb4a26237b7ca09baab4870a..0255339ac7bda279053ca6e30b98d744f2362ac2 100644 (file)
--- a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
+++ b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
@@ -20,7 +20,7 @@ MOD.Contributions : L0.Library
 MOD.SCLChildRule <T VP.ChildRule
   >-- MOD.SCLChildRule.getChildren ==> "Resource -> <ReadGraph> [Resource]" <R L0.HasProperty : L0.FunctionalRelation
 
 MOD.SCLChildRule <T VP.ChildRule
   >-- MOD.SCLChildRule.getChildren ==> "Resource -> <ReadGraph> [Resource]" <R L0.HasProperty : L0.FunctionalRelation
 

-MOD.SCLLabelRule <T VP.ChildRule
+MOD.SCLLabelRule <T VP.VisualsRule

   >-- MOD.SCLLabelRule.getLabels ==> "Resource -> <ReadGraph> [String]" <R L0.HasProperty : L0.FunctionalRelation
 
 MOD.SCLAction <T ACT.Action
   >-- MOD.SCLLabelRule.getLabels ==> "Resource -> <ReadGraph> [String]" <R L0.HasProperty : L0.FunctionalRelation
 
 MOD.SCLAction <T ACT.Action


@@ -372,6 +372,13 @@ MOD.sclChildRule : L0.Template
             L0.SCLValue.expression %expression
             L0.HasValueType "Resource -> <ReadGraph> [Resource]"
 
             L0.SCLValue.expression %expression
             L0.HasValueType "Resource -> <ReadGraph> [Resource]"
 

+MOD.sclLabelRule : L0.Template
+    @template %action %expression
+        %action : MOD.SCLLabelRule
+          MOD.SCLLabelRule.getLabels _ : MOD.SCLValue
+            L0.SCLValue.expression %expression
+            L0.HasValueType "Resource -> <ReadGraph> [String]"
+

 MOD.sclAction : L0.Template
     @template %action %expression
         %action : MOD.SCLAction
 MOD.sclAction : L0.Template
     @template %action %expression
         %action : MOD.SCLAction