From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 7 Sep 2012 07:58:15 +0000 (+0000)
Subject: Changed relations SYSDYN.Variable.expressions and SYSDYN.Variable.arrayIndexes to... 
X-Git-Tag: simantics-1.7~4^2~2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=c98c0fc8ee5b95baebd6a8773cbe6351b42c914d;p=simantics%2Fsysdyn.git

Changed relations SYSDYN.Variable.expressions and SYSDYN.Variable.arrayIndexes to subrelations of L0.IsComposedOf. Remover can now delete SYSDYN.Expressions and SYSDYN.ArrayIndexes along with the rest of the variable. (refs #3651)

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 eae36026..793fd726 100644
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 04e94d09..56e6f916 100644
--- 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 d22b298e..f9768fed 100644
--- 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) {
 	        return Double.NaN;
 	    }
-		double radialDistance = Math.abs(Math.sqrt(dist2) - r);
-		System.out.println("radialDistance " + radialDistance);
-	    return radialDistance;
+	    return  Math.abs(Math.sqrt(dist2) - 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 7f39198a..9e790aa4 100644
--- 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 {
 
             DependencyNode node = e.getHint(SysdynEdgeSceneGraph.KEY_SG_NODE);
             if(node == null) {
-            	System.out.println("pickTest no node!");
             	return false;
             }
             return Arcs.hitTest(node.getBeginBounds(), node.getEndBounds(), node.getAngle(), pickRect.getCenterX(), pickRect.getCenterY(), 1.7);
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 a57511e3..036a4556 100644
--- 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 {
 
     @Override
     public void drawLine(Graphics2D g, double x1, double y1, double x2, double y2, boolean isTransient) {
-        System.out.println("DrawLine");
     }
 
     @Override