Merge "Name clash in structural ontology"

[simantics/platform.git] / bundles / org.simantics.structural.ontology / graph / Structural.pgraph

diff --git a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
index eba1f52fe6e56deb0a1b0853e31642cd1e7f6c6d..5f7068162b6219acb8e9a1d46dde2b2c8eb34c9e 100644 (file)
--- a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
+++ b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
@@ -23,6 +23,7 @@ STR.ComponentType <T L0.Type
     >-- STR.ComponentType.HasDefaultPropertyRelationType <R L0.IsRelatedTo
     >-- STR.ComponentType.HasDefaultPropertyValueType <R L0.IsRelatedTo
     >-- STR.ComponentType.HasDefaultMonitorValueType --> STR.MonitorValueType <R L0.IsRelatedTo
+    @L0.assert L0X.HasGeneratedNamePrefix ""
 
 STR.MonitorValueType <T L0.Entity
 STR.MonitorValue <T L0.SCLValue : STR.MonitorValueType
@@ -35,6 +36,8 @@ STR.AbstractDefinedComponentType <T STR.ComponentType
 
 STR.DefinedComponentType <T STR.AbstractDefinedComponentType
 
+STR.ReplaceableDefinedComponentType <T STR.AbstractDefinedComponentType
+
 STR.ProceduralComponentType <T STR.AbstractDefinedComponentType
     >-- STR.ProceduralComponentType.code --> STR.ProceduralComponentTypeCode <R L0.HasProperty : L0.TotalFunction
     >-- STR.ProceduralComponentType.environment --> L0.SCLValue.Environment <R L0.IsRelatedTo : L0.FunctionalRelation
@@ -110,7 +113,9 @@ STR.ConnectionVariable <T STR.Variable <T STR.Connection
 STR.Functions.connectionValueAccessor : L0.ExternalValue
     L0.HasValueType "ValueAccessor"
 
-STR.ConnectionRelation <T L0.Relation
+STR.ConnectionRelationType <T L0.Type
+
+STR.ConnectionRelation <T L0.Relation : STR.ConnectionRelationType
     @L0.assert L0.SharedRange STR.ConnectionRelation
     >-- STR.ConnectionRelation.connectionRequired --> L0.Boolean <R L0.HasProperty : L0.FunctionalRelation
     >-- STR.ConnectionRelation.equivalentConnectionPoint --> STR.ConnectionRelation <R L0.IsRelatedTo
@@ -261,6 +266,10 @@ STR.Component
   @L0.assert L0.domainChildren 
     STR.Functions.structuralChildDomainChildren : L0.ExternalValue
       L0.HasValueType "VariableMap"
+  @L0.assert L0.typeResource
+    _ : L0.SCLValue
+      L0.SCLValue.expression "structuralTypeResource"
+      L0.HasValueType "Variable -> Resource -> <ReadGraph> Resource"
 
 STR.Run
   @L0.assert L0.domainChildren 
@@ -300,16 +309,16 @@ STR.Property <T L0.FunctionalRelation <T L0.PropertyRelation
             L0.HasValueType "String"
 
 STR.Component
-  L0.HasConstraint STR.ConnectionConstraint : L0.Constraint
+  L0.HasConstraint STR.ConnectionValidationConstraint : L0.Constraint
     L0.Constraint.Validator
       STR.Functions.connectionValidator : L0.Function
 
-STR.ConnectionConstraint.ErrorIssue
+STR.ConnectionValidationConstraint.ErrorIssue
   @ISSUE.issue ISSUE.Severity.Error
     STR.Functions.connectionIssueDescription : L0.Function
       L0.HasValueType "String" 
   
-STR.ConnectionConstraint.Source <T ISSUE.Sources.DependencyTracker
+STR.ConnectionValidationConstraint.Source <T ISSUE.Sources.DependencyTracker
   L0.HasLabel "Structural connection validity"
   @L0.assert ISSUE.Sources.DependencyTracker.HasType STR.Component
   @L0.assert ISSUE.Sources.DependencyTracker.HasSearchType STR.Connection
@@ -342,4 +351,10 @@ STR.ComponentTypeScript <T L0.Entity
 STR.ComponentType.Locked
     @L0.defTag
     L0.HasDomain STR.ComponentType
-    L0.HasDescription "Indicates that the component type is locked and cannot be opened for editing."
\ No newline at end of file
+    L0.HasDescription "Indicates that the component type is locked and cannot be opened for editing."
+    
+ 
+STR.TypeOverride <T L0.Entity
+    >-- STR.TypeOverride.HasOriginalType --> STR.ComponentType <R L0.IsRelatedTo : L0.TotalFunction
+    >-- STR.TypeOverride.HasReplacementType --> STR.ComponentType <R L0.IsRelatedTo : L0.TotalFunction 
+STR.HasTypeOverride --> STR.TypeOverride <R L0.IsRelatedTo    
\ No newline at end of file