Merge commit '2bcb7e8598e769cf21fa6525fc244e1da3eceb31'

diff --git a/bundles/org.simantics.diagram.ontology/graph.tg b/bundles/org.simantics.diagram.ontology/graph.tg
index ab1473989a6c62d35bca5b833272126c1d841a7e..0a440442c852641a211991fcb03ae32a57948373 100644 (file)
Binary files a/bundles/org.simantics.diagram.ontology/graph.tg and b/bundles/org.simantics.diagram.ontology/graph.tg differ

diff --git a/bundles/org.simantics.diagram.ontology/graph/DiagramFlags.pgraph b/bundles/org.simantics.diagram.ontology/graph/DiagramFlags.pgraph
index 9bc54f70380383e88d68580176f1301e8d127e52..322f057a6fe7930bafe556ac9fcbc5d28dc39b31 100644 (file)
--- a/bundles/org.simantics.diagram.ontology/graph/DiagramFlags.pgraph
+++ b/bundles/org.simantics.diagram.ontology/graph/DiagramFlags.pgraph
@@ -34,7 +34,7 @@ DIA.Flag <T DIA.DefinedElement
     @L0.assert DIA.HasFlagType DIA.FlagType.InputFlag\r
     @L0.assert L0.HasLabel\r
         "" : DIA.FlagLabel\r
-    STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext\r
+    STR.IsDefinedBy _ : DIA.Composite\r
         @L0.orderedSet\r
             DIA.Flag.Terminal : DIA.Terminal\r
                 DIA.HasTransform [1,0,0,1,0,0] : G2D.Transform\r

diff --git a/bundles/org.simantics.diagram.ontology/graph/DiagramRuntime.pgraph b/bundles/org.simantics.diagram.ontology/graph/DiagramRuntime.pgraph
index 1f65fa6426f84d85ab57cc2ca6085d4b0b3ef3e0..83b401c243392d61b119356e17c91da37bfc17ca 100644 (file)
--- a/bundles/org.simantics.diagram.ontology/graph/DiagramRuntime.pgraph
+++ b/bundles/org.simantics.diagram.ontology/graph/DiagramRuntime.pgraph
@@ -3,8 +3,6 @@ DIA = <http://www.simantics.org/Diagram-2.2>
 
 // Runtime model
 
-DIA.Functions : L0.Library
-
 DIA.RuntimeDiagram <T L0.Entity
     @L0.singleProperty DIA.RuntimeDiagram.HasConfiguration
     >-- DIA.RuntimeDiagram.variable --> L0.Value <R L0.HasProperty : L0.FunctionalRelation

diff --git a/bundles/org.simantics.diagram.ontology/graph/ProfilesView.pgraph b/bundles/org.simantics.diagram.ontology/graph/ProfilesView.pgraph
index ac767e644cb4ba0624c4208f7a851b364d628ba1..8f8b11f1c71b032d6d23e90d1bd1e72d0c7a2d84 100644 (file)
--- a/bundles/org.simantics.diagram.ontology/graph/ProfilesView.pgraph
+++ b/bundles/org.simantics.diagram.ontology/graph/ProfilesView.pgraph
@@ -121,14 +121,14 @@ BRO.Combo.Modifier DIA.ProfilesView.ActiveProfileModifier
                             */\r
                             /*\r
             DIA.ProfilesView.Entries : BRO.Composite\r
-                BRO.Composite.Children _ <R L0.HasNext\r
+                BRO.Composite.Children _\r
                     @L0.orderedSet\r
                         _ : BRO.Button\r
                             BRO.Button.Text "Create Entry"\r
                             BRO.Button.Action _ : BRO.Wizard\r
                                 BRO.Wizard.Title "Create new profile entry"\r
                                 BRO.Wizard.FinishAction DIA.ProfilesView.CreateEntryAction : BRO.Action \r
-                                BRO.Wizard.Pages _ <R L0.HasNext\r
+                                BRO.Wizard.Pages _\r
                                     @L0.orderedSet\r
                                         _ : BRO.WizardPage\r
                                             BRO.WizardPage.Title "Select group"\r
@@ -143,7 +143,7 @@ BRO.Combo.Modifier DIA.ProfilesView.ActiveProfileModifier
                         _ : BRO.GraphExplorerComposite\r
                             BRO.GraphExplorerComposite.BrowseContextURI "http://www.simantics.org/Diagram-0.0/ProfilesView/Entries"    \r
             DIA.ProfilesView.Groups : BRO.Composite\r
-                BRO.Composite.Children _ <R L0.HasNext\r
+                BRO.Composite.Children _\r
                     @L0.orderedSet\r
                         _ : BRO.Button\r
                             BRO.Button.Text "Create SCL group"\r
@@ -151,7 +151,7 @@ BRO.Combo.Modifier DIA.ProfilesView.ActiveProfileModifier
                         _ : BRO.GraphExplorerComposite\r
                             BRO.GraphExplorerComposite.BrowseContextURI "http://www.simantics.org/Diagram-0.0/ProfilesView/Groups"    \r
             DIA.ProfilesView.Styles : BRO.Composite\r
-                BRO.Composite.Children _ <R L0.HasNext\r
+                BRO.Composite.Children _\r
                     @L0.orderedSet\r
                         _ : BRO.Button\r
                             BRO.Button.Text "Create SCL style"\r

diff --git a/bundles/org.simantics.document.base.ontology/graph.tg b/bundles/org.simantics.document.base.ontology/graph.tg
index f23cc04e03a87d45636fead560c49916505fa8ac..f98ba9855cd771ae8a9bb2c6abf3e623985a67c7 100644 (file)
Binary files a/bundles/org.simantics.document.base.ontology/graph.tg and b/bundles/org.simantics.document.base.ontology/graph.tg differ

diff --git a/bundles/org.simantics.document.base.ontology/graph/Elements.pgraph b/bundles/org.simantics.document.base.ontology/graph/Elements.pgraph
index 03844595014dbb220666ffe798a1a378928faccc..6fabbce0bd65fd4564561f0670374305fe010a8c 100644 (file)
--- a/bundles/org.simantics.document.base.ontology/graph/Elements.pgraph
+++ b/bundles/org.simantics.document.base.ontology/graph/Elements.pgraph
@@ -301,50 +301,50 @@ DIAGRAMRELATIONS.eventOut
 TERMINALS = DOC.Terminals : L0.Library \r
 \r
 TERMINALS.ParentTerminal /* @ "Connection point to parent" */ <T DIA.DefinedElement <T DIA.Terminal\r
-    STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext\r
+    STR.IsDefinedBy _ : DIA.Composite\r
         @L0.orderedSet\r
             _ : DIA.SVGElement\r
                 G2D.HasSVGDocument """<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" overflow="visible" version="1.1"><g transform="translate(-0.0,-0.0)"><rect x="-0.5" y="-0.5" width="1.0" height="1.0" fill="rgb(0,163,204)" stroke="black" stroke-width="0.1"/></g></svg>""" : L0.String\r
                 \r
                 \r
 TERMINALS.ChildTerminal /* @ "Connection point to a child element" */ <T DIA.DefinedElement <T DIA.Terminal\r
-    STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext\r
+    STR.IsDefinedBy _ : DIA.Composite\r
         @L0.orderedSet\r
             _ : DIA.SVGElement\r
                 G2D.HasSVGDocument """<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" overflow="visible" version="1.1"><g transform="translate(-0.0,-0.0)"><ellipse cx="0.0" cy="0.0" rx="0.5" ry="0.5" fill="rgb(0,163,204)" stroke="black" stroke-width="0.1"/></g></svg>""" : L0.String\r
   \r
 TERMINALS.CommandTerminal /* @ "Command termina" */ <T DIA.DefinedElement <T DIA.Terminal\r
-    STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext\r
+    STR.IsDefinedBy _ : DIA.Composite\r
         @L0.orderedSet\r
             _ : DIA.SVGElement\r
                 G2D.HasSVGDocument """<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" overflow="visible" version="1.1"><g transform="translate(-0.0,-0.0)"><rect x="-0.5" y="-0.5" width="1.0" height="1.0" fill="rgb(255,0,255)" stroke="black" stroke-width="0.1"/></g></svg>""" : L0.String\r
                 \r
 TERMINALS.CommandExecutorTerminal /* @ "Command executor terminal" */ <T DIA.DefinedElement <T DIA.Terminal\r
-    STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext\r
+    STR.IsDefinedBy _ : DIA.Composite\r
         @L0.orderedSet\r
             _ : DIA.SVGElement\r
                 G2D.HasSVGDocument """<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" overflow="visible" version="1.1"><g transform="translate(-0.0,-0.0)"><ellipse cx="0.0" cy="0.0" rx="0.5" ry="0.5" fill="rgb(255,0,255)" stroke="black" stroke-width="0.1"/></g></svg>""" : L0.String\r
 \r
 TERMINALS.BroadcastTerminal /* @ "Command broadcast terminal" */ <T DIA.DefinedElement <T DIA.Terminal\r
-    STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext\r
+    STR.IsDefinedBy _ : DIA.Composite\r
         @L0.orderedSet\r
             _ : DIA.SVGElement\r
                 G2D.HasSVGDocument """<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" overflow="visible" version="1.1"><g transform="translate(-0.0,-0.0)"><ellipse cx="0.0" cy="0.0" rx="0.5" ry="0.5" fill="rgb(215,0,215)" stroke="black" stroke-width="0.1"/></g></svg>""" : L0.String\r
                 \r
 TERMINALS.BroadcastedTerminal /* @ "Command broadcasted terminal" */ <T DIA.DefinedElement <T DIA.Terminal\r
-    STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext\r
+    STR.IsDefinedBy _ : DIA.Composite\r
         @L0.orderedSet\r
             _ : DIA.SVGElement\r
                 G2D.HasSVGDocument """<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" overflow="visible" version="1.1"><g transform="translate(-0.0,-0.0)"><rect x="-0.5" y="-0.5" width="1.0" height="1.0" fill="rgb(215,0,215)" stroke="black" stroke-width="0.1"/></g></svg>""" : L0.String\r
 \r
 TERMINALS.DataConsumerTerminal /* @ "Data consumer, using data from a provider" */ <T DIA.DefinedElement <T DIA.Terminal\r
-    STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext\r
+    STR.IsDefinedBy _ : DIA.Composite\r
         @L0.orderedSet\r
             _ : DIA.SVGElement\r
                 G2D.HasSVGDocument """<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" overflow="visible" version="1.1"><g transform="translate(-0.0,-0.0)"><ellipse cx="0.0" cy="0.0" rx="0.5" ry="0.5" fill="rgb(255,166,0)" stroke="black" stroke-width="0.1"/></g></svg>""" : L0.String\r
                 \r
 TERMINALS.DataProviderTerminal /* @ "Provides data to a consumer" */ <T DIA.DefinedElement <T DIA.Terminal\r
-    STR.IsDefinedBy _ : DIA.Composite <R L0.HasNext\r
+    STR.IsDefinedBy _ : DIA.Composite\r
         @L0.orderedSet\r
             _ : DIA.SVGElement\r
                 G2D.HasSVGDocument """<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" overflow="visible" version="1.1"><g transform="translate(-0.0,-0.0)"><ellipse cx="0.0" cy="0.0" rx="0.5" ry="0.5" fill="rgb(255,166,0)" stroke="black" stroke-width="0.1"/></g></svg>""" : L0.String\r

diff --git a/bundles/org.simantics.document.base.ontology/graph/Properties.pgraph b/bundles/org.simantics.document.base.ontology/graph/Properties.pgraph
index 0ecca5e065d27b0099252e2da407859a8cfd5c9e..9093ebe9476de4d0364bec1059bc6d861ec08bf3 100644 (file)
--- a/bundles/org.simantics.document.base.ontology/graph/Properties.pgraph
+++ b/bundles/org.simantics.document.base.ontology/graph/Properties.pgraph
@@ -26,7 +26,7 @@ defExtraAttribute = PROPERTIES.defExtraAttribute : L0.Template
         %subject <R L0.HasProperty : DOC.Document.ExtraAttributeRelation : L0.FunctionalRelation
             L0.HasRange %range
 
-PROPERTIES.inputUri <R L0.HasProperty : PROPERTIES.ParameterType
+PROPERTIES.inputUri : PROPERTIES.ParameterType
     ==> "String"
     @PROPERTIES.defAttribute L0.Value
     L0.HasLabel "Input URI"
@@ -49,50 +49,50 @@ PROPERTIES.experiment <R L0.HasProperty : L0.FunctionalRelation
 PROPERTIES.model <R L0.HasProperty : L0.FunctionalRelation
     ==> "Variable"
     
-PROPERTIES.exists <R L0.HasProperty : L0.FunctionalRelation
+PROPERTIES.exists
     @defAttribute L0.Boolean    
     L0.RequiresValueType "Boolean" 
 
-PROPERTIES.pathExists <R L0.HasProperty : L0.FunctionalRelation
+PROPERTIES.pathExists
     @defAttribute L0.Boolean    
     L0.RequiresValueType "Boolean" 
 
-PROPERTIES.commands <R L0.HasProperty : L0.FunctionalRelation
+PROPERTIES.commands
     @defAttribute L0.String    
     L0.RequiresValueType "String" 
     L0.HasLabel "Commands"
     
-PROPERTIES.dataDefinitions <R L0.HasProperty : L0.FunctionalRelation
+PROPERTIES.dataDefinitions
     @defAttribute L0.String    
     L0.RequiresValueType "String" 
     L0.HasLabel "Data Definitions"
 
-PROPERTIES.SCLFunction <R L0.HasProperty : PROPERTIES.ParameterType
+PROPERTIES.SCLFunction : PROPERTIES.ParameterType
     @PROPERTIES.defAttribute L0.Value
     ==> "EventHandler"   
     L0.HasLabel "SCL Function"
     
-PROPERTIES.target : PROPERTIES.ParameterType : L0.FunctionalRelation
+PROPERTIES.target : PROPERTIES.ParameterType
     @PROPERTIES.defAttribute L0.String    
     L0.RequiresValueType "String"
     L0.HasLabel "Target"
 
-PROPERTIES.hyperlinkTarget : PROPERTIES.ParameterType : L0.FunctionalRelation
+PROPERTIES.hyperlinkTarget : PROPERTIES.ParameterType
     @PROPERTIES.defAttribute L0.String    
     L0.RequiresValueType "String"
     L0.HasLabel "Target type (optional)"
 
-PROPERTIES.targets : PROPERTIES.ParameterType : L0.FunctionalRelation
+PROPERTIES.targets : PROPERTIES.ParameterType
     @PROPERTIES.defAttribute L0.StringArray  
     L0.RequiresValueType "Array String"
     L0.HasLabel "Targets"
     
-PROPERTIES.source : PROPERTIES.ParameterType : L0.FunctionalRelation
+PROPERTIES.source : PROPERTIES.ParameterType
     @PROPERTIES.defAttribute L0.String    
     L0.RequiresValueType "String"
     L0.HasLabel "Source"
 
-PROPERTIES.sources : PROPERTIES.ParameterType : L0.FunctionalRelation
+PROPERTIES.sources : PROPERTIES.ParameterType
     @PROPERTIES.defAttribute L0.StringArray  
     L0.RequiresValueType "Array String"
     L0.HasLabel "Sources"

diff --git a/bundles/org.simantics.modeling.ontology/graph.tg b/bundles/org.simantics.modeling.ontology/graph.tg
index e07cd6b11b928adca1ce721d835b9440f14604d2..1295295928ec66b1bfa9f7ad1f3ff3e39407912f 100644 (file)
Binary files a/bundles/org.simantics.modeling.ontology/graph.tg and b/bundles/org.simantics.modeling.ontology/graph.tg differ

diff --git a/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph b/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph
index b8ab1cbfa2017cb5d3ab1f13664a4d1eb9e50f53..a94c64f2df0c3f95b1e7d133e3f2a021af5bce3e 100644 (file)
--- a/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph
+++ b/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph
@@ -298,11 +298,12 @@ MOD.ModelBrowser <T VIEW.Explorer
 \r
 MOD.PlainModelBrowser : MOD.ModelBrowser\r
 \r
+MOD.Functions.sclValue : L0.ExternalValue\r
+\r
 MOD.MonitorValue <T STR.MonitorValue\r
   @L0.assert L0.valueAccessor\r
     MOD.Functions.monitorValueAccessor : L0.ExternalValue\r
-  @L0.assert L0.ConvertsToValueWith\r
-    MOD.Functions.sclValue : L0.ExternalValue\r
+  @L0.assert L0.ConvertsToValueWith MOD.Functions.sclValue\r
   @L0.assert L0.SCLValue.environment\r
     _ : L0.SCLValue.Environment\r
       L0.SCLValue.Environment.moduleName "Simantics/All"\r
@@ -311,8 +312,7 @@ MOD.MonitorValue <T STR.MonitorValue
     MOD.Functions.monitorReadOnly : L0.Function\r
 \r
 MOD.SCLValue <T L0.SCLValue\r
-  @L0.assert L0.ConvertsToValueWith\r
-    MOD.Functions.sclValue : L0.ExternalValue\r
+  @L0.assert L0.ConvertsToValueWith MOD.Functions.sclValue\r
   /*@L0.assert L0.SCLValue.environment\r
     _ : L0.SCLValue.Environment\r
       L0.SCLValue.Environment.moduleName "Simantics/All"\r

diff --git a/bundles/org.simantics.modeling.ontology/graph/ModelingOperations.pgraph b/bundles/org.simantics.modeling.ontology/graph/ModelingOperations.pgraph
index 0cabe09ca2112ebafe156f3cc12b8492c233ea1c..574fd8df085f35d53a2ab56099a6f2dda2f01b68 100644 (file)
--- a/bundles/org.simantics.modeling.ontology/graph/ModelingOperations.pgraph
+++ b/bundles/org.simantics.modeling.ontology/graph/ModelingOperations.pgraph
@@ -15,6 +15,8 @@ PREDS.HasCounterpart : PRED.Predicate
 // Operations\r
 OPS = MOD.Operations : L0.Library\r
 \r
+OPS.NavigateToTarget : OP.Operation\r
+\r
 MOD.HasModelingOperations <R L0.IsWeaklyRelatedTo\r
 MOD.HasDiagramOperations <R L0.IsWeaklyRelatedTo\r
 \r
@@ -40,7 +42,7 @@ DIA.Flag
         @L0.orderedSet
             _ : OP.ConditionalList
                 OP.HasCondition PREDS.HasCounterpart
-                OP.HasThenElement OPS.NavigateToTarget : OP.Operation
+                OP.HasThenElement OPS.NavigateToTarget
             //_ : OP.ConditionalList
             //    OP.HasCondition PREDS.HasCounterpart
             //    OP.HasThenElement OPS.DisconnectFlag : OP.Operation\r
@@ -50,4 +52,4 @@ DIA.Monitor
         @L0.orderedSet\r
             _ : OP.ConditionalList\r
                 OP.HasCondition PREDS.HasCounterpart\r
-                OP.HasThenElement OPS.NavigateToTarget : OP.Operation\r
+                OP.HasThenElement OPS.NavigateToTarget\r

diff --git a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
index 75d2fd3fd82c3462b6b019232a7fa59a2230141f..508f3ba9ecdf651ed7d9e03b2020e5de41e298b1 100644 (file)
--- a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
+++ b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
@@ -486,26 +486,26 @@ MAC
         VP.ActionContribution.HasImage IMAGES.ComponentType\r
         VP.ActionContribution.HasCategory VP.NewActionCategory\r
         VP.ActionContribution.HasNodeType MBC.ComponentTypesFolder\r
-        VP.ActionContribution.HasAction ACTIONS.NewComponentType : ACT.Action\r
+        VP.ActionContribution.HasAction ACTIONS.NewComponentType\r
     VP.BrowseContext.HasActionContribution _ : VP.ActionContribution\r
         L0.HasLabel "User Component"\r
         VP.ActionContribution.HasImage IMAGES.ComponentType\r
         VP.ActionContribution.HasCategory VP.NewActionCategory\r
         VP.ActionContribution.HasNodeType L0.Library\r
-        VP.ActionContribution.HasAction ACTIONS.NewComponentType : ACT.Action\r
+        VP.ActionContribution.HasAction ACTIONS.NewComponentType\r
         VP.ActionContribution.IsVisibleIf TESTS.IsContainerNotPublished\r
     VP.BrowseContext.HasActionContribution _ : VP.ActionContribution\r
         L0.HasLabel "Procedural User Component"\r
         VP.ActionContribution.HasImage IMAGES.ComponentType\r
         VP.ActionContribution.HasCategory VP.NewActionCategory\r
         VP.ActionContribution.HasNodeType MBC.ComponentTypesFolder\r
-        VP.ActionContribution.HasAction ACTIONS.NewProceduralComponentType : ACT.Action\r
+        VP.ActionContribution.HasAction ACTIONS.NewProceduralComponentType\r
     VP.BrowseContext.HasActionContribution _ : VP.ActionContribution\r
         L0.HasLabel "Procedural User Component"\r
         VP.ActionContribution.HasImage IMAGES.ComponentType\r
         VP.ActionContribution.HasCategory VP.NewActionCategory\r
         VP.ActionContribution.HasNodeType L0.Library\r
-        VP.ActionContribution.HasAction ACTIONS.NewProceduralComponentType : ACT.Action\r
+        VP.ActionContribution.HasAction ACTIONS.NewProceduralComponentType\r
         VP.ActionContribution.IsVisibleIf TESTS.IsContainerNotPublished\r
     VP.BrowseContext.HasActionContribution _ : VP.ActionContribution\r
         L0.HasLabel "Assign Symbol Group..."\r
@@ -636,6 +636,9 @@ ACTIONS.CompilePGraphs : ACT.Action
 ACTIONS.RenameDiagramComponents : ACT.Action\r
 ACTIONS.Help : ACT.Action\r
 \r
+ACTIONS.NewProceduralComponentType : ACT.Action\r
+ACTIONS.NewComponentType : ACT.Action\r
+\r
 TESTS = MAC.Tests : L0.Library\r
 TESTS.IsNotPublished\r
   @MOD.sclTest "isNotPublished"\r
@@ -654,8 +657,6 @@ TESTS.CanDelete
 TESTS.CanRename\r
   @MOD.sclTest "canRename"\r
 \r
-\r
-MOD.Functions : L0.Library\r
 MOD.Functions.singleVariableSelection : L0.Function\r
   L0.HasValueType "a"\r
 MOD.Functions.projectSelection : L0.Function\r

diff --git a/bundles/org.simantics.structural.ontology/graph.tg b/bundles/org.simantics.structural.ontology/graph.tg
index 93d027dde99f75c8436b60459190ba013524e6b5..28ffbc4654818328379e6005ad74d05ed3458035 100644 (file)
Binary files a/bundles/org.simantics.structural.ontology/graph.tg and b/bundles/org.simantics.structural.ontology/graph.tg differ

diff --git a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
index 0393439f6c89781c09b891e83f1b0239122d8451..eba1f52fe6e56deb0a1b0853e31642cd1e7f6c6d 100644 (file)
--- a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
+++ b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
@@ -106,14 +106,16 @@ STR.Connection <T L0.Entity
 STR.ConnectionVariable <T STR.Variable <T STR.Connection
     //[STR.Binds all STR.ConnectionRelation]
 */
+
+STR.Functions.connectionValueAccessor : L0.ExternalValue
+    L0.HasValueType "ValueAccessor"
+
 STR.ConnectionRelation <T L0.Relation
     @L0.assert L0.SharedRange STR.ConnectionRelation
     >-- STR.ConnectionRelation.connectionRequired --> L0.Boolean <R L0.HasProperty : L0.FunctionalRelation
     >-- STR.ConnectionRelation.equivalentConnectionPoint --> STR.ConnectionRelation <R L0.IsRelatedTo
         L0.InverseOf STR.ConnectionRelation.equivalentConnectionPoint
-    @L0.assert L0.valueAccessor 
-        STR.Functions.connectionValueAccessor : L0.ExternalValue
-            L0.HasValueType "ValueAccessor"
+    @L0.assert L0.valueAccessor STR.Functions.connectionValueAccessor
     @L0.assert L0.domainProperties L0.Functions.standardPropertyDomainProperties
     @L0.assert L0.domainChildren L0.Functions.standardPropertyDomainChildren            
 
@@ -268,10 +270,8 @@ STR.Run
 STR.Connection
   @L0.assert L0.domainProperties L0.Functions.standardPropertyDomainProperties
   @L0.assert L0.domainChildren L0.Functions.standardPropertyDomainChildren
-  @L0.assert L0.valueAccessor 
-    STR.Functions.connectionValueAccessor : L0.ExternalValue
-      L0.HasValueType "ValueAccessor"
-      
+  @L0.assert L0.valueAccessor STR.Functions.connectionValueAccessor
+
 STR.SCLValue <T L0.SCLValue
   @L0.assert L0.ConvertsToValueWith STR.Functions.computeExpression
   @L0.assert L0.SCLValue.environment

diff --git a/bundles/org.simantics.viewpoint.ontology/graph.tg b/bundles/org.simantics.viewpoint.ontology/graph.tg
index d2c54ac7f4fd0022c1a3dda3b85c9cf6863426e8..3de5dabca89017ca91e4446d5885baef7208225e 100644 (file)
Binary files a/bundles/org.simantics.viewpoint.ontology/graph.tg and b/bundles/org.simantics.viewpoint.ontology/graph.tg differ

diff --git a/bundles/org.simantics.viewpoint.ontology/graph/Viewpoint.pgraph b/bundles/org.simantics.viewpoint.ontology/graph/Viewpoint.pgraph
index 86701008122d3f371687fb97de2e45548ca5e7e6..c6db5efaaa1895616755ce77f2533765252dd9f0 100644 (file)
--- a/bundles/org.simantics.viewpoint.ontology/graph/Viewpoint.pgraph
+++ b/bundles/org.simantics.viewpoint.ontology/graph/Viewpoint.pgraph
@@ -398,13 +398,6 @@ VP.namedCustomModifierRule : L0.Template
                 VP.VisualsContribution.HasNodeType %parentType\r
                 VP.VisualsContribution.HasRule %modifierRule\r
 \r
-VP.namedCustomModifierRule : L0.Template\r
-    @template %browseContext %name %parentType %modifierRule\r
-        %browseContext\r
-            VP.BrowseContext.HasVisualsContribution _ : VP.VisualsContribution\r
-                VP.VisualsContribution.HasNodeType %parentType\r
-                VP.VisualsContribution.HasRule %modifierRule\r
-\r
 VP.namedCustomVisualsRule : L0.Template\r
     @template %browseContext %name %parentType %labelRule\r
         %browseContext\r