From 0025d1ef8286ed532f0798c7a80dba8d552aa8df Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 9 Mar 2017 11:56:01 +0100
Subject: [PATCH] Update on sdinstance zoom
---
modeling/modelsForTestingTTool/modelszoom.xml | 325 +++++-------------
src/ui/TDiagramPanel.java | 32 +-
src/ui/TGComponent.java | 1 -
src/ui/TGConnectingPointWidthHeight.java | 22 +-
src/ui/sd/SDInstance.java | 29 +-
src/ui/sd/TGConnectingPointMessageSD.java | 11 +-
6 files changed, 121 insertions(+), 299 deletions(-)
diff --git a/modeling/modelsForTestingTTool/modelszoom.xml b/modeling/modelsForTestingTTool/modelszoom.xml
index 0434528d8a..f3569448e2 100644
--- a/modeling/modelsForTestingTTool/modelszoom.xml
+++ b/modeling/modelsForTestingTTool/modelszoom.xml
@@ -183,7 +183,7 @@
<UseCaseDiagramPanel name="Use Case Diagram 0" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0000000000000009" >
<COMPONENT type="703" id="129" >
<cdparam x="168" y="367" />
-<sizeparam width="77" height="50" minWidth="40" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="74" height="50" minWidth="40" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2501" minY="10" maxY="1501" />
<infoparam name="actor" value="Actor2" />
@@ -222,8 +222,8 @@
</COMPONENT>
<COMPONENT type="701" id="154" >
-<cdparam x="389" y="323" />
-<sizeparam width="87" height="40" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="392" y="323" />
+<sizeparam width="80" height="40" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2501" minY="10" maxY="1501" />
<infoparam name="Use case" value="My use case" />
@@ -317,7 +317,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<P1 x="182" y="244" id="170" />
-<P2 x="389" y="343" id="131" />
+<P2 x="392" y="343" id="131" />
<Point x="203" y="303" />
<Point x="238" y="282" />
<Point x="236" y="346" />
@@ -350,295 +350,138 @@
</UseCaseDiagramPanel>
-<SequenceDiagramPanel name="ScenarioFromUCD0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="606" id="241" >
-<cdparam x="400" y="100" />
-<sizeparam width="10" height="424" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="My system" value="My system" />
-<TGConnectingPoint num="0" id="201" />
-<TGConnectingPoint num="1" id="202" />
-<TGConnectingPoint num="2" id="203" />
-<TGConnectingPoint num="3" id="204" />
-<TGConnectingPoint num="4" id="205" />
-<TGConnectingPoint num="5" id="206" />
-<TGConnectingPoint num="6" id="207" />
-<TGConnectingPoint num="7" id="208" />
-<TGConnectingPoint num="8" id="209" />
-<TGConnectingPoint num="9" id="210" />
-<TGConnectingPoint num="10" id="211" />
-<TGConnectingPoint num="11" id="212" />
-<TGConnectingPoint num="12" id="213" />
-<TGConnectingPoint num="13" id="214" />
-<TGConnectingPoint num="14" id="215" />
-<TGConnectingPoint num="15" id="216" />
-<TGConnectingPoint num="16" id="217" />
-<TGConnectingPoint num="17" id="218" />
-<TGConnectingPoint num="18" id="219" />
-<TGConnectingPoint num="19" id="220" />
-<TGConnectingPoint num="20" id="221" />
-<TGConnectingPoint num="21" id="222" />
-<TGConnectingPoint num="22" id="223" />
-<TGConnectingPoint num="23" id="224" />
-<TGConnectingPoint num="24" id="225" />
-<TGConnectingPoint num="25" id="226" />
-<TGConnectingPoint num="26" id="227" />
-<TGConnectingPoint num="27" id="228" />
-<TGConnectingPoint num="28" id="229" />
-<TGConnectingPoint num="29" id="230" />
-<TGConnectingPoint num="30" id="231" />
-<TGConnectingPoint num="31" id="232" />
-<TGConnectingPoint num="32" id="233" />
-<TGConnectingPoint num="33" id="234" />
-<TGConnectingPoint num="34" id="235" />
-<TGConnectingPoint num="35" id="236" />
-<TGConnectingPoint num="36" id="237" />
-<TGConnectingPoint num="37" id="238" />
-<TGConnectingPoint num="38" id="239" />
-<TGConnectingPoint num="39" id="240" />
-<extraparam>
-<Actor data="false" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="606" id="282" >
-<cdparam x="250" y="100" />
-<sizeparam width="10" height="424" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Actor2" value="Actor2" />
-<TGConnectingPoint num="0" id="242" />
-<TGConnectingPoint num="1" id="243" />
-<TGConnectingPoint num="2" id="244" />
-<TGConnectingPoint num="3" id="245" />
-<TGConnectingPoint num="4" id="246" />
-<TGConnectingPoint num="5" id="247" />
-<TGConnectingPoint num="6" id="248" />
-<TGConnectingPoint num="7" id="249" />
-<TGConnectingPoint num="8" id="250" />
-<TGConnectingPoint num="9" id="251" />
-<TGConnectingPoint num="10" id="252" />
-<TGConnectingPoint num="11" id="253" />
-<TGConnectingPoint num="12" id="254" />
-<TGConnectingPoint num="13" id="255" />
-<TGConnectingPoint num="14" id="256" />
-<TGConnectingPoint num="15" id="257" />
-<TGConnectingPoint num="16" id="258" />
-<TGConnectingPoint num="17" id="259" />
-<TGConnectingPoint num="18" id="260" />
-<TGConnectingPoint num="19" id="261" />
-<TGConnectingPoint num="20" id="262" />
-<TGConnectingPoint num="21" id="263" />
-<TGConnectingPoint num="22" id="264" />
-<TGConnectingPoint num="23" id="265" />
-<TGConnectingPoint num="24" id="266" />
-<TGConnectingPoint num="25" id="267" />
-<TGConnectingPoint num="26" id="268" />
-<TGConnectingPoint num="27" id="269" />
-<TGConnectingPoint num="28" id="270" />
-<TGConnectingPoint num="29" id="271" />
-<TGConnectingPoint num="30" id="272" />
-<TGConnectingPoint num="31" id="273" />
-<TGConnectingPoint num="32" id="274" />
-<TGConnectingPoint num="33" id="275" />
-<TGConnectingPoint num="34" id="276" />
-<TGConnectingPoint num="35" id="277" />
-<TGConnectingPoint num="36" id="278" />
-<TGConnectingPoint num="37" id="279" />
-<TGConnectingPoint num="38" id="280" />
-<TGConnectingPoint num="39" id="281" />
-<extraparam>
-<Actor data="true" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="606" id="323" >
-<cdparam x="100" y="100" />
-<sizeparam width="10" height="424" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Actor1" value="Actor1" />
-<TGConnectingPoint num="0" id="283" />
-<TGConnectingPoint num="1" id="284" />
-<TGConnectingPoint num="2" id="285" />
-<TGConnectingPoint num="3" id="286" />
-<TGConnectingPoint num="4" id="287" />
-<TGConnectingPoint num="5" id="288" />
-<TGConnectingPoint num="6" id="289" />
-<TGConnectingPoint num="7" id="290" />
-<TGConnectingPoint num="8" id="291" />
-<TGConnectingPoint num="9" id="292" />
-<TGConnectingPoint num="10" id="293" />
-<TGConnectingPoint num="11" id="294" />
-<TGConnectingPoint num="12" id="295" />
-<TGConnectingPoint num="13" id="296" />
-<TGConnectingPoint num="14" id="297" />
-<TGConnectingPoint num="15" id="298" />
-<TGConnectingPoint num="16" id="299" />
-<TGConnectingPoint num="17" id="300" />
-<TGConnectingPoint num="18" id="301" />
-<TGConnectingPoint num="19" id="302" />
-<TGConnectingPoint num="20" id="303" />
-<TGConnectingPoint num="21" id="304" />
-<TGConnectingPoint num="22" id="305" />
-<TGConnectingPoint num="23" id="306" />
-<TGConnectingPoint num="24" id="307" />
-<TGConnectingPoint num="25" id="308" />
-<TGConnectingPoint num="26" id="309" />
-<TGConnectingPoint num="27" id="310" />
-<TGConnectingPoint num="28" id="311" />
-<TGConnectingPoint num="29" id="312" />
-<TGConnectingPoint num="30" id="313" />
-<TGConnectingPoint num="31" id="314" />
-<TGConnectingPoint num="32" id="315" />
-<TGConnectingPoint num="33" id="316" />
-<TGConnectingPoint num="34" id="317" />
-<TGConnectingPoint num="35" id="318" />
-<TGConnectingPoint num="36" id="319" />
-<TGConnectingPoint num="37" id="320" />
-<TGConnectingPoint num="38" id="321" />
-<TGConnectingPoint num="39" id="322" />
-<extraparam>
-<Actor data="true" />
-</extraparam>
-</COMPONENT>
-
-
-</SequenceDiagramPanel>
-
<AvatarADPanel name="Activity Diagram 0" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="5511" id="387" >
+<COMPONENT type="5511" id="324" >
<cdparam x="409" y="76" />
-<sizeparam width="21" height="302" minWidth="9" minHeight="249" maxWidth="1005" maxHeight="2475" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="21" height="302" minWidth="9" minHeight="249" maxWidth="30" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="19" maxX="4883" minY="19" maxY="2930" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
</COMPONENT>
-<COMPONENT type="5501" id="385" >
+<COMPONENT type="5501" id="326" >
<cdparam x="49" y="152" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="19" maxX="4883" minY="19" maxY="2930" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="386" />
+<TGConnectingPoint num="0" id="325" />
</COMPONENT>
-<COMPONENT type="5509" id="382" >
-<cdparam x="137" y="155" />
-<sizeparam width="47" height="20" minWidth="29" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5509" id="329" >
+<cdparam x="139" y="155" />
+<sizeparam width="43" height="20" minWidth="29" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="19" maxX="4883" minY="19" maxY="2930" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Send signal" value="signal" />
-<TGConnectingPoint num="0" id="383" />
-<TGConnectingPoint num="1" id="384" />
+<TGConnectingPoint num="0" id="327" />
+<TGConnectingPoint num="1" id="328" />
</COMPONENT>
-<COMPONENT type="5506" id="379" >
-<cdparam x="81" y="57" />
-<sizeparam width="49" height="20" minWidth="29" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5506" id="332" >
+<cdparam x="83" y="57" />
+<sizeparam width="44" height="20" minWidth="29" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="19" maxX="4883" minY="19" maxY="2930" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="action state" value="action" />
-<TGConnectingPoint num="0" id="380" />
-<TGConnectingPoint num="1" id="381" />
+<TGConnectingPoint num="0" id="330" />
+<TGConnectingPoint num="1" id="331" />
</COMPONENT>
-<COMPONENT type="5503" id="371" >
+<COMPONENT type="5503" id="340" >
<cdparam x="180" y="56" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="19" maxX="4883" minY="19" maxY="2930" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="372" />
-<TGConnectingPoint num="1" id="373" />
-<TGConnectingPoint num="2" id="374" />
-<TGConnectingPoint num="3" id="375" />
+<TGConnectingPoint num="0" id="336" />
+<TGConnectingPoint num="1" id="337" />
+<TGConnectingPoint num="2" id="338" />
+<TGConnectingPoint num="3" id="339" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="376" >
-<father id="371" num="0" />
+<SUBCOMPONENT type="-1" id="333" >
+<father id="340" num="0" />
<cdparam x="160" y="80" />
-<sizeparam width="14" height="15" minWidth="5" minHeight="0" maxWidth="1024" maxHeight="1024" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="12" height="15" minWidth="5" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="24" maxY="49" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="377" >
-<father id="371" num="1" />
+<SUBCOMPONENT type="-1" id="334" >
+<father id="340" num="1" />
<cdparam x="243" y="80" />
-<sizeparam width="14" height="15" minWidth="5" minHeight="0" maxWidth="1024" maxHeight="1024" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="12" height="15" minWidth="5" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="63" maxX="83" minY="24" maxY="49" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="378" >
-<father id="371" num="2" />
+<SUBCOMPONENT type="-1" id="335" >
+<father id="340" num="2" />
<cdparam x="214" y="129" />
-<sizeparam width="14" height="15" minWidth="5" minHeight="0" maxWidth="1024" maxHeight="1024" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="12" height="15" minWidth="5" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="34" maxX="54" minY="73" maxY="98" />
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="5504" id="348" >
+<COMPONENT type="5504" id="363" >
<cdparam x="273" y="106" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="19" maxX="4883" minY="19" maxY="2930" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="junction" value="" />
-<TGConnectingPoint num="0" id="349" />
-<TGConnectingPoint num="1" id="350" />
-<TGConnectingPoint num="2" id="351" />
-<TGConnectingPoint num="3" id="352" />
-<TGConnectingPoint num="4" id="353" />
-<TGConnectingPoint num="5" id="354" />
-<TGConnectingPoint num="6" id="355" />
-<TGConnectingPoint num="7" id="356" />
-<TGConnectingPoint num="8" id="357" />
-<TGConnectingPoint num="9" id="358" />
-<TGConnectingPoint num="10" id="359" />
-<TGConnectingPoint num="11" id="360" />
-<TGConnectingPoint num="12" id="361" />
-<TGConnectingPoint num="13" id="362" />
-<TGConnectingPoint num="14" id="363" />
-<TGConnectingPoint num="15" id="364" />
-<TGConnectingPoint num="16" id="365" />
-<TGConnectingPoint num="17" id="366" />
-<TGConnectingPoint num="18" id="367" />
-<TGConnectingPoint num="19" id="368" />
-<TGConnectingPoint num="20" id="369" />
-<TGConnectingPoint num="21" id="370" />
+<TGConnectingPoint num="0" id="341" />
+<TGConnectingPoint num="1" id="342" />
+<TGConnectingPoint num="2" id="343" />
+<TGConnectingPoint num="3" id="344" />
+<TGConnectingPoint num="4" id="345" />
+<TGConnectingPoint num="5" id="346" />
+<TGConnectingPoint num="6" id="347" />
+<TGConnectingPoint num="7" id="348" />
+<TGConnectingPoint num="8" id="349" />
+<TGConnectingPoint num="9" id="350" />
+<TGConnectingPoint num="10" id="351" />
+<TGConnectingPoint num="11" id="352" />
+<TGConnectingPoint num="12" id="353" />
+<TGConnectingPoint num="13" id="354" />
+<TGConnectingPoint num="14" id="355" />
+<TGConnectingPoint num="15" id="356" />
+<TGConnectingPoint num="16" id="357" />
+<TGConnectingPoint num="17" id="358" />
+<TGConnectingPoint num="18" id="359" />
+<TGConnectingPoint num="19" id="360" />
+<TGConnectingPoint num="20" id="361" />
+<TGConnectingPoint num="21" id="362" />
</COMPONENT>
-<COMPONENT type="5504" id="325" >
+<COMPONENT type="5504" id="386" >
<cdparam x="355" y="67" />
<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="junction" value="" />
-<TGConnectingPoint num="0" id="326" />
-<TGConnectingPoint num="1" id="327" />
-<TGConnectingPoint num="2" id="328" />
-<TGConnectingPoint num="3" id="329" />
-<TGConnectingPoint num="4" id="330" />
-<TGConnectingPoint num="5" id="331" />
-<TGConnectingPoint num="6" id="332" />
-<TGConnectingPoint num="7" id="333" />
-<TGConnectingPoint num="8" id="334" />
-<TGConnectingPoint num="9" id="335" />
-<TGConnectingPoint num="10" id="336" />
-<TGConnectingPoint num="11" id="337" />
-<TGConnectingPoint num="12" id="338" />
-<TGConnectingPoint num="13" id="339" />
-<TGConnectingPoint num="14" id="340" />
-<TGConnectingPoint num="15" id="341" />
-<TGConnectingPoint num="16" id="342" />
-<TGConnectingPoint num="17" id="343" />
-<TGConnectingPoint num="18" id="344" />
-<TGConnectingPoint num="19" id="345" />
-<TGConnectingPoint num="20" id="346" />
-<TGConnectingPoint num="21" id="347" />
+<TGConnectingPoint num="0" id="364" />
+<TGConnectingPoint num="1" id="365" />
+<TGConnectingPoint num="2" id="366" />
+<TGConnectingPoint num="3" id="367" />
+<TGConnectingPoint num="4" id="368" />
+<TGConnectingPoint num="5" id="369" />
+<TGConnectingPoint num="6" id="370" />
+<TGConnectingPoint num="7" id="371" />
+<TGConnectingPoint num="8" id="372" />
+<TGConnectingPoint num="9" id="373" />
+<TGConnectingPoint num="10" id="374" />
+<TGConnectingPoint num="11" id="375" />
+<TGConnectingPoint num="12" id="376" />
+<TGConnectingPoint num="13" id="377" />
+<TGConnectingPoint num="14" id="378" />
+<TGConnectingPoint num="15" id="379" />
+<TGConnectingPoint num="16" id="380" />
+<TGConnectingPoint num="17" id="381" />
+<TGConnectingPoint num="18" id="382" />
+<TGConnectingPoint num="19" id="383" />
+<TGConnectingPoint num="20" id="384" />
+<TGConnectingPoint num="21" id="385" />
</COMPONENT>
diff --git a/src/ui/TDiagramPanel.java b/src/ui/TDiagramPanel.java
index b699cfb15c..601835b03f 100755
--- a/src/ui/TDiagramPanel.java
+++ b/src/ui/TDiagramPanel.java
@@ -451,6 +451,8 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
continue;
tgc.draw (g);
+
+ // CONNECTING POINTS
if (this.mgui.getTypeButtonSelected () != TGComponentManager.EDIT)
tgc.drawTGConnectingPoint (g, this.mgui.getIdButtonSelected());
@@ -858,35 +860,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
return b;
}
- /*public boolean highlightOutAndFreeConnectingPoint(int x, int y) {
- TGComponent tgc;
- TGConnectingPoint cp;
- int state;
- boolean b = false;
- boolean pointedElementFound = false;
- selectedConnectingPoint = null;
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (pointedElementFound == true) {
- b = tgc.setStateTGConnectingPoint(TGConnectingPoint.NORMAL) || b;
- }
- if (pointedElementFound == false) {
- cp = tgc.getFreeTGConnectingPointAtAndCompatible(x, y, type);
- if ((cp != null) && (cp.isOut()) && (cp.isFree())) {
- selectedConnectingPoint = cp;
- pointedElementFound = true;
- b = cp.setState(TGConnectingPoint.SELECTED) || b;
- } else {
- b = tgc.setStateTGConnectingPoint(TGConnectingPoint.NORMAL) || b;
- }
- }
- }
- return b;
- }*/
-
- public boolean highlightInAndFreeConnectingPoint(int x, int y, int type) {
+ public boolean highlightInAndFreeConnectingPoint(int x, int y, int type) {
TGConnectingPoint cp;
// int state;
boolean b = false;
diff --git a/src/ui/TGComponent.java b/src/ui/TGComponent.java
index d0dcb36848..6cf2ac1f72 100755
--- a/src/ui/TGComponent.java
+++ b/src/ui/TGComponent.java
@@ -2032,7 +2032,6 @@ public abstract class TGComponent implements CDElement, GenericTree {
}
-
public TGConnectingPoint getFreeTGConnectingPoint(int x, int y) {
for (int i=0; i<nbConnectingPoint; i++) {
if (connectingPoint[i].isCloseTo(x, y)) {
diff --git a/src/ui/TGConnectingPointWidthHeight.java b/src/ui/TGConnectingPointWidthHeight.java
index ba92459952..f2133a34d9 100755
--- a/src/ui/TGConnectingPointWidthHeight.java
+++ b/src/ui/TGConnectingPointWidthHeight.java
@@ -51,26 +51,26 @@ package ui;
public class TGConnectingPointWidthHeight extends TGConnectingPoint{
protected double w;
protected double h;
-
+
public TGConnectingPointWidthHeight(CDElement _container, int _x, int _y, boolean _in, boolean _out, double _w, double _h) {
super(_container, _x, _y, _in, _out);
w = _w;
h = _h;
}
-
+
public int getX() {
return x + container.getX() + (int)(container.getWidth() * w);
}
-
+
public int getY() {
return y + container.getY() + (int)(container.getHeight() * h);
}
-
- public void setW(double _w) {
- w = _w;
- }
-
- public void setH(double _h) {
- h = _h;
- }
+
+ public void setW(double _w) {
+ w = _w;
+ }
+
+ public void setH(double _h) {
+ h = _h;
+ }
} // Class
diff --git a/src/ui/sd/SDInstance.java b/src/ui/sd/SDInstance.java
index 4d845d9d74..b2cfb88a20 100755
--- a/src/ui/sd/SDInstance.java
+++ b/src/ui/sd/SDInstance.java
@@ -179,12 +179,12 @@ public class SDInstance extends TGCScalableWithInternalComponent implements Swal
// update TG Connecting Points
int yh = spacePt();
- for(int i=0; i<nbConnectingPoint; i++, yh+=spacePt()) {
+ /*for(int i=0; i<nbConnectingPoint; i++, yh+=spacePt()) {
connectingPoint[i].setCdX(width/2);
connectingPoint[i].setCdY(yh);
- }
+ }*/
- height = Math.max(getMinHeightSize(), height);
+ //height = Math.max(getMinHeightSize(), height);
hasBeenResized();
}
@@ -193,23 +193,26 @@ public class SDInstance extends TGCScalableWithInternalComponent implements Swal
}
public int getNbOfConnectingPoints() {
- return (int)(((height - (2 * spacePt())) / spacePt()));
+ return 100;
+ //return (int)(((height - (2 * spacePt())) / spacePt()));
}
private void makeTGConnectingPoints() {
- TraceManager.addDev("Making TG connecting points of " + name);
+ //TraceManager.addDev("Making TG connecting points of " + name);
nbConnectingPoint = getNbOfConnectingPoints();
connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- int yh = spacePt();
+ //int yh = spacePt();
+ double div = 1.0/height - (nbConnectingPoint);
+ //TraceManager.addDev("Div=" + div);
- for(int i=0; i<nbConnectingPoint; i ++, yh+=spacePt()) {
- connectingPoint[i] = new TGConnectingPointMessageSD(this, (width/2), yh, true, true);
+ for(int i=0; i<nbConnectingPoint; i ++) {
+ double ratio = ((i)/(double)(nbConnectingPoint));//+(spacePt*tdp.getZoom()/height);
+ //TraceManager.addDev("Ratio=" + ratio);
+ connectingPoint[i] = new TGConnectingPointMessageSD(this, 0, 0, true, true, 0.5, ratio);
}
-
-
}
public boolean editOndoubleClick(JFrame frame) {
@@ -458,7 +461,7 @@ public class SDInstance extends TGCScalableWithInternalComponent implements Swal
public void hasBeenResized(){
- TraceManager.addDev("Has been resized: " + name + " height=" + height);
+ /*TraceManager.addDev("Has been resized: " + name + " height=" + height);
int i;
for (int k=0; k<nbConnectingPoint; k++) {
@@ -483,12 +486,12 @@ public class SDInstance extends TGCScalableWithInternalComponent implements Swal
if (!connectingPointTmp[j].isFree()) {
TraceManager.addDev("Non free TG point");
}
- }
+ }*/
// Increase tdp if necessary?
// Reposition each swallowed component
- for(i=0; i<nbInternalTGComponent ; i++) {
+ for(int i=0; i<nbInternalTGComponent ; i++) {
setCDRectangleOfSwallowed(tgcomponent[i]);
}
}
diff --git a/src/ui/sd/TGConnectingPointMessageSD.java b/src/ui/sd/TGConnectingPointMessageSD.java
index ded4646b9c..69a78bfd16 100755
--- a/src/ui/sd/TGConnectingPointMessageSD.java
+++ b/src/ui/sd/TGConnectingPointMessageSD.java
@@ -50,15 +50,18 @@ package ui.sd;
import ui.*;
-public class TGConnectingPointMessageSD extends TGConnectingPoint {
+import myutil.*;
- public TGConnectingPointMessageSD(CDElement _container, int _x, int _y, boolean _in, boolean _out) {
- super(_container, _x, _y, _in, _out);
+public class TGConnectingPointMessageSD extends TGConnectingPointWidthHeight {
+
+ public TGConnectingPointMessageSD(CDElement _container, int _x, int _y, boolean _in, boolean _out, double _w, double _h) {
+ super(_container, _x, _y, _in, _out, _w, _h);
}
public boolean isCompatibleWith(int type) {
- //System.out.println("is compatible with " + type);
+ //TraceManager.addDev("is compatible with " + type);
if ((type == TGComponentManager.CONNECTOR_MESSAGE_ASYNC_SD) || (type == TGComponentManager.CONNECTOR_MESSAGE_SYNC_SD)) {
+ //TraceManager.addDev("is compatible with " + type + " x= " + getX() + " y=" + getY()) ;
//System.out.println("is compatible with:true");
return true;
}
--
GitLab