Changed relations SYSDYN.Variable.expressions and SYSDYN.Variable.arrayIndexes to...

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@25684 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index eae36026d617dd02a71ebcd2c083fc3afd36ff32..793fd726cbb8be64d68de40d452af95c5bcf7411 100644 (file)
Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ

diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 04e94d0907ba960e35e85eeb763391a63f6b17d9..56e6f9166e5f91b71ae8e0111cf09fe120374c8c 100644 (file)
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -85,8 +85,8 @@ SYSDYN.DefaultRealization <T L0X.Realization
 
 SYSDYN.Variable <T STR.Component    
     >-- SYSDYN.Variable.type --> L0.String <R L0.HasProperty : L0.FunctionalRelation
-    >-- SYSDYN.Variable.expressions --> SYSDYN.Expressions <R L0.DependsOn : L0.FunctionalRelation
-    >-- SYSDYN.Variable.arrayIndexes --> SYSDYN.ArrayIndexes <R L0.DependsOn : L0.FunctionalRelation
+    >-- SYSDYN.Variable.expressions --> SYSDYN.Expressions <R L0.IsComposedOf : L0.FunctionalRelation
+    >-- SYSDYN.Variable.arrayIndexes --> SYSDYN.ArrayIndexes <R L0.IsComposedOf : L0.FunctionalRelation
     >-- SYSDYN.Variable.unit --> L0.String <R L0.HasProperty : L0.FunctionalRelation
     >-- SYSDYN.Variable.variability --> L0.String <R L0.HasProperty : L0.FunctionalRelation
     >-- SYSDYN.Variable.isTailOf --> STR.Connection <R STR.IsConnectedTo

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/Arcs.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/Arcs.java
index d22b298e6fb4432b589d457ab7cf16a0a11d83ca..f9768fed2e00faac41e31a64e19d3992ae3a052d 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/Arcs.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/Arcs.java
@@ -253,9 +253,7 @@ public class Arcs {
                if(!Arcs.areClockwiseOrdered(angle0, ang, angle1) == clockWise) {\r
                return Double.NaN;\r
            }\r
-               double radialDistance = Math.abs(Math.sqrt(dist2) - r);\r
-               System.out.println("radialDistance " + radialDistance);\r
-           return radialDistance;\r
+           return  Math.abs(Math.sqrt(dist2) - r);\r
        }\r
     \r
 }\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyEdgeClass.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyEdgeClass.java
index 7f39198a8087033996fb69180fd04fbbf91fb0e7..9e790aa4118e968a42831b0f0f53c7c145ff38e9 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyEdgeClass.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyEdgeClass.java
@@ -79,7 +79,6 @@ public class DependencyEdgeClass {
 \r
             DependencyNode node = e.getHint(SysdynEdgeSceneGraph.KEY_SG_NODE);\r
             if(node == null) {\r
-               System.out.println("pickTest no node!");\r
                return false;\r
             }\r
             return Arcs.hitTest(node.getBeginBounds(), node.getEndBounds(), node.getAngle(), pickRect.getCenterX(), pickRect.getCenterY(), 1.7);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowConnectionStyle.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowConnectionStyle.java
index a57511e31ccc45ce26fa56dfa1b53881c06e02bd..036a4556d8b85ba161e9b1e8e0a91b419f89c369 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowConnectionStyle.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowConnectionStyle.java
@@ -26,7 +26,6 @@ public class FlowConnectionStyle  extends BasicConnectionStyle {
 \r
     @Override\r
     public void drawLine(Graphics2D g, double x1, double y1, double x2, double y2, boolean isTransient) {\r
-        System.out.println("DrawLine");\r
     }\r
 \r
     @Override\r