Merge "Minor refactorings related to SCL constructors"

[simantics/platform.git] / bundles / org.simantics.diagram.ontology / graph / Diagram.pgraph

diff --git a/bundles/org.simantics.diagram.ontology/graph/Diagram.pgraph b/bundles/org.simantics.diagram.ontology/graph/Diagram.pgraph
index bd99e8f988a2ba46cdef5d31a74cb0b0de9c45c4..b26bfc698ee214ac9040b7228d2fe0a13c59b334 100644 (file)
--- a/bundles/org.simantics.diagram.ontology/graph/Diagram.pgraph
+++ b/bundles/org.simantics.diagram.ontology/graph/Diagram.pgraph
@@ -9,6 +9,11 @@ DIA = <http://www.simantics.org/Diagram-2.2> : L0.Ontology
     @L0.new
     L0.HasResourceClass "org.simantics.diagram.stubs.DiagramResource"
 
     @L0.new
     L0.HasResourceClass "org.simantics.diagram.stubs.DiagramResource"
 

+DIA.SCLMain : L0.SCLModule
+    L0.SCLModule.definition """
+        include "Simantics/Diagram/Internal/DiagramOntologyEntryPoint"
+        """
+

 //// Import / Export
 
 DIA.DiagramSubgraphExtent : L0X.SubgraphExtent
 //// Import / Export
 
 DIA.DiagramSubgraphExtent : L0X.SubgraphExtent


@@ -64,7 +69,7 @@ DIA.Diagram <T DIA.Composite
     >-- DIA.Diagram.IOTableRenaming --> DIA.IOTableRename <T L0.DependsOn 
     @L0.optionalProperty DIA.HasModCount
 
     >-- DIA.Diagram.IOTableRenaming --> DIA.IOTableRename <T L0.DependsOn 
     @L0.optionalProperty DIA.HasModCount
 

-DIA.HasModCount <R L0.HasProperty
+DIA.HasModCount <R L0.HasProperty : L0.FunctionalRelation

     L0.HasLabel "Modification Counter"
     L0.HasDescription "A counter for modifications performed on the property owner resource. Used for naming elements with running number IDs."
     L0.HasDomain DIA.Composite
     L0.HasLabel "Modification Counter"
     L0.HasDescription "A counter for modifications performed on the property owner resource. Used for naming elements with running number IDs."
     L0.HasDomain DIA.Composite


@@ -114,11 +119,17 @@ DIA.Functions.activeProfileModifier : L0.Function
     L0.HasValueType "String -> String"
 DIA.Functions.diagramElementIssuePath : L0.Function
 
     L0.HasValueType "String -> String"
 DIA.Functions.diagramElementIssuePath : L0.Function
 

+DIA.DefinedElement.Parameter <T L0.PropertyRelation <T L0.FunctionalRelation
+

 DIA.DefinedElement
   // RequiresValueType ]is omitted during transition period.
   // Used to be ==> "[String]" but DIA.symbolCode now returns either "[String]" or "[G2DNodeModification]" directly
   >-- DIA.symbolCode <R L0.HasProperty : L0.FunctionalRelation
   >-- DIA.symbolDropHandler ==> "[WorkbenchSelectionElement] -> <WriteGraph,Proc> ()" <R L0.HasProperty : L0.FunctionalRelation
 DIA.DefinedElement
   // RequiresValueType ]is omitted during transition period.
   // Used to be ==> "[String]" but DIA.symbolCode now returns either "[String]" or "[G2DNodeModification]" directly
   >-- DIA.symbolCode <R L0.HasProperty : L0.FunctionalRelation
   >-- DIA.symbolDropHandler ==> "[WorkbenchSelectionElement] -> <WriteGraph,Proc> ()" <R L0.HasProperty : L0.FunctionalRelation

+  // Parameters are id of edited element and new text.
+  >-- DIA.DefinedElement.textEditor ==> "SVGMeasurementContext -> String -> String -> <Proc> ()" <R L0.HasProperty : DIA.DefinedElement.Parameter
+  // This function gives initial text for the text editor. Parameter is the id of the edited element.
+  >-- DIA.DefinedElement.textEditorFullText ==> "String -> <Proc> String" <R L0.HasProperty : DIA.DefinedElement.Parameter 

 
 DIA.DiagramActivityCondition <T L0.Entity
   --> DIA.DiagramActivityCondition.test ==> "Resource -> <ReadGraph> String" <R L0.HasProperty : L0.FunctionalRelation 
 
 DIA.DiagramActivityCondition <T L0.Entity
   --> DIA.DiagramActivityCondition.test ==> "Resource -> <ReadGraph> String" <R L0.HasProperty : L0.FunctionalRelation