From c98c0fc8ee5b95baebd6a8773cbe6351b42c914d Mon Sep 17 00:00:00 2001
From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 7 Sep 2012 07:58:15 +0000
Subject: [PATCH] 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
---
 org.simantics.sysdyn.ontology/graph.tg        | Bin 66685 -> 66685 bytes
 .../graph/Sysdyn.pgraph                       |   4 ++--
 .../sysdyn/ui/elements/connections/Arcs.java  |   4 +---
 .../connections/DependencyEdgeClass.java      |   1 -
 .../connections/FlowConnectionStyle.java      |   1 -
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index eae36026d617dd02a71ebcd2c083fc3afd36ff32..793fd726cbb8be64d68de40d452af95c5bcf7411 100644
GIT binary patch
delta 1440
zcmZ9MU1(HC6vyY>yKAUM;)MF3CVQhbBsFcWRVa!z3nJ1MYS1T3p-XCSK?rWqBDDqg
zO|+n^97~f(>4TtYsaeg0z7$-IZIN1<=6mzGo3G7R+m*hR8n^%1?A^V1VeZWTH)qbA
znRD)4x!_y5;JcGHDXZqqF2fMr{PmiPL|ju+MZN0Hl7x>EYHMlL8tPXE%HJ=kUoeFb
zD<yB8JmZ`??Fd0agQx3HoIdJ&+}w2BY5JfU*jxf8!M|^stMqG&wd;>MA3DdIn@%--
zaw2>ZlLxhhpa0nWD*4s3&7Tp?^4W?2O>;}d4odUGitRMR3l%TXoGPu{PBf)n3mh^i
zsXnbr5e@RY+g_nXb$(m9N%J>at4;E8TkRISf2ci7lgj_{7k(PxEA>@0%6ID<Xq=za
zTQtTS>{^=Oy>@_x_?TTy!+g%(Nh2JyU#C7!+uu=2UENu^j(Rz^FDnx`&EGh|S3>w+
z#5lq6H>@MQ7%h9K)=M7!2zs%o4ee#2sKsIE`Jy%-v9*5&p_mOjcIAu*Jd@gae^KY=
z`-<A^RpEv}je+})Iu@B6b8IqH(pj!SVjo|!3Eh8}b6wq)T=(A99u4c*Bz-{o$m1=+
z!E22~DtfKML`A4zOANN0X^r3=Zi}EiGHn(N%C2{;(<KwXxjW*AgST-*)#yLhiAB2y
zU5EbAbNb+_7A%A@gz@uQ+xv<EiSE4q68<)>uFcK=3L7+?hlmF5h8mDAy3#Bjj0w#s
zYH<V_(oLyo$!m85ZLjC^>qTo`yBjX8>cW0Yf}h+9NS*IzXs+2JTkRI^EZA;Ko%<Cm
z%ioE)z>)TV&e%7rUA#Ribv^v+v6)w)Z_7-X2F`eJnj_x_<s2x=vfyxzdq8JF|MJjT
zwr&UI4CtR8I>TYmX;6JrZb;J{znzp*pg2f@PI0WmmMKsip+Hld0ZoD;=mJf$9kb;m
zC}J+qNe;)taspJx;a<)JXJR2a4x)E-={Se(gya~A_U+O!?g1SI(Oz6S%E7x?IRY~1
zp(EVbX;XqDoguuFol!ZA*<U>I40A*UB??dc?4d*4qb#XC{p9gB$XV4W^|$!YV>`g1
zE=%e!@`1;;pQBxkQh%5CJ+^%+(`Bv2U#To^kx$w2ANAjMxx4=b{PyC%ZQWR!D^;w*
UB17$&eq6?>sdtp`pR?uv1JP}KXaE2J

delta 1450
zcmZ9MYiLwQ6vyY>yK69sO-JhoZL&8$LZZRFmO`PlW>G}ien_aF3dJr_uOI|hRHU`g
z{c44FBS$fb6bpqmEj6o|&@Y8<8y|>D(<J8o*gQ8ev0dA5eZ=j5HhXt3Ubr*o|C@7X
z=FB;BSI+xZ&iihpOzKt(W|v`*pTAi1DG9DFs-z|LR?)DJhSZkQ$~Dxd_O1V*D7at>
zAy$gsK5^DLb=rZQ(cr&z$4?)0PBt|jaT*Ud0h^CC&hW3B<|};KEM9leIqDo~YCP3=
z=6K|U5VRkdeEi$yUF1{GHlHJ!<&Vk(G|esLJ87P8m2amRUM$~6bE>prJJFPSC2+u?
zN%djn6mcx*=R;d-_{&Xxbz$oZCZ)b=tuo2vwwjmG{!mj-6Ux8if}i@iIao;}d^1=_
zWBfE|(I~%Y*U&h>ZU<<9-?OV|kUz0^(=f;F*Ql3M_IH$27k5{b&=SYr$jBi?^arB2
zB82ZH*h8Fn)7rZPYuQ7!e(cfrpcf0;7=~UbXi?Aho>?rqp>F3sQ#(H@3}&7C3tH4;
zysx0M<Glqf>Q$sJP;KDMV~#}z#~qtUC7tDJB=^B*5Z&tE&$C@^bGCc`VvmNkY?2O;
zjumD@fT2qbBvkBDhl#3Cp_Vv&Io%pX8)=K8MAB^*9LlbCl<2ZaeEn+FhY8-n300y0
zSSJ_nPtdjK4?L&$uWG?U7=y5%*V<p#P42|WpVOBy-^SH%v*Y*SgIDJvs)4(p24rBc
zG=m2=OwvtGi+5pzy9<bxoOTz0%#OSMtvT&3s1vQ{%>{_W^V4qvQs?^_Ue|4rt#%7%
z7HYSp&i#t#lLd~p2Xw}+t#*m_m`uUvZ;ww(g}*H`<veiOgXcN=eMruMqAc@!nByMM
zS<v4-be65_Avpv3#6xE|0y+(<Ps)vAniJQPatajj<>?g1J8YQ*MR<9d<TU6cC<4pV
zNw(v*oB%~Ac{;(7ctnna>fO1AGtTLFSdM|{eYkXt!#Bcm6hyD+(oyaK9RbmEyL5y@
zH!~6!OAL7EFgJACG{n))Fxq5iOrpfZUC(|7IjTZZe{;t}2e?OBQs2Vcp4lF8Mm0!%
z7jJod`#IcYNqr-K@%Z*}tgAuld-=1+w^yaRtYZ9?$`Tft%1->K|G3ND{cG{-OFZ1N
f(J-3%+T33L=g;C2U9{N;*Z0ZvgED3Qb#DFtE>47C

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
-- 
2.47.1