From 8dff6d3ff05be9c34873832d951d8fa4a273fa97 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Tue, 22 Oct 2019 15:02:04 +0200
Subject: [PATCH] Adding worstcasereading/writing per TMLTask
---
modeling/AVATAR/PressureController.xml | 1862 ++++++++---------
modeling/DIPLODOCUS/simpleSDF.xml | 738 +++----
src/main/java/tmltranslator/TMLTask.java | 4 +-
.../tmltranslator/DiplodocusGeneralTest.java | 67 +-
.../tmltranslator/general/spec_sdf_simple.tml | 54 +
.../tmltranslator/general/ssdf.tarchi | 83 -
.../resources/tmltranslator/general/ssdf.tmap | 30 -
.../resources/tmltranslator/general/ssdf.tml | 166 --
8 files changed, 1425 insertions(+), 1579 deletions(-)
create mode 100644 ttool/src/test/resources/tmltranslator/general/spec_sdf_simple.tml
delete mode 100644 ttool/src/test/resources/tmltranslator/general/ssdf.tarchi
delete mode 100644 ttool/src/test/resources/tmltranslator/general/ssdf.tmap
delete mode 100644 ttool/src/test/resources/tmltranslator/general/ssdf.tml
diff --git a/modeling/AVATAR/PressureController.xml b/modeling/AVATAR/PressureController.xml
index d986037f5a..3d790f74da 100644
--- a/modeling/AVATAR/PressureController.xml
+++ b/modeling/AVATAR/PressureController.xml
@@ -3002,7 +3002,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="1644" >
<father id="1703" num="0" />
-<cdparam x="595" y="109" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3011,7 +3011,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1646" >
<father id="1703" num="1" />
-<cdparam x="595" y="115" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3020,7 +3020,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1648" >
<father id="1703" num="2" />
-<cdparam x="595" y="132" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3029,7 +3029,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1650" >
<father id="1703" num="3" />
-<cdparam x="595" y="149" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3038,7 +3038,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1652" >
<father id="1703" num="4" />
-<cdparam x="595" y="165" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3047,7 +3047,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1654" >
<father id="1703" num="5" />
-<cdparam x="595" y="182" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3056,7 +3056,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1656" >
<father id="1703" num="6" />
-<cdparam x="595" y="199" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3065,7 +3065,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1658" >
<father id="1703" num="7" />
-<cdparam x="595" y="215" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3074,7 +3074,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1660" >
<father id="1703" num="8" />
-<cdparam x="595" y="232" />
+<cdparam x="595" y="449" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3083,7 +3083,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1662" >
<father id="1703" num="9" />
-<cdparam x="595" y="249" />
+<cdparam x="595" y="432" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3092,7 +3092,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1664" >
<father id="1703" num="10" />
-<cdparam x="595" y="265" />
+<cdparam x="595" y="415" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3101,7 +3101,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1666" >
<father id="1703" num="11" />
-<cdparam x="595" y="282" />
+<cdparam x="595" y="399" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3110,7 +3110,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1668" >
<father id="1703" num="12" />
-<cdparam x="595" y="299" />
+<cdparam x="595" y="382" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3119,7 +3119,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1670" >
<father id="1703" num="13" />
-<cdparam x="595" y="315" />
+<cdparam x="595" y="365" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3128,7 +3128,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1672" >
<father id="1703" num="14" />
-<cdparam x="595" y="332" />
+<cdparam x="595" y="349" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3137,7 +3137,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1674" >
<father id="1703" num="15" />
-<cdparam x="595" y="349" />
+<cdparam x="595" y="332" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3146,7 +3146,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1676" >
<father id="1703" num="16" />
-<cdparam x="595" y="365" />
+<cdparam x="595" y="315" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3155,7 +3155,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1678" >
<father id="1703" num="17" />
-<cdparam x="595" y="382" />
+<cdparam x="595" y="299" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3164,7 +3164,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1680" >
<father id="1703" num="18" />
-<cdparam x="595" y="399" />
+<cdparam x="595" y="282" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3173,7 +3173,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1682" >
<father id="1703" num="19" />
-<cdparam x="595" y="415" />
+<cdparam x="595" y="265" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3182,7 +3182,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1684" >
<father id="1703" num="20" />
-<cdparam x="595" y="432" />
+<cdparam x="595" y="249" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3191,7 +3191,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1686" >
<father id="1703" num="21" />
-<cdparam x="595" y="449" />
+<cdparam x="595" y="232" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3200,7 +3200,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1688" >
<father id="1703" num="22" />
-<cdparam x="595" y="465" />
+<cdparam x="595" y="215" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3209,7 +3209,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1690" >
<father id="1703" num="23" />
-<cdparam x="595" y="482" />
+<cdparam x="595" y="199" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3218,7 +3218,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1692" >
<father id="1703" num="24" />
-<cdparam x="595" y="499" />
+<cdparam x="595" y="182" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3227,7 +3227,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1694" >
<father id="1703" num="25" />
-<cdparam x="595" y="515" />
+<cdparam x="595" y="165" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3236,7 +3236,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1696" >
<father id="1703" num="26" />
-<cdparam x="595" y="532" />
+<cdparam x="595" y="149" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3245,7 +3245,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1698" >
<father id="1703" num="27" />
-<cdparam x="595" y="549" />
+<cdparam x="595" y="132" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3254,7 +3254,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1700" >
<father id="1703" num="28" />
-<cdparam x="595" y="565" />
+<cdparam x="595" y="115" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3263,7 +3263,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1702" >
<father id="1703" num="29" />
-<cdparam x="595" y="574" />
+<cdparam x="595" y="109" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3281,13 +3281,13 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="625" id="1712" >
+<SUBCOMPONENT type="627" id="1712" >
<father id="1782" num="0" />
-<cdparam x="365" y="299" />
+<cdparam x="365" y="394" />
<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="365" />
-<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
+<infoparam name="timer expiration" value="{timer=timerAlarm}" />
<TGConnectingPoint num="0" id="1704" />
<TGConnectingPoint num="1" id="1705" />
<TGConnectingPoint num="2" id="1706" />
@@ -3297,12 +3297,12 @@
<TGConnectingPoint num="6" id="1710" />
<TGConnectingPoint num="7" id="1711" />
<extraparam>
-<Interval timer="timerAlarm" duration="60" />
+<Interval timer="timerAlarm" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1714" >
<father id="1782" num="1" />
-<cdparam x="352" y="115" />
+<cdparam x="352" y="109" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3311,7 +3311,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1716" >
<father id="1782" num="2" />
-<cdparam x="352" y="132" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3320,7 +3320,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1718" >
<father id="1782" num="3" />
-<cdparam x="352" y="149" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3329,7 +3329,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1720" >
<father id="1782" num="4" />
-<cdparam x="352" y="165" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3338,7 +3338,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1722" >
<father id="1782" num="5" />
-<cdparam x="352" y="182" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3347,7 +3347,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1724" >
<father id="1782" num="6" />
-<cdparam x="352" y="199" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3356,7 +3356,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1726" >
<father id="1782" num="7" />
-<cdparam x="352" y="215" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3365,7 +3365,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1728" >
<father id="1782" num="8" />
-<cdparam x="352" y="232" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3374,7 +3374,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1730" >
<father id="1782" num="9" />
-<cdparam x="352" y="249" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3383,7 +3383,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1732" >
<father id="1782" num="10" />
-<cdparam x="352" y="265" />
+<cdparam x="352" y="449" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3392,7 +3392,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1734" >
<father id="1782" num="11" />
-<cdparam x="352" y="282" />
+<cdparam x="352" y="432" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3401,7 +3401,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1736" >
<father id="1782" num="12" />
-<cdparam x="352" y="299" />
+<cdparam x="352" y="415" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3410,7 +3410,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1738" >
<father id="1782" num="13" />
-<cdparam x="352" y="315" />
+<cdparam x="352" y="399" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3419,7 +3419,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1740" >
<father id="1782" num="14" />
-<cdparam x="352" y="332" />
+<cdparam x="352" y="382" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3428,7 +3428,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1742" >
<father id="1782" num="15" />
-<cdparam x="352" y="349" />
+<cdparam x="352" y="365" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3437,7 +3437,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1744" >
<father id="1782" num="16" />
-<cdparam x="352" y="365" />
+<cdparam x="352" y="349" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3446,7 +3446,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1746" >
<father id="1782" num="17" />
-<cdparam x="352" y="382" />
+<cdparam x="352" y="332" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3455,7 +3455,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1748" >
<father id="1782" num="18" />
-<cdparam x="352" y="399" />
+<cdparam x="352" y="315" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3464,7 +3464,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1750" >
<father id="1782" num="19" />
-<cdparam x="352" y="415" />
+<cdparam x="352" y="299" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3473,7 +3473,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1752" >
<father id="1782" num="20" />
-<cdparam x="352" y="432" />
+<cdparam x="352" y="282" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3482,7 +3482,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1754" >
<father id="1782" num="21" />
-<cdparam x="352" y="449" />
+<cdparam x="352" y="265" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3491,7 +3491,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1756" >
<father id="1782" num="22" />
-<cdparam x="352" y="465" />
+<cdparam x="352" y="249" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3500,7 +3500,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1758" >
<father id="1782" num="23" />
-<cdparam x="352" y="482" />
+<cdparam x="352" y="232" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3509,7 +3509,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1760" >
<father id="1782" num="24" />
-<cdparam x="352" y="499" />
+<cdparam x="352" y="215" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3518,7 +3518,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1762" >
<father id="1782" num="25" />
-<cdparam x="352" y="515" />
+<cdparam x="352" y="199" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3527,7 +3527,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1764" >
<father id="1782" num="26" />
-<cdparam x="352" y="532" />
+<cdparam x="352" y="182" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3536,7 +3536,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1766" >
<father id="1782" num="27" />
-<cdparam x="352" y="549" />
+<cdparam x="352" y="165" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3545,7 +3545,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1768" >
<father id="1782" num="28" />
-<cdparam x="352" y="565" />
+<cdparam x="352" y="149" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3554,7 +3554,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1770" >
<father id="1782" num="29" />
-<cdparam x="352" y="574" />
+<cdparam x="352" y="132" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3563,20 +3563,20 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1772" >
<father id="1782" num="30" />
-<cdparam x="352" y="109" />
+<cdparam x="352" y="115" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="1771" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="1781" >
+<SUBCOMPONENT type="625" id="1781" >
<father id="1782" num="31" />
-<cdparam x="365" y="394" />
+<cdparam x="365" y="299" />
<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="365" />
-<infoparam name="timer expiration" value="{timer=timerAlarm}" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
<TGConnectingPoint num="0" id="1773" />
<TGConnectingPoint num="1" id="1774" />
<TGConnectingPoint num="2" id="1775" />
@@ -3586,7 +3586,7 @@
<TGConnectingPoint num="6" id="1779" />
<TGConnectingPoint num="7" id="1780" />
<extraparam>
-<Interval timer="timerAlarm" />
+<Interval timer="timerAlarm" duration="60" />
</extraparam>
</SUBCOMPONENT>
@@ -3602,7 +3602,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="1784" >
<father id="1843" num="0" />
-<cdparam x="105" y="109" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3611,7 +3611,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1786" >
<father id="1843" num="1" />
-<cdparam x="105" y="115" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3620,7 +3620,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1788" >
<father id="1843" num="2" />
-<cdparam x="105" y="132" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3629,7 +3629,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1790" >
<father id="1843" num="3" />
-<cdparam x="105" y="149" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3638,7 +3638,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1792" >
<father id="1843" num="4" />
-<cdparam x="105" y="165" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3647,7 +3647,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1794" >
<father id="1843" num="5" />
-<cdparam x="105" y="182" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3656,7 +3656,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1796" >
<father id="1843" num="6" />
-<cdparam x="105" y="199" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3665,7 +3665,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1798" >
<father id="1843" num="7" />
-<cdparam x="105" y="215" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3674,7 +3674,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1800" >
<father id="1843" num="8" />
-<cdparam x="105" y="232" />
+<cdparam x="105" y="449" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3683,7 +3683,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1802" >
<father id="1843" num="9" />
-<cdparam x="105" y="249" />
+<cdparam x="105" y="432" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3692,7 +3692,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1804" >
<father id="1843" num="10" />
-<cdparam x="105" y="265" />
+<cdparam x="105" y="415" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3701,7 +3701,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1806" >
<father id="1843" num="11" />
-<cdparam x="105" y="282" />
+<cdparam x="105" y="399" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3710,7 +3710,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1808" >
<father id="1843" num="12" />
-<cdparam x="105" y="299" />
+<cdparam x="105" y="382" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3719,7 +3719,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1810" >
<father id="1843" num="13" />
-<cdparam x="105" y="315" />
+<cdparam x="105" y="365" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3728,7 +3728,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1812" >
<father id="1843" num="14" />
-<cdparam x="105" y="332" />
+<cdparam x="105" y="349" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3737,7 +3737,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1814" >
<father id="1843" num="15" />
-<cdparam x="105" y="349" />
+<cdparam x="105" y="332" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3746,7 +3746,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1816" >
<father id="1843" num="16" />
-<cdparam x="105" y="365" />
+<cdparam x="105" y="315" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3755,7 +3755,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1818" >
<father id="1843" num="17" />
-<cdparam x="105" y="382" />
+<cdparam x="105" y="299" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3764,7 +3764,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1820" >
<father id="1843" num="18" />
-<cdparam x="105" y="399" />
+<cdparam x="105" y="282" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3773,7 +3773,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1822" >
<father id="1843" num="19" />
-<cdparam x="105" y="415" />
+<cdparam x="105" y="265" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3782,7 +3782,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1824" >
<father id="1843" num="20" />
-<cdparam x="105" y="432" />
+<cdparam x="105" y="249" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3791,7 +3791,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1826" >
<father id="1843" num="21" />
-<cdparam x="105" y="449" />
+<cdparam x="105" y="232" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3800,7 +3800,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1828" >
<father id="1843" num="22" />
-<cdparam x="105" y="465" />
+<cdparam x="105" y="215" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3809,7 +3809,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1830" >
<father id="1843" num="23" />
-<cdparam x="105" y="482" />
+<cdparam x="105" y="199" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3818,7 +3818,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1832" >
<father id="1843" num="24" />
-<cdparam x="105" y="499" />
+<cdparam x="105" y="182" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3827,7 +3827,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1834" >
<father id="1843" num="25" />
-<cdparam x="105" y="515" />
+<cdparam x="105" y="165" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3836,7 +3836,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1836" >
<father id="1843" num="26" />
-<cdparam x="105" y="532" />
+<cdparam x="105" y="149" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3845,7 +3845,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1838" >
<father id="1843" num="27" />
-<cdparam x="105" y="549" />
+<cdparam x="105" y="132" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3854,7 +3854,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1840" >
<father id="1843" num="28" />
-<cdparam x="105" y="565" />
+<cdparam x="105" y="115" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3863,7 +3863,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1842" >
<father id="1843" num="29" />
-<cdparam x="105" y="574" />
+<cdparam x="105" y="109" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3875,73 +3875,62 @@
<cdparam x="105" y="473" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(16)" />
-<P1 x="105" y="472" id="1827" />
-<P2 x="352" y="472" id="1755" />
+<P1 x="105" y="468" id="1797" />
+<P2 x="352" y="468" id="1729" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1845" >
<cdparam x="255" y="440" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="stopAlarm" />
-<P1 x="352" y="439" id="1751" />
-<P2 x="595" y="439" id="1683" />
+<P1 x="352" y="439" id="1733" />
+<P2 x="595" y="439" id="1661" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1846" >
<cdparam x="255" y="273" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="startAlarm" />
-<P1 x="352" y="272" id="1731" />
-<P2 x="595" y="272" id="1663" />
+<P1 x="352" y="272" id="1753" />
+<P2 x="595" y="272" id="1681" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1847" >
<cdparam x="105" y="240" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="105" y="239" id="1799" />
-<P2 x="352" y="239" id="1727" />
+<P1 x="105" y="239" id="1825" />
+<P2 x="352" y="239" id="1757" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1848" >
<cdparam x="105" y="207" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(18)" />
-<P1 x="105" y="206" id="1795" />
-<P2 x="352" y="206" id="1723" />
+<P1 x="105" y="206" id="1829" />
+<P2 x="352" y="206" id="1761" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1849" >
<cdparam x="105" y="173" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure19" />
-<P1 x="105" y="172" id="1791" />
-<P2 x="352" y="172" id="1719" />
+<P1 x="105" y="172" id="1833" />
+<P2 x="352" y="172" id="1765" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1850" >
<cdparam x="105" y="140" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(19)" />
-<P1 x="105" y="139" id="1787" />
-<P2 x="352" y="139" id="1715" />
+<P1 x="105" y="139" id="1837" />
+<P2 x="352" y="139" id="1769" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</SequenceDiagramPanelZV>
<SequenceDiagramPanelZV name="TwoSuccessiveAlarms" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="136" id="6775" >
-<cdparam x="486" y="292" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="relative time constraint" value="{1..1}" />
-<P1 x="486" y="292" id="1929" />
-<P2 x="486" y="342" id="1939" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<Interval minConstraint="1" maxConstraint="1" />
-</extraparam>
-</CONNECTOR>
<COMPONENT type="620" id="1958" >
<cdparam x="511" y="96" />
<sizeparam width="10" height="365" minWidth="10" minHeight="25" maxWidth="10" maxHeight="2500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3952,357 +3941,357 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="1852" >
+<SUBCOMPONENT type="623" id="1859" >
<father id="1958" num="0" />
-<cdparam x="516" y="111" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="431" />
+<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
-<infoparam name="port" value="port" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
+<infoparam name="action state" value="timerValue = 60" />
<TGConnectingPoint num="0" id="1851" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1854" >
+<TGConnectingPoint num="1" id="1852" />
+<TGConnectingPoint num="2" id="1853" />
+<TGConnectingPoint num="3" id="1854" />
+<TGConnectingPoint num="4" id="1855" />
+<TGConnectingPoint num="5" id="1856" />
+<TGConnectingPoint num="6" id="1857" />
+<TGConnectingPoint num="7" id="1858" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="622" id="1869" >
<father id="1958" num="1" />
-<cdparam x="516" y="127" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="476" y="342" />
+<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1853" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1856" >
+<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="355" />
+<infoparam name="Line of relative time constraint" value="rtc" />
+<TGConnectingPoint num="0" id="1860" />
+<TGConnectingPoint num="1" id="1861" />
+<TGConnectingPoint num="2" id="1862" />
+<TGConnectingPoint num="3" id="1863" />
+<TGConnectingPoint num="4" id="1864" />
+<TGConnectingPoint num="5" id="1865" />
+<TGConnectingPoint num="6" id="1866" />
+<TGConnectingPoint num="7" id="1867" />
+<TGConnectingPoint num="8" id="1868" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="622" id="1879" >
<father id="1958" num="2" />
-<cdparam x="516" y="144" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="476" y="292" />
+<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1855" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1858" >
+<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="355" />
+<infoparam name="Line of relative time constraint" value="rtc" />
+<TGConnectingPoint num="0" id="1870" />
+<TGConnectingPoint num="1" id="1871" />
+<TGConnectingPoint num="2" id="1872" />
+<TGConnectingPoint num="3" id="1873" />
+<TGConnectingPoint num="4" id="1874" />
+<TGConnectingPoint num="5" id="1875" />
+<TGConnectingPoint num="6" id="1876" />
+<TGConnectingPoint num="7" id="1877" />
+<TGConnectingPoint num="8" id="1878" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="623" id="1888" >
<father id="1958" num="3" />
-<cdparam x="516" y="161" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="341" />
+<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1857" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1860" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
+<infoparam name="action state" value="timerValue = 59" />
+<TGConnectingPoint num="0" id="1880" />
+<TGConnectingPoint num="1" id="1881" />
+<TGConnectingPoint num="2" id="1882" />
+<TGConnectingPoint num="3" id="1883" />
+<TGConnectingPoint num="4" id="1884" />
+<TGConnectingPoint num="5" id="1885" />
+<TGConnectingPoint num="6" id="1886" />
+<TGConnectingPoint num="7" id="1887" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="623" id="1897" >
<father id="1958" num="4" />
-<cdparam x="516" y="177" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="292" />
+<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1859" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1862" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
+<infoparam name="action state" value="timerValue = 60" />
+<TGConnectingPoint num="0" id="1889" />
+<TGConnectingPoint num="1" id="1890" />
+<TGConnectingPoint num="2" id="1891" />
+<TGConnectingPoint num="3" id="1892" />
+<TGConnectingPoint num="4" id="1893" />
+<TGConnectingPoint num="5" id="1894" />
+<TGConnectingPoint num="6" id="1895" />
+<TGConnectingPoint num="7" id="1896" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1899" >
<father id="1958" num="5" />
-<cdparam x="516" y="194" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1861" />
+<TGConnectingPoint num="0" id="1898" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1864" >
+<SUBCOMPONENT type="630" id="1901" >
<father id="1958" num="6" />
-<cdparam x="516" y="211" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1863" />
+<TGConnectingPoint num="0" id="1900" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1866" >
+<SUBCOMPONENT type="630" id="1903" >
<father id="1958" num="7" />
-<cdparam x="516" y="227" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1865" />
+<TGConnectingPoint num="0" id="1902" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1868" >
+<SUBCOMPONENT type="630" id="1905" >
<father id="1958" num="8" />
-<cdparam x="516" y="244" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1867" />
+<TGConnectingPoint num="0" id="1904" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1870" >
+<SUBCOMPONENT type="630" id="1907" >
<father id="1958" num="9" />
-<cdparam x="516" y="261" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1869" />
+<TGConnectingPoint num="0" id="1906" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1872" >
+<SUBCOMPONENT type="630" id="1909" >
<father id="1958" num="10" />
-<cdparam x="516" y="277" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1871" />
+<TGConnectingPoint num="0" id="1908" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1874" >
+<SUBCOMPONENT type="630" id="1911" >
<father id="1958" num="11" />
-<cdparam x="516" y="294" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1873" />
+<TGConnectingPoint num="0" id="1910" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1876" >
+<SUBCOMPONENT type="630" id="1913" >
<father id="1958" num="12" />
-<cdparam x="516" y="311" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1875" />
+<TGConnectingPoint num="0" id="1912" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1878" >
+<SUBCOMPONENT type="630" id="1915" >
<father id="1958" num="13" />
-<cdparam x="516" y="327" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1877" />
+<TGConnectingPoint num="0" id="1914" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1880" >
+<SUBCOMPONENT type="630" id="1917" >
<father id="1958" num="14" />
-<cdparam x="516" y="344" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1879" />
+<TGConnectingPoint num="0" id="1916" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1882" >
+<SUBCOMPONENT type="630" id="1919" >
<father id="1958" num="15" />
-<cdparam x="516" y="361" />
+<cdparam x="516" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1881" />
+<TGConnectingPoint num="0" id="1918" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1884" >
+<SUBCOMPONENT type="630" id="1921" >
<father id="1958" num="16" />
-<cdparam x="516" y="377" />
+<cdparam x="516" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1883" />
+<TGConnectingPoint num="0" id="1920" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1886" >
+<SUBCOMPONENT type="630" id="1923" >
<father id="1958" num="17" />
<cdparam x="516" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1885" />
+<TGConnectingPoint num="0" id="1922" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1888" >
+<SUBCOMPONENT type="630" id="1925" >
<father id="1958" num="18" />
-<cdparam x="516" y="410" />
+<cdparam x="516" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1887" />
+<TGConnectingPoint num="0" id="1924" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1890" >
+<SUBCOMPONENT type="630" id="1927" >
<father id="1958" num="19" />
-<cdparam x="516" y="427" />
+<cdparam x="516" y="361" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1889" />
+<TGConnectingPoint num="0" id="1926" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1892" >
+<SUBCOMPONENT type="630" id="1929" >
<father id="1958" num="20" />
-<cdparam x="516" y="444" />
+<cdparam x="516" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1891" />
+<TGConnectingPoint num="0" id="1928" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1894" >
+<SUBCOMPONENT type="630" id="1931" >
<father id="1958" num="21" />
-<cdparam x="516" y="461" />
+<cdparam x="516" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1893" />
+<TGConnectingPoint num="0" id="1930" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1896" >
+<SUBCOMPONENT type="630" id="1933" >
<father id="1958" num="22" />
-<cdparam x="516" y="477" />
+<cdparam x="516" y="311" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1895" />
+<TGConnectingPoint num="0" id="1932" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1898" >
+<SUBCOMPONENT type="630" id="1935" >
<father id="1958" num="23" />
-<cdparam x="516" y="494" />
+<cdparam x="516" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1897" />
+<TGConnectingPoint num="0" id="1934" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1900" >
+<SUBCOMPONENT type="630" id="1937" >
<father id="1958" num="24" />
-<cdparam x="516" y="511" />
+<cdparam x="516" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1899" />
+<TGConnectingPoint num="0" id="1936" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1902" >
+<SUBCOMPONENT type="630" id="1939" >
<father id="1958" num="25" />
-<cdparam x="516" y="527" />
+<cdparam x="516" y="261" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1901" />
+<TGConnectingPoint num="0" id="1938" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1904" >
+<SUBCOMPONENT type="630" id="1941" >
<father id="1958" num="26" />
-<cdparam x="516" y="544" />
+<cdparam x="516" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1903" />
+<TGConnectingPoint num="0" id="1940" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1906" >
+<SUBCOMPONENT type="630" id="1943" >
<father id="1958" num="27" />
-<cdparam x="516" y="561" />
+<cdparam x="516" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1905" />
+<TGConnectingPoint num="0" id="1942" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1908" >
+<SUBCOMPONENT type="630" id="1945" >
<father id="1958" num="28" />
-<cdparam x="516" y="564" />
+<cdparam x="516" y="211" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1907" />
+<TGConnectingPoint num="0" id="1944" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1910" >
+<SUBCOMPONENT type="630" id="1947" >
<father id="1958" num="29" />
-<cdparam x="516" y="564" />
+<cdparam x="516" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1909" />
+<TGConnectingPoint num="0" id="1946" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1919" >
+<SUBCOMPONENT type="630" id="1949" >
<father id="1958" num="30" />
-<cdparam x="516" y="292" />
-<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="177" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
-<infoparam name="action state" value="timerValue = 60" />
-<TGConnectingPoint num="0" id="1911" />
-<TGConnectingPoint num="1" id="1912" />
-<TGConnectingPoint num="2" id="1913" />
-<TGConnectingPoint num="3" id="1914" />
-<TGConnectingPoint num="4" id="1915" />
-<TGConnectingPoint num="5" id="1916" />
-<TGConnectingPoint num="6" id="1917" />
-<TGConnectingPoint num="7" id="1918" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1928" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1948" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1951" >
<father id="1958" num="31" />
-<cdparam x="516" y="341" />
-<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="161" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
-<infoparam name="action state" value="timerValue = 59" />
-<TGConnectingPoint num="0" id="1920" />
-<TGConnectingPoint num="1" id="1921" />
-<TGConnectingPoint num="2" id="1922" />
-<TGConnectingPoint num="3" id="1923" />
-<TGConnectingPoint num="4" id="1924" />
-<TGConnectingPoint num="5" id="1925" />
-<TGConnectingPoint num="6" id="1926" />
-<TGConnectingPoint num="7" id="1927" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="622" id="1938" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1950" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1953" >
<father id="1958" num="32" />
-<cdparam x="476" y="292" />
-<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="144" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="355" />
-<infoparam name="Line of relative time constraint" value="rtc" />
-<TGConnectingPoint num="0" id="1929" />
-<TGConnectingPoint num="1" id="1930" />
-<TGConnectingPoint num="2" id="1931" />
-<TGConnectingPoint num="3" id="1932" />
-<TGConnectingPoint num="4" id="1933" />
-<TGConnectingPoint num="5" id="1934" />
-<TGConnectingPoint num="6" id="1935" />
-<TGConnectingPoint num="7" id="1936" />
-<TGConnectingPoint num="8" id="1937" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="622" id="1948" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1952" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1955" >
<father id="1958" num="33" />
-<cdparam x="476" y="342" />
-<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="127" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="355" />
-<infoparam name="Line of relative time constraint" value="rtc" />
-<TGConnectingPoint num="0" id="1939" />
-<TGConnectingPoint num="1" id="1940" />
-<TGConnectingPoint num="2" id="1941" />
-<TGConnectingPoint num="3" id="1942" />
-<TGConnectingPoint num="4" id="1943" />
-<TGConnectingPoint num="5" id="1944" />
-<TGConnectingPoint num="6" id="1945" />
-<TGConnectingPoint num="7" id="1946" />
-<TGConnectingPoint num="8" id="1947" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1957" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1954" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1957" >
<father id="1958" num="34" />
-<cdparam x="516" y="437" />
-<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="111" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
-<infoparam name="action state" value="timerValue = 60" />
-<TGConnectingPoint num="0" id="1949" />
-<TGConnectingPoint num="1" id="1950" />
-<TGConnectingPoint num="2" id="1951" />
-<TGConnectingPoint num="3" id="1952" />
-<TGConnectingPoint num="4" id="1953" />
-<TGConnectingPoint num="5" id="1954" />
-<TGConnectingPoint num="6" id="1955" />
-<TGConnectingPoint num="7" id="1956" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1956" />
</SUBCOMPONENT>
<COMPONENT type="620" id="2019" >
@@ -4317,7 +4306,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="1960" >
<father id="2019" num="0" />
-<cdparam x="716" y="104" />
+<cdparam x="716" y="110" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4326,7 +4315,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1962" >
<father id="2019" num="1" />
-<cdparam x="716" y="562" />
+<cdparam x="716" y="127" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4335,7 +4324,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1964" >
<father id="2019" num="2" />
-<cdparam x="716" y="560" />
+<cdparam x="716" y="144" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4344,7 +4333,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1966" >
<father id="2019" num="3" />
-<cdparam x="716" y="544" />
+<cdparam x="716" y="160" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4353,7 +4342,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1968" >
<father id="2019" num="4" />
-<cdparam x="716" y="527" />
+<cdparam x="716" y="177" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4362,7 +4351,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1970" >
<father id="2019" num="5" />
-<cdparam x="716" y="510" />
+<cdparam x="716" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4371,7 +4360,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1972" >
<father id="2019" num="6" />
-<cdparam x="716" y="494" />
+<cdparam x="716" y="210" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4380,7 +4369,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1974" >
<father id="2019" num="7" />
-<cdparam x="716" y="477" />
+<cdparam x="716" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4389,7 +4378,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1976" >
<father id="2019" num="8" />
-<cdparam x="716" y="460" />
+<cdparam x="716" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4398,7 +4387,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1978" >
<father id="2019" num="9" />
-<cdparam x="716" y="444" />
+<cdparam x="716" y="261" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4407,7 +4396,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1980" >
<father id="2019" num="10" />
-<cdparam x="716" y="427" />
+<cdparam x="716" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4416,7 +4405,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1982" >
<father id="2019" num="11" />
-<cdparam x="716" y="410" />
+<cdparam x="716" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4425,7 +4414,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1984" >
<father id="2019" num="12" />
-<cdparam x="716" y="394" />
+<cdparam x="716" y="310" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4434,7 +4423,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1986" >
<father id="2019" num="13" />
-<cdparam x="716" y="377" />
+<cdparam x="716" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4443,7 +4432,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1988" >
<father id="2019" num="14" />
-<cdparam x="716" y="360" />
+<cdparam x="716" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4452,7 +4441,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1990" >
<father id="2019" num="15" />
-<cdparam x="716" y="344" />
+<cdparam x="716" y="360" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4461,7 +4450,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1992" >
<father id="2019" num="16" />
-<cdparam x="716" y="327" />
+<cdparam x="716" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4470,7 +4459,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1994" >
<father id="2019" num="17" />
-<cdparam x="716" y="310" />
+<cdparam x="716" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4479,7 +4468,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1996" >
<father id="2019" num="18" />
-<cdparam x="716" y="294" />
+<cdparam x="716" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4488,7 +4477,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1998" >
<father id="2019" num="19" />
-<cdparam x="716" y="277" />
+<cdparam x="716" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4497,7 +4486,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2000" >
<father id="2019" num="20" />
-<cdparam x="716" y="261" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4506,7 +4495,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2002" >
<father id="2019" num="21" />
-<cdparam x="716" y="244" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4515,7 +4504,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2004" >
<father id="2019" num="22" />
-<cdparam x="716" y="227" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4524,7 +4513,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2006" >
<father id="2019" num="23" />
-<cdparam x="716" y="210" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4533,7 +4522,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2008" >
<father id="2019" num="24" />
-<cdparam x="716" y="194" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4542,7 +4531,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2010" >
<father id="2019" num="25" />
-<cdparam x="716" y="177" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4551,7 +4540,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2012" >
<father id="2019" num="26" />
-<cdparam x="716" y="160" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4560,7 +4549,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2014" >
<father id="2019" num="27" />
-<cdparam x="716" y="144" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4569,7 +4558,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2016" >
<father id="2019" num="28" />
-<cdparam x="716" y="127" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4578,7 +4567,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2018" >
<father id="2019" num="29" />
-<cdparam x="716" y="110" />
+<cdparam x="716" y="104" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4598,7 +4587,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="2021" >
<father id="2080" num="0" />
-<cdparam x="309" y="104" />
+<cdparam x="309" y="110" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4607,7 +4596,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2023" >
<father id="2080" num="1" />
-<cdparam x="309" y="562" />
+<cdparam x="309" y="127" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4616,7 +4605,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2025" >
<father id="2080" num="2" />
-<cdparam x="309" y="560" />
+<cdparam x="309" y="144" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4625,7 +4614,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2027" >
<father id="2080" num="3" />
-<cdparam x="309" y="544" />
+<cdparam x="309" y="160" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4634,7 +4623,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2029" >
<father id="2080" num="4" />
-<cdparam x="309" y="527" />
+<cdparam x="309" y="177" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4643,7 +4632,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2031" >
<father id="2080" num="5" />
-<cdparam x="309" y="510" />
+<cdparam x="309" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4652,7 +4641,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2033" >
<father id="2080" num="6" />
-<cdparam x="309" y="494" />
+<cdparam x="309" y="210" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4661,7 +4650,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2035" >
<father id="2080" num="7" />
-<cdparam x="309" y="477" />
+<cdparam x="309" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4670,7 +4659,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2037" >
<father id="2080" num="8" />
-<cdparam x="309" y="460" />
+<cdparam x="309" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4679,7 +4668,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2039" >
<father id="2080" num="9" />
-<cdparam x="309" y="444" />
+<cdparam x="309" y="256" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4688,7 +4677,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2041" >
<father id="2080" num="10" />
-<cdparam x="309" y="427" />
+<cdparam x="309" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4697,7 +4686,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2043" >
<father id="2080" num="11" />
-<cdparam x="309" y="410" />
+<cdparam x="309" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4706,7 +4695,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2045" >
<father id="2080" num="12" />
-<cdparam x="309" y="394" />
+<cdparam x="309" y="310" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4715,7 +4704,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2047" >
<father id="2080" num="13" />
-<cdparam x="309" y="377" />
+<cdparam x="309" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4724,7 +4713,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2049" >
<father id="2080" num="14" />
-<cdparam x="309" y="360" />
+<cdparam x="309" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4733,7 +4722,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2051" >
<father id="2080" num="15" />
-<cdparam x="309" y="344" />
+<cdparam x="309" y="360" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4742,7 +4731,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2053" >
<father id="2080" num="16" />
-<cdparam x="309" y="327" />
+<cdparam x="309" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4751,7 +4740,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2055" >
<father id="2080" num="17" />
-<cdparam x="309" y="310" />
+<cdparam x="309" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4760,7 +4749,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2057" >
<father id="2080" num="18" />
-<cdparam x="309" y="294" />
+<cdparam x="309" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4769,7 +4758,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2059" >
<father id="2080" num="19" />
-<cdparam x="309" y="277" />
+<cdparam x="309" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4778,7 +4767,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2061" >
<father id="2080" num="20" />
-<cdparam x="309" y="256" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4787,7 +4776,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2063" >
<father id="2080" num="21" />
-<cdparam x="309" y="244" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4796,7 +4785,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2065" >
<father id="2080" num="22" />
-<cdparam x="309" y="227" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4805,7 +4794,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2067" >
<father id="2080" num="23" />
-<cdparam x="309" y="210" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4814,7 +4803,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2069" >
<father id="2080" num="24" />
-<cdparam x="309" y="194" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4823,7 +4812,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2071" >
<father id="2080" num="25" />
-<cdparam x="309" y="177" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4832,7 +4821,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2073" >
<father id="2080" num="26" />
-<cdparam x="309" y="160" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4841,7 +4830,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2075" >
<father id="2080" num="27" />
-<cdparam x="309" y="144" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4850,7 +4839,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2077" >
<father id="2080" num="28" />
-<cdparam x="309" y="127" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4859,7 +4848,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2079" >
<father id="2080" num="29" />
-<cdparam x="309" y="110" />
+<cdparam x="309" y="104" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4879,7 +4868,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="2082" >
<father id="2141" num="0" />
-<cdparam x="131" y="104" />
+<cdparam x="131" y="110" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4888,7 +4877,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2084" >
<father id="2141" num="1" />
-<cdparam x="131" y="562" />
+<cdparam x="131" y="127" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4897,7 +4886,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2086" >
<father id="2141" num="2" />
-<cdparam x="131" y="560" />
+<cdparam x="131" y="144" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4906,7 +4895,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2088" >
<father id="2141" num="3" />
-<cdparam x="131" y="544" />
+<cdparam x="131" y="160" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4915,7 +4904,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2090" >
<father id="2141" num="4" />
-<cdparam x="131" y="527" />
+<cdparam x="131" y="177" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4924,7 +4913,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2092" >
<father id="2141" num="5" />
-<cdparam x="131" y="510" />
+<cdparam x="131" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4933,7 +4922,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2094" >
<father id="2141" num="6" />
-<cdparam x="131" y="494" />
+<cdparam x="131" y="210" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4942,7 +4931,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2096" >
<father id="2141" num="7" />
-<cdparam x="131" y="477" />
+<cdparam x="131" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4951,7 +4940,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2098" >
<father id="2141" num="8" />
-<cdparam x="131" y="460" />
+<cdparam x="131" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4960,7 +4949,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2100" >
<father id="2141" num="9" />
-<cdparam x="131" y="444" />
+<cdparam x="131" y="260" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4969,7 +4958,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2102" >
<father id="2141" num="10" />
-<cdparam x="131" y="427" />
+<cdparam x="131" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4978,7 +4967,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2104" >
<father id="2141" num="11" />
-<cdparam x="131" y="410" />
+<cdparam x="131" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4987,7 +4976,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2106" >
<father id="2141" num="12" />
-<cdparam x="131" y="394" />
+<cdparam x="131" y="310" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4996,7 +4985,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2108" >
<father id="2141" num="13" />
-<cdparam x="131" y="377" />
+<cdparam x="131" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5005,7 +4994,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2110" >
<father id="2141" num="14" />
-<cdparam x="131" y="360" />
+<cdparam x="131" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5014,7 +5003,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2112" >
<father id="2141" num="15" />
-<cdparam x="131" y="344" />
+<cdparam x="131" y="360" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5023,7 +5012,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2114" >
<father id="2141" num="16" />
-<cdparam x="131" y="327" />
+<cdparam x="131" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5032,7 +5021,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2116" >
<father id="2141" num="17" />
-<cdparam x="131" y="310" />
+<cdparam x="131" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5041,7 +5030,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2118" >
<father id="2141" num="18" />
-<cdparam x="131" y="294" />
+<cdparam x="131" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5050,7 +5039,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2120" >
<father id="2141" num="19" />
-<cdparam x="131" y="277" />
+<cdparam x="131" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5059,7 +5048,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2122" >
<father id="2141" num="20" />
-<cdparam x="131" y="260" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5068,7 +5057,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2124" >
<father id="2141" num="21" />
-<cdparam x="131" y="244" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5077,7 +5066,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2126" >
<father id="2141" num="22" />
-<cdparam x="131" y="227" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5086,7 +5075,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2128" >
<father id="2141" num="23" />
-<cdparam x="131" y="210" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5095,7 +5084,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2130" >
<father id="2141" num="24" />
-<cdparam x="131" y="194" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5104,7 +5093,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2132" >
<father id="2141" num="25" />
-<cdparam x="131" y="177" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5113,7 +5102,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2134" >
<father id="2141" num="26" />
-<cdparam x="131" y="160" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5122,7 +5111,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2136" >
<father id="2141" num="27" />
-<cdparam x="131" y="144" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5131,7 +5120,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2138" >
<father id="2141" num="28" />
-<cdparam x="131" y="127" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5140,7 +5129,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2140" >
<father id="2141" num="29" />
-<cdparam x="131" y="110" />
+<cdparam x="131" y="104" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5148,68 +5137,79 @@
<TGConnectingPoint num="0" id="2139" />
</SUBCOMPONENT>
-<CONNECTOR type="107" id="2142" >
+<CONNECTOR type="136" id="2142" >
+<cdparam x="486" y="292" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="relative time constraint" value="{1..1}" />
+<P1 x="486" y="292" id="1870" />
+<P2 x="486" y="342" id="1860" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<Interval minConstraint="1" maxConstraint="1" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="107" id="2143" >
<cdparam x="309" y="417" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="start" />
-<P1 x="309" y="417" id="2042" />
-<P2 x="516" y="417" id="1887" />
+<P1 x="309" y="417" id="2056" />
+<P2 x="516" y="417" id="1920" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="107" id="2143" >
+<CONNECTOR type="107" id="2144" >
<cdparam x="131" y="401" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="131" y="401" id="2105" />
-<P2 x="309" y="401" id="2044" />
+<P1 x="131" y="401" id="2115" />
+<P2 x="309" y="401" id="2054" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2145" >
<cdparam x="516" y="268" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="start" />
-<P1 x="516" y="268" id="1869" />
-<P2 x="716" y="268" id="1999" />
+<P1 x="516" y="268" id="1938" />
+<P2 x="716" y="268" id="1977" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2146" >
<cdparam x="309" y="251" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="start" />
-<P1 x="309" y="251" id="2062" />
-<P2 x="516" y="251" id="1867" />
+<P1 x="309" y="251" id="2036" />
+<P2 x="516" y="251" id="1940" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2147" >
<cdparam x="131" y="234" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="131" y="234" id="2125" />
-<P2 x="309" y="234" id="2064" />
+<P1 x="131" y="234" id="2095" />
+<P2 x="309" y="234" id="2034" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2148" >
<cdparam x="131" y="201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(18)" />
-<P1 x="131" y="201" id="2129" />
-<P2 x="309" y="201" id="2068" />
+<P1 x="131" y="201" id="2091" />
+<P2 x="309" y="201" id="2030" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2149" >
<cdparam x="131" y="167" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure19" />
-<P1 x="131" y="167" id="2133" />
-<P2 x="309" y="167" id="2072" />
+<P1 x="131" y="167" id="2087" />
+<P2 x="309" y="167" id="2026" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2150" >
<cdparam x="131" y="134" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(19)" />
-<P1 x="131" y="134" id="2137" />
-<P2 x="309" y="134" id="2076" />
+<P1 x="131" y="134" id="2083" />
+<P2 x="309" y="134" id="2022" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -7035,7 +7035,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="2986" >
<father id="3045" num="0" />
-<cdparam x="606" y="112" />
+<cdparam x="606" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7044,7 +7044,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2988" >
<father id="3045" num="1" />
-<cdparam x="606" y="129" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7053,7 +7053,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2990" >
<father id="3045" num="2" />
-<cdparam x="606" y="146" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7062,7 +7062,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2992" >
<father id="3045" num="3" />
-<cdparam x="606" y="162" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7071,7 +7071,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2994" >
<father id="3045" num="4" />
-<cdparam x="606" y="179" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7080,7 +7080,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2996" >
<father id="3045" num="5" />
-<cdparam x="606" y="196" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7089,7 +7089,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2998" >
<father id="3045" num="6" />
-<cdparam x="606" y="212" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7098,7 +7098,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3000" >
<father id="3045" num="7" />
-<cdparam x="606" y="229" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7107,7 +7107,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3002" >
<father id="3045" num="8" />
-<cdparam x="606" y="246" />
+<cdparam x="606" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7116,7 +7116,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3004" >
<father id="3045" num="9" />
-<cdparam x="606" y="262" />
+<cdparam x="606" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7125,7 +7125,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3006" >
<father id="3045" num="10" />
-<cdparam x="606" y="279" />
+<cdparam x="606" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7134,7 +7134,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3008" >
<father id="3045" num="11" />
-<cdparam x="606" y="296" />
+<cdparam x="606" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7143,7 +7143,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3010" >
<father id="3045" num="12" />
-<cdparam x="606" y="312" />
+<cdparam x="606" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7152,7 +7152,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3012" >
<father id="3045" num="13" />
-<cdparam x="606" y="329" />
+<cdparam x="606" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7161,7 +7161,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3014" >
<father id="3045" num="14" />
-<cdparam x="606" y="346" />
+<cdparam x="606" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7170,7 +7170,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3016" >
<father id="3045" num="15" />
-<cdparam x="606" y="362" />
+<cdparam x="606" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7179,7 +7179,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3018" >
<father id="3045" num="16" />
-<cdparam x="606" y="379" />
+<cdparam x="606" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7188,7 +7188,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3020" >
<father id="3045" num="17" />
-<cdparam x="606" y="396" />
+<cdparam x="606" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7197,7 +7197,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3022" >
<father id="3045" num="18" />
-<cdparam x="606" y="412" />
+<cdparam x="606" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7206,7 +7206,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3024" >
<father id="3045" num="19" />
-<cdparam x="606" y="429" />
+<cdparam x="606" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7215,7 +7215,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3026" >
<father id="3045" num="20" />
-<cdparam x="606" y="446" />
+<cdparam x="606" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7224,7 +7224,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3028" >
<father id="3045" num="21" />
-<cdparam x="606" y="462" />
+<cdparam x="606" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7233,7 +7233,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3030" >
<father id="3045" num="22" />
-<cdparam x="606" y="479" />
+<cdparam x="606" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7242,7 +7242,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3032" >
<father id="3045" num="23" />
-<cdparam x="606" y="496" />
+<cdparam x="606" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7251,7 +7251,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3034" >
<father id="3045" num="24" />
-<cdparam x="606" y="512" />
+<cdparam x="606" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7260,7 +7260,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3036" >
<father id="3045" num="25" />
-<cdparam x="606" y="529" />
+<cdparam x="606" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7269,7 +7269,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3038" >
<father id="3045" num="26" />
-<cdparam x="606" y="546" />
+<cdparam x="606" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7278,7 +7278,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3040" >
<father id="3045" num="27" />
-<cdparam x="606" y="562" />
+<cdparam x="606" y="146" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7287,7 +7287,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3042" >
<father id="3045" num="28" />
-<cdparam x="606" y="571" />
+<cdparam x="606" y="129" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7296,7 +7296,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3044" >
<father id="3045" num="29" />
-<cdparam x="606" y="106" />
+<cdparam x="606" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7316,7 +7316,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3047" >
<father id="3106" num="0" />
-<cdparam x="456" y="112" />
+<cdparam x="456" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7325,7 +7325,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3049" >
<father id="3106" num="1" />
-<cdparam x="456" y="129" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7334,7 +7334,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3051" >
<father id="3106" num="2" />
-<cdparam x="456" y="146" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7343,7 +7343,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3053" >
<father id="3106" num="3" />
-<cdparam x="456" y="162" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7352,7 +7352,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3055" >
<father id="3106" num="4" />
-<cdparam x="456" y="179" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7361,7 +7361,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3057" >
<father id="3106" num="5" />
-<cdparam x="456" y="196" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7370,7 +7370,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3059" >
<father id="3106" num="6" />
-<cdparam x="456" y="212" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7379,7 +7379,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3061" >
<father id="3106" num="7" />
-<cdparam x="456" y="229" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7388,7 +7388,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3063" >
<father id="3106" num="8" />
-<cdparam x="456" y="246" />
+<cdparam x="456" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7397,7 +7397,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3065" >
<father id="3106" num="9" />
-<cdparam x="456" y="262" />
+<cdparam x="456" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7406,7 +7406,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3067" >
<father id="3106" num="10" />
-<cdparam x="456" y="279" />
+<cdparam x="456" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7415,7 +7415,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3069" >
<father id="3106" num="11" />
-<cdparam x="456" y="296" />
+<cdparam x="456" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7424,7 +7424,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3071" >
<father id="3106" num="12" />
-<cdparam x="456" y="312" />
+<cdparam x="456" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7433,7 +7433,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3073" >
<father id="3106" num="13" />
-<cdparam x="456" y="329" />
+<cdparam x="456" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7442,7 +7442,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3075" >
<father id="3106" num="14" />
-<cdparam x="456" y="346" />
+<cdparam x="456" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7451,7 +7451,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3077" >
<father id="3106" num="15" />
-<cdparam x="456" y="362" />
+<cdparam x="456" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7460,7 +7460,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3079" >
<father id="3106" num="16" />
-<cdparam x="456" y="379" />
+<cdparam x="456" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7469,7 +7469,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3081" >
<father id="3106" num="17" />
-<cdparam x="456" y="396" />
+<cdparam x="456" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7478,7 +7478,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3083" >
<father id="3106" num="18" />
-<cdparam x="456" y="412" />
+<cdparam x="456" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7487,7 +7487,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3085" >
<father id="3106" num="19" />
-<cdparam x="456" y="429" />
+<cdparam x="456" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7496,7 +7496,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3087" >
<father id="3106" num="20" />
-<cdparam x="456" y="446" />
+<cdparam x="456" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7505,7 +7505,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3089" >
<father id="3106" num="21" />
-<cdparam x="456" y="462" />
+<cdparam x="456" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7514,7 +7514,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3091" >
<father id="3106" num="22" />
-<cdparam x="456" y="479" />
+<cdparam x="456" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7523,7 +7523,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3093" >
<father id="3106" num="23" />
-<cdparam x="456" y="496" />
+<cdparam x="456" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7532,7 +7532,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3095" >
<father id="3106" num="24" />
-<cdparam x="456" y="512" />
+<cdparam x="456" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7541,7 +7541,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3097" >
<father id="3106" num="25" />
-<cdparam x="456" y="529" />
+<cdparam x="456" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7550,7 +7550,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3099" >
<father id="3106" num="26" />
-<cdparam x="456" y="546" />
+<cdparam x="456" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7559,7 +7559,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3101" >
<father id="3106" num="27" />
-<cdparam x="456" y="562" />
+<cdparam x="456" y="146" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7568,7 +7568,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3103" >
<father id="3106" num="28" />
-<cdparam x="456" y="571" />
+<cdparam x="456" y="129" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7577,7 +7577,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3105" >
<father id="3106" num="29" />
-<cdparam x="456" y="106" />
+<cdparam x="456" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7597,306 +7597,306 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3108" >
<father id="3185" num="0" />
-<cdparam x="306" y="112" />
+<cdparam x="306" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="3107" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3110" >
+<SUBCOMPONENT type="627" id="3117" >
<father id="3185" num="1" />
-<cdparam x="306" y="129" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="319" y="391" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
-<infoparam name="port" value="port" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="382" />
+<infoparam name="timer expiration" value="{timer=timerAlarm}" />
<TGConnectingPoint num="0" id="3109" />
+<TGConnectingPoint num="1" id="3110" />
+<TGConnectingPoint num="2" id="3111" />
+<TGConnectingPoint num="3" id="3112" />
+<TGConnectingPoint num="4" id="3113" />
+<TGConnectingPoint num="5" id="3114" />
+<TGConnectingPoint num="6" id="3115" />
+<TGConnectingPoint num="7" id="3116" />
+<extraparam>
+<Interval timer="timerAlarm" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3112" >
+<SUBCOMPONENT type="625" id="3126" >
<father id="3185" num="2" />
-<cdparam x="306" y="146" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="319" y="296" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3111" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="382" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
+<TGConnectingPoint num="0" id="3118" />
+<TGConnectingPoint num="1" id="3119" />
+<TGConnectingPoint num="2" id="3120" />
+<TGConnectingPoint num="3" id="3121" />
+<TGConnectingPoint num="4" id="3122" />
+<TGConnectingPoint num="5" id="3123" />
+<TGConnectingPoint num="6" id="3124" />
+<TGConnectingPoint num="7" id="3125" />
+<extraparam>
+<Interval timer="timerAlarm" duration="60" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3114" >
+<SUBCOMPONENT type="630" id="3128" >
<father id="3185" num="3" />
-<cdparam x="306" y="162" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3113" />
+<TGConnectingPoint num="0" id="3127" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3116" >
+<SUBCOMPONENT type="630" id="3130" >
<father id="3185" num="4" />
-<cdparam x="306" y="179" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3115" />
+<TGConnectingPoint num="0" id="3129" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3118" >
+<SUBCOMPONENT type="630" id="3132" >
<father id="3185" num="5" />
-<cdparam x="306" y="196" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3117" />
+<TGConnectingPoint num="0" id="3131" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3120" >
+<SUBCOMPONENT type="630" id="3134" >
<father id="3185" num="6" />
-<cdparam x="306" y="212" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3119" />
+<TGConnectingPoint num="0" id="3133" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3122" >
+<SUBCOMPONENT type="630" id="3136" >
<father id="3185" num="7" />
-<cdparam x="306" y="229" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3121" />
+<TGConnectingPoint num="0" id="3135" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3124" >
+<SUBCOMPONENT type="630" id="3138" >
<father id="3185" num="8" />
-<cdparam x="306" y="246" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3123" />
+<TGConnectingPoint num="0" id="3137" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3126" >
+<SUBCOMPONENT type="630" id="3140" >
<father id="3185" num="9" />
-<cdparam x="306" y="262" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3125" />
+<TGConnectingPoint num="0" id="3139" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3128" >
+<SUBCOMPONENT type="630" id="3142" >
<father id="3185" num="10" />
-<cdparam x="306" y="279" />
+<cdparam x="306" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3127" />
+<TGConnectingPoint num="0" id="3141" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3130" >
+<SUBCOMPONENT type="630" id="3144" >
<father id="3185" num="11" />
-<cdparam x="306" y="296" />
+<cdparam x="306" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3129" />
+<TGConnectingPoint num="0" id="3143" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3132" >
+<SUBCOMPONENT type="630" id="3146" >
<father id="3185" num="12" />
-<cdparam x="306" y="312" />
+<cdparam x="306" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3131" />
+<TGConnectingPoint num="0" id="3145" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3134" >
+<SUBCOMPONENT type="630" id="3148" >
<father id="3185" num="13" />
-<cdparam x="306" y="329" />
+<cdparam x="306" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3133" />
+<TGConnectingPoint num="0" id="3147" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3136" >
+<SUBCOMPONENT type="630" id="3150" >
<father id="3185" num="14" />
-<cdparam x="306" y="346" />
+<cdparam x="306" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3135" />
+<TGConnectingPoint num="0" id="3149" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3138" >
+<SUBCOMPONENT type="630" id="3152" >
<father id="3185" num="15" />
-<cdparam x="306" y="362" />
+<cdparam x="306" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3137" />
+<TGConnectingPoint num="0" id="3151" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3140" >
+<SUBCOMPONENT type="630" id="3154" >
<father id="3185" num="16" />
-<cdparam x="306" y="379" />
+<cdparam x="306" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3139" />
+<TGConnectingPoint num="0" id="3153" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3142" >
+<SUBCOMPONENT type="630" id="3156" >
<father id="3185" num="17" />
-<cdparam x="306" y="396" />
+<cdparam x="306" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3141" />
+<TGConnectingPoint num="0" id="3155" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3144" >
+<SUBCOMPONENT type="630" id="3158" >
<father id="3185" num="18" />
-<cdparam x="306" y="412" />
+<cdparam x="306" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3143" />
+<TGConnectingPoint num="0" id="3157" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3146" >
+<SUBCOMPONENT type="630" id="3160" >
<father id="3185" num="19" />
-<cdparam x="306" y="429" />
+<cdparam x="306" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3145" />
+<TGConnectingPoint num="0" id="3159" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3148" >
+<SUBCOMPONENT type="630" id="3162" >
<father id="3185" num="20" />
-<cdparam x="306" y="446" />
+<cdparam x="306" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3147" />
+<TGConnectingPoint num="0" id="3161" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3150" >
+<SUBCOMPONENT type="630" id="3164" >
<father id="3185" num="21" />
-<cdparam x="306" y="462" />
+<cdparam x="306" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3149" />
+<TGConnectingPoint num="0" id="3163" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3152" >
+<SUBCOMPONENT type="630" id="3166" >
<father id="3185" num="22" />
-<cdparam x="306" y="479" />
+<cdparam x="306" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3151" />
+<TGConnectingPoint num="0" id="3165" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3154" >
+<SUBCOMPONENT type="630" id="3168" >
<father id="3185" num="23" />
-<cdparam x="306" y="496" />
+<cdparam x="306" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3153" />
+<TGConnectingPoint num="0" id="3167" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3156" >
+<SUBCOMPONENT type="630" id="3170" >
<father id="3185" num="24" />
-<cdparam x="306" y="512" />
+<cdparam x="306" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3155" />
+<TGConnectingPoint num="0" id="3169" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3158" >
+<SUBCOMPONENT type="630" id="3172" >
<father id="3185" num="25" />
-<cdparam x="306" y="529" />
+<cdparam x="306" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3157" />
+<TGConnectingPoint num="0" id="3171" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3160" >
+<SUBCOMPONENT type="630" id="3174" >
<father id="3185" num="26" />
-<cdparam x="306" y="546" />
+<cdparam x="306" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3159" />
+<TGConnectingPoint num="0" id="3173" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3162" >
+<SUBCOMPONENT type="630" id="3176" >
<father id="3185" num="27" />
-<cdparam x="306" y="562" />
+<cdparam x="306" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3161" />
+<TGConnectingPoint num="0" id="3175" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3164" >
+<SUBCOMPONENT type="630" id="3178" >
<father id="3185" num="28" />
-<cdparam x="306" y="571" />
+<cdparam x="306" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3163" />
+<TGConnectingPoint num="0" id="3177" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="625" id="3173" >
+<SUBCOMPONENT type="630" id="3180" >
<father id="3185" num="29" />
-<cdparam x="319" y="296" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="306" y="146" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="382" />
-<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
-<TGConnectingPoint num="0" id="3165" />
-<TGConnectingPoint num="1" id="3166" />
-<TGConnectingPoint num="2" id="3167" />
-<TGConnectingPoint num="3" id="3168" />
-<TGConnectingPoint num="4" id="3169" />
-<TGConnectingPoint num="5" id="3170" />
-<TGConnectingPoint num="6" id="3171" />
-<TGConnectingPoint num="7" id="3172" />
-<extraparam>
-<Interval timer="timerAlarm" duration="60" />
-</extraparam>
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="3179" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="3182" >
+<SUBCOMPONENT type="630" id="3182" >
<father id="3185" num="30" />
-<cdparam x="319" y="391" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="306" y="129" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="382" />
-<infoparam name="timer expiration" value="{timer=timerAlarm}" />
-<TGConnectingPoint num="0" id="3174" />
-<TGConnectingPoint num="1" id="3175" />
-<TGConnectingPoint num="2" id="3176" />
-<TGConnectingPoint num="3" id="3177" />
-<TGConnectingPoint num="4" id="3178" />
-<TGConnectingPoint num="5" id="3179" />
-<TGConnectingPoint num="6" id="3180" />
-<TGConnectingPoint num="7" id="3181" />
-<extraparam>
-<Interval timer="timerAlarm" />
-</extraparam>
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="3181" />
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3184" >
<father id="3185" num="31" />
-<cdparam x="306" y="106" />
+<cdparam x="306" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7916,7 +7916,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3187" >
<father id="3246" num="0" />
-<cdparam x="156" y="112" />
+<cdparam x="156" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7925,7 +7925,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3189" >
<father id="3246" num="1" />
-<cdparam x="156" y="129" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7934,7 +7934,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3191" >
<father id="3246" num="2" />
-<cdparam x="156" y="146" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7943,7 +7943,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3193" >
<father id="3246" num="3" />
-<cdparam x="156" y="162" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7952,7 +7952,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3195" >
<father id="3246" num="4" />
-<cdparam x="156" y="179" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7961,7 +7961,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3197" >
<father id="3246" num="5" />
-<cdparam x="156" y="196" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7970,7 +7970,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3199" >
<father id="3246" num="6" />
-<cdparam x="156" y="212" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7979,7 +7979,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3201" >
<father id="3246" num="7" />
-<cdparam x="156" y="229" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7988,7 +7988,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3203" >
<father id="3246" num="8" />
-<cdparam x="156" y="246" />
+<cdparam x="156" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7997,7 +7997,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3205" >
<father id="3246" num="9" />
-<cdparam x="156" y="262" />
+<cdparam x="156" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8006,7 +8006,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3207" >
<father id="3246" num="10" />
-<cdparam x="156" y="279" />
+<cdparam x="156" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8015,7 +8015,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3209" >
<father id="3246" num="11" />
-<cdparam x="156" y="296" />
+<cdparam x="156" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8024,7 +8024,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3211" >
<father id="3246" num="12" />
-<cdparam x="156" y="312" />
+<cdparam x="156" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8033,7 +8033,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3213" >
<father id="3246" num="13" />
-<cdparam x="156" y="329" />
+<cdparam x="156" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8042,7 +8042,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3215" >
<father id="3246" num="14" />
-<cdparam x="156" y="346" />
+<cdparam x="156" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8051,7 +8051,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3217" >
<father id="3246" num="15" />
-<cdparam x="156" y="362" />
+<cdparam x="156" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8060,7 +8060,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3219" >
<father id="3246" num="16" />
-<cdparam x="156" y="379" />
+<cdparam x="156" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8069,7 +8069,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3221" >
<father id="3246" num="17" />
-<cdparam x="156" y="396" />
+<cdparam x="156" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8078,7 +8078,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3223" >
<father id="3246" num="18" />
-<cdparam x="156" y="412" />
+<cdparam x="156" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8087,7 +8087,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3225" >
<father id="3246" num="19" />
-<cdparam x="156" y="429" />
+<cdparam x="156" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8096,7 +8096,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3227" >
<father id="3246" num="20" />
-<cdparam x="156" y="446" />
+<cdparam x="156" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8105,7 +8105,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3229" >
<father id="3246" num="21" />
-<cdparam x="156" y="462" />
+<cdparam x="156" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8114,7 +8114,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3231" >
<father id="3246" num="22" />
-<cdparam x="156" y="479" />
+<cdparam x="156" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8123,7 +8123,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3233" >
<father id="3246" num="23" />
-<cdparam x="156" y="496" />
+<cdparam x="156" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8132,7 +8132,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3235" >
<father id="3246" num="24" />
-<cdparam x="156" y="512" />
+<cdparam x="156" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8141,7 +8141,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3237" >
<father id="3246" num="25" />
-<cdparam x="156" y="529" />
+<cdparam x="156" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8150,7 +8150,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3239" >
<father id="3246" num="26" />
-<cdparam x="156" y="546" />
+<cdparam x="156" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8159,7 +8159,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3241" >
<father id="3246" num="27" />
-<cdparam x="156" y="562" />
+<cdparam x="156" y="146" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8168,7 +8168,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3243" >
<father id="3246" num="28" />
-<cdparam x="156" y="571" />
+<cdparam x="156" y="129" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8177,7 +8177,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3245" >
<father id="3246" num="29" />
-<cdparam x="156" y="106" />
+<cdparam x="156" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8189,48 +8189,48 @@
<cdparam x="306" y="486" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(16)" />
-<P1 x="306" y="486" id="3151" />
-<P2 x="456" y="486" id="3090" />
+<P1 x="306" y="482" id="3139" />
+<P2 x="456" y="482" id="3060" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3248" >
<cdparam x="306" y="253" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(21)" />
-<P1 x="306" y="253" id="3123" />
-<P2 x="456" y="253" id="3062" />
+<P1 x="306" y="253" id="3167" />
+<P2 x="456" y="253" id="3088" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3249" >
<cdparam x="306" y="219" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(18)" />
-<P1 x="306" y="219" id="3119" />
-<P2 x="456" y="219" id="3058" />
+<P1 x="306" y="219" id="3171" />
+<P2 x="456" y="219" id="3092" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3250" >
<cdparam x="306" y="186" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(19)" />
-<P1 x="306" y="186" id="3115" />
-<P2 x="456" y="186" id="3054" />
+<P1 x="306" y="186" id="3175" />
+<P2 x="456" y="186" id="3096" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3251" >
<cdparam x="306" y="153" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(19)" />
-<P1 x="306" y="153" id="3111" />
-<P2 x="456" y="153" id="3050" />
+<P1 x="306" y="153" id="3179" />
+<P2 x="456" y="153" id="3100" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3252" >
<cdparam x="156" y="469" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(16)" />
-<P1 x="156" y="469" id="3228" />
-<P2 x="306" y="469" id="3149" />
+<P1 x="156" y="469" id="3202" />
+<P2 x="306" y="469" id="3141" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3253" >
@@ -8238,47 +8238,47 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="stopAlarm" />
<P1 x="306" y="436" id="3145" />
-<P2 x="606" y="436" id="3023" />
+<P2 x="606" y="436" id="3005" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3254" >
<cdparam x="306" y="269" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="startAlarm" />
-<P1 x="306" y="269" id="3125" />
-<P2 x="606" y="269" id="3003" />
+<P1 x="306" y="269" id="3165" />
+<P2 x="606" y="269" id="3025" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3255" >
<cdparam x="156" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="156" y="236" id="3200" />
-<P2 x="306" y="236" id="3121" />
+<P1 x="156" y="236" id="3230" />
+<P2 x="306" y="236" id="3169" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3256" >
<cdparam x="156" y="203" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(18)" />
-<P1 x="156" y="203" id="3196" />
-<P2 x="306" y="203" id="3117" />
+<P1 x="156" y="203" id="3234" />
+<P2 x="306" y="203" id="3173" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3257" >
<cdparam x="156" y="169" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure19" />
-<P1 x="156" y="169" id="3192" />
-<P2 x="306" y="169" id="3113" />
+<P1 x="156" y="169" id="3238" />
+<P2 x="306" y="169" id="3177" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3258" >
<cdparam x="156" y="136" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(19)" />
-<P1 x="156" y="136" id="3188" />
-<P2 x="306" y="136" id="3109" />
+<P1 x="156" y="136" id="3242" />
+<P2 x="306" y="136" id="3181" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -8297,7 +8297,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3260" >
<father id="3319" num="0" />
-<cdparam x="589" y="97" />
+<cdparam x="589" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8306,7 +8306,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3262" >
<father id="3319" num="1" />
-<cdparam x="589" y="91" />
+<cdparam x="589" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8315,7 +8315,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3264" >
<father id="3319" num="2" />
-<cdparam x="589" y="556" />
+<cdparam x="589" y="147" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8324,7 +8324,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3266" >
<father id="3319" num="3" />
-<cdparam x="589" y="547" />
+<cdparam x="589" y="164" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8333,7 +8333,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3268" >
<father id="3319" num="4" />
-<cdparam x="589" y="531" />
+<cdparam x="589" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8342,7 +8342,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3270" >
<father id="3319" num="5" />
-<cdparam x="589" y="514" />
+<cdparam x="589" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8351,7 +8351,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3272" >
<father id="3319" num="6" />
-<cdparam x="589" y="497" />
+<cdparam x="589" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8360,7 +8360,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3274" >
<father id="3319" num="7" />
-<cdparam x="589" y="481" />
+<cdparam x="589" y="231" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8369,7 +8369,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3276" >
<father id="3319" num="8" />
-<cdparam x="589" y="464" />
+<cdparam x="589" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8378,7 +8378,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3278" >
<father id="3319" num="9" />
-<cdparam x="589" y="447" />
+<cdparam x="589" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8387,7 +8387,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3280" >
<father id="3319" num="10" />
-<cdparam x="589" y="431" />
+<cdparam x="589" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8396,7 +8396,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3282" >
<father id="3319" num="11" />
-<cdparam x="589" y="414" />
+<cdparam x="589" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8405,7 +8405,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3284" >
<father id="3319" num="12" />
-<cdparam x="589" y="397" />
+<cdparam x="589" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8414,7 +8414,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3286" >
<father id="3319" num="13" />
-<cdparam x="589" y="381" />
+<cdparam x="589" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8423,7 +8423,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3288" >
<father id="3319" num="14" />
-<cdparam x="589" y="364" />
+<cdparam x="589" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8432,7 +8432,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3290" >
<father id="3319" num="15" />
-<cdparam x="589" y="347" />
+<cdparam x="589" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8441,7 +8441,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3292" >
<father id="3319" num="16" />
-<cdparam x="589" y="331" />
+<cdparam x="589" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8450,7 +8450,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3294" >
<father id="3319" num="17" />
-<cdparam x="589" y="314" />
+<cdparam x="589" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8459,7 +8459,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3296" >
<father id="3319" num="18" />
-<cdparam x="589" y="297" />
+<cdparam x="589" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8468,7 +8468,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3298" >
<father id="3319" num="19" />
-<cdparam x="589" y="281" />
+<cdparam x="589" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8477,7 +8477,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3300" >
<father id="3319" num="20" />
-<cdparam x="589" y="264" />
+<cdparam x="589" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8486,7 +8486,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3302" >
<father id="3319" num="21" />
-<cdparam x="589" y="247" />
+<cdparam x="589" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8495,7 +8495,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3304" >
<father id="3319" num="22" />
-<cdparam x="589" y="231" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8504,7 +8504,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3306" >
<father id="3319" num="23" />
-<cdparam x="589" y="214" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8513,7 +8513,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3308" >
<father id="3319" num="24" />
-<cdparam x="589" y="197" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8522,7 +8522,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3310" >
<father id="3319" num="25" />
-<cdparam x="589" y="181" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8531,7 +8531,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3312" >
<father id="3319" num="26" />
-<cdparam x="589" y="164" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8540,7 +8540,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3314" >
<father id="3319" num="27" />
-<cdparam x="589" y="147" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8549,7 +8549,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3316" >
<father id="3319" num="28" />
-<cdparam x="589" y="131" />
+<cdparam x="589" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8558,7 +8558,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3318" >
<father id="3319" num="29" />
-<cdparam x="589" y="114" />
+<cdparam x="589" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8578,7 +8578,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3321" >
<father id="3380" num="0" />
-<cdparam x="439" y="97" />
+<cdparam x="439" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8587,7 +8587,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3323" >
<father id="3380" num="1" />
-<cdparam x="439" y="91" />
+<cdparam x="439" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8596,7 +8596,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3325" >
<father id="3380" num="2" />
-<cdparam x="439" y="556" />
+<cdparam x="439" y="147" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8605,7 +8605,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3327" >
<father id="3380" num="3" />
-<cdparam x="439" y="547" />
+<cdparam x="439" y="164" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8614,7 +8614,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3329" >
<father id="3380" num="4" />
-<cdparam x="439" y="531" />
+<cdparam x="439" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8623,7 +8623,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3331" >
<father id="3380" num="5" />
-<cdparam x="439" y="514" />
+<cdparam x="439" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8632,7 +8632,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3333" >
<father id="3380" num="6" />
-<cdparam x="439" y="497" />
+<cdparam x="439" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8641,7 +8641,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3335" >
<father id="3380" num="7" />
-<cdparam x="439" y="481" />
+<cdparam x="439" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8650,7 +8650,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3337" >
<father id="3380" num="8" />
-<cdparam x="439" y="464" />
+<cdparam x="439" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8659,7 +8659,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3339" >
<father id="3380" num="9" />
-<cdparam x="439" y="447" />
+<cdparam x="439" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8668,7 +8668,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3341" >
<father id="3380" num="10" />
-<cdparam x="439" y="431" />
+<cdparam x="439" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8677,7 +8677,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3343" >
<father id="3380" num="11" />
-<cdparam x="439" y="414" />
+<cdparam x="439" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8686,7 +8686,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3345" >
<father id="3380" num="12" />
-<cdparam x="439" y="397" />
+<cdparam x="439" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8695,7 +8695,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3347" >
<father id="3380" num="13" />
-<cdparam x="439" y="381" />
+<cdparam x="439" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8704,7 +8704,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3349" >
<father id="3380" num="14" />
-<cdparam x="439" y="364" />
+<cdparam x="439" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8713,7 +8713,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3351" >
<father id="3380" num="15" />
-<cdparam x="439" y="347" />
+<cdparam x="439" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8722,7 +8722,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3353" >
<father id="3380" num="16" />
-<cdparam x="439" y="331" />
+<cdparam x="439" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8731,7 +8731,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3355" >
<father id="3380" num="17" />
-<cdparam x="439" y="314" />
+<cdparam x="439" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8740,7 +8740,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3357" >
<father id="3380" num="18" />
-<cdparam x="439" y="297" />
+<cdparam x="439" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8749,7 +8749,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3359" >
<father id="3380" num="19" />
-<cdparam x="439" y="281" />
+<cdparam x="439" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8758,7 +8758,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3361" >
<father id="3380" num="20" />
-<cdparam x="439" y="264" />
+<cdparam x="439" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8767,7 +8767,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3363" >
<father id="3380" num="21" />
-<cdparam x="439" y="247" />
+<cdparam x="439" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8776,7 +8776,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3365" >
<father id="3380" num="22" />
-<cdparam x="439" y="327" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8785,7 +8785,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3367" >
<father id="3380" num="23" />
-<cdparam x="439" y="214" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8794,7 +8794,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3369" >
<father id="3380" num="24" />
-<cdparam x="439" y="197" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8803,7 +8803,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3371" >
<father id="3380" num="25" />
-<cdparam x="439" y="181" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8812,7 +8812,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3373" >
<father id="3380" num="26" />
-<cdparam x="439" y="164" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8821,7 +8821,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3375" >
<father id="3380" num="27" />
-<cdparam x="439" y="147" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8830,7 +8830,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3377" >
<father id="3380" num="28" />
-<cdparam x="439" y="131" />
+<cdparam x="439" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8839,7 +8839,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3379" >
<father id="3380" num="29" />
-<cdparam x="439" y="114" />
+<cdparam x="439" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8859,7 +8859,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3382" >
<father id="3459" num="0" />
-<cdparam x="289" y="97" />
+<cdparam x="289" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8868,288 +8868,288 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3384" >
<father id="3459" num="1" />
-<cdparam x="289" y="91" />
+<cdparam x="289" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="3383" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="3393" >
+<SUBCOMPONENT type="630" id="3386" >
<father id="3459" num="2" />
-<cdparam x="302" y="376" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="289" y="147" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="391" />
-<infoparam name="timer expiration" value="{timer=timerAlarm}" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
+<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="3385" />
-<TGConnectingPoint num="1" id="3386" />
-<TGConnectingPoint num="2" id="3387" />
-<TGConnectingPoint num="3" id="3388" />
-<TGConnectingPoint num="4" id="3389" />
-<TGConnectingPoint num="5" id="3390" />
-<TGConnectingPoint num="6" id="3391" />
-<TGConnectingPoint num="7" id="3392" />
-<extraparam>
-<Interval timer="timerAlarm" />
-</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="625" id="3402" >
+<SUBCOMPONENT type="630" id="3388" >
<father id="3459" num="3" />
-<cdparam x="302" y="281" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="289" y="164" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="391" />
-<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
-<TGConnectingPoint num="0" id="3394" />
-<TGConnectingPoint num="1" id="3395" />
-<TGConnectingPoint num="2" id="3396" />
-<TGConnectingPoint num="3" id="3397" />
-<TGConnectingPoint num="4" id="3398" />
-<TGConnectingPoint num="5" id="3399" />
-<TGConnectingPoint num="6" id="3400" />
-<TGConnectingPoint num="7" id="3401" />
-<extraparam>
-<Interval timer="timerAlarm" duration="60" />
-</extraparam>
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="3387" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3404" >
+<SUBCOMPONENT type="630" id="3390" >
<father id="3459" num="4" />
-<cdparam x="289" y="556" />
+<cdparam x="289" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3403" />
+<TGConnectingPoint num="0" id="3389" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3406" >
+<SUBCOMPONENT type="630" id="3392" >
<father id="3459" num="5" />
-<cdparam x="289" y="547" />
+<cdparam x="289" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3405" />
+<TGConnectingPoint num="0" id="3391" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3408" >
+<SUBCOMPONENT type="630" id="3394" >
<father id="3459" num="6" />
-<cdparam x="289" y="531" />
+<cdparam x="289" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3407" />
+<TGConnectingPoint num="0" id="3393" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3410" >
+<SUBCOMPONENT type="630" id="3396" >
<father id="3459" num="7" />
-<cdparam x="289" y="514" />
+<cdparam x="289" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3409" />
+<TGConnectingPoint num="0" id="3395" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3412" >
+<SUBCOMPONENT type="630" id="3398" >
<father id="3459" num="8" />
-<cdparam x="289" y="497" />
+<cdparam x="289" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3411" />
+<TGConnectingPoint num="0" id="3397" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3414" >
+<SUBCOMPONENT type="630" id="3400" >
<father id="3459" num="9" />
-<cdparam x="289" y="481" />
+<cdparam x="289" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3413" />
+<TGConnectingPoint num="0" id="3399" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3416" >
+<SUBCOMPONENT type="630" id="3402" >
<father id="3459" num="10" />
-<cdparam x="289" y="464" />
+<cdparam x="289" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3415" />
+<TGConnectingPoint num="0" id="3401" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3418" >
+<SUBCOMPONENT type="630" id="3404" >
<father id="3459" num="11" />
-<cdparam x="289" y="447" />
+<cdparam x="289" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3417" />
+<TGConnectingPoint num="0" id="3403" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3420" >
+<SUBCOMPONENT type="630" id="3406" >
<father id="3459" num="12" />
-<cdparam x="289" y="431" />
+<cdparam x="289" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3419" />
+<TGConnectingPoint num="0" id="3405" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3422" >
+<SUBCOMPONENT type="630" id="3408" >
<father id="3459" num="13" />
-<cdparam x="289" y="414" />
+<cdparam x="289" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3421" />
+<TGConnectingPoint num="0" id="3407" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3424" >
+<SUBCOMPONENT type="630" id="3410" >
<father id="3459" num="14" />
-<cdparam x="289" y="397" />
+<cdparam x="289" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3423" />
+<TGConnectingPoint num="0" id="3409" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3426" >
+<SUBCOMPONENT type="630" id="3412" >
<father id="3459" num="15" />
-<cdparam x="289" y="381" />
+<cdparam x="289" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3425" />
+<TGConnectingPoint num="0" id="3411" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3428" >
+<SUBCOMPONENT type="630" id="3414" >
<father id="3459" num="16" />
-<cdparam x="289" y="364" />
+<cdparam x="289" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3427" />
+<TGConnectingPoint num="0" id="3413" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3430" >
+<SUBCOMPONENT type="630" id="3416" >
<father id="3459" num="17" />
-<cdparam x="289" y="347" />
+<cdparam x="289" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3429" />
+<TGConnectingPoint num="0" id="3415" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3432" >
+<SUBCOMPONENT type="630" id="3418" >
<father id="3459" num="18" />
-<cdparam x="289" y="331" />
+<cdparam x="289" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3431" />
+<TGConnectingPoint num="0" id="3417" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3434" >
+<SUBCOMPONENT type="630" id="3420" >
<father id="3459" num="19" />
-<cdparam x="289" y="314" />
+<cdparam x="289" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3433" />
+<TGConnectingPoint num="0" id="3419" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3436" >
+<SUBCOMPONENT type="630" id="3422" >
<father id="3459" num="20" />
-<cdparam x="289" y="297" />
+<cdparam x="289" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3435" />
+<TGConnectingPoint num="0" id="3421" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3438" >
+<SUBCOMPONENT type="630" id="3424" >
<father id="3459" num="21" />
-<cdparam x="289" y="281" />
+<cdparam x="289" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3437" />
+<TGConnectingPoint num="0" id="3423" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3440" >
+<SUBCOMPONENT type="630" id="3426" >
<father id="3459" num="22" />
-<cdparam x="289" y="264" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3439" />
+<TGConnectingPoint num="0" id="3425" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3442" >
+<SUBCOMPONENT type="630" id="3428" >
<father id="3459" num="23" />
-<cdparam x="289" y="247" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3441" />
+<TGConnectingPoint num="0" id="3427" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3444" >
+<SUBCOMPONENT type="630" id="3430" >
<father id="3459" num="24" />
-<cdparam x="289" y="327" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3443" />
+<TGConnectingPoint num="0" id="3429" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3446" >
+<SUBCOMPONENT type="630" id="3432" >
<father id="3459" num="25" />
-<cdparam x="289" y="214" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3445" />
+<TGConnectingPoint num="0" id="3431" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3448" >
+<SUBCOMPONENT type="630" id="3434" >
<father id="3459" num="26" />
-<cdparam x="289" y="197" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3447" />
+<TGConnectingPoint num="0" id="3433" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3450" >
+<SUBCOMPONENT type="630" id="3436" >
<father id="3459" num="27" />
-<cdparam x="289" y="181" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3449" />
+<TGConnectingPoint num="0" id="3435" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3452" >
+<SUBCOMPONENT type="625" id="3445" >
<father id="3459" num="28" />
-<cdparam x="289" y="164" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="302" y="281" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3451" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="391" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
+<TGConnectingPoint num="0" id="3437" />
+<TGConnectingPoint num="1" id="3438" />
+<TGConnectingPoint num="2" id="3439" />
+<TGConnectingPoint num="3" id="3440" />
+<TGConnectingPoint num="4" id="3441" />
+<TGConnectingPoint num="5" id="3442" />
+<TGConnectingPoint num="6" id="3443" />
+<TGConnectingPoint num="7" id="3444" />
+<extraparam>
+<Interval timer="timerAlarm" duration="60" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3454" >
+<SUBCOMPONENT type="627" id="3454" >
<father id="3459" num="29" />
-<cdparam x="289" y="147" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="302" y="376" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3453" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="391" />
+<infoparam name="timer expiration" value="{timer=timerAlarm}" />
+<TGConnectingPoint num="0" id="3446" />
+<TGConnectingPoint num="1" id="3447" />
+<TGConnectingPoint num="2" id="3448" />
+<TGConnectingPoint num="3" id="3449" />
+<TGConnectingPoint num="4" id="3450" />
+<TGConnectingPoint num="5" id="3451" />
+<TGConnectingPoint num="6" id="3452" />
+<TGConnectingPoint num="7" id="3453" />
+<extraparam>
+<Interval timer="timerAlarm" />
+</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3456" >
<father id="3459" num="30" />
-<cdparam x="289" y="131" />
+<cdparam x="289" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9158,7 +9158,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3458" >
<father id="3459" num="31" />
-<cdparam x="289" y="114" />
+<cdparam x="289" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9178,7 +9178,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3461" >
<father id="3520" num="0" />
-<cdparam x="139" y="97" />
+<cdparam x="139" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9187,7 +9187,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3463" >
<father id="3520" num="1" />
-<cdparam x="139" y="91" />
+<cdparam x="139" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9196,7 +9196,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3465" >
<father id="3520" num="2" />
-<cdparam x="139" y="556" />
+<cdparam x="139" y="147" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9205,7 +9205,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3467" >
<father id="3520" num="3" />
-<cdparam x="139" y="547" />
+<cdparam x="139" y="164" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9214,7 +9214,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3469" >
<father id="3520" num="4" />
-<cdparam x="139" y="531" />
+<cdparam x="139" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9223,7 +9223,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3471" >
<father id="3520" num="5" />
-<cdparam x="139" y="514" />
+<cdparam x="139" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9232,7 +9232,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3473" >
<father id="3520" num="6" />
-<cdparam x="139" y="497" />
+<cdparam x="139" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9241,7 +9241,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3475" >
<father id="3520" num="7" />
-<cdparam x="139" y="481" />
+<cdparam x="139" y="231" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9250,7 +9250,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3477" >
<father id="3520" num="8" />
-<cdparam x="139" y="464" />
+<cdparam x="139" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9259,7 +9259,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3479" >
<father id="3520" num="9" />
-<cdparam x="139" y="447" />
+<cdparam x="139" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9268,7 +9268,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3481" >
<father id="3520" num="10" />
-<cdparam x="139" y="431" />
+<cdparam x="139" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9277,7 +9277,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3483" >
<father id="3520" num="11" />
-<cdparam x="139" y="414" />
+<cdparam x="139" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9286,7 +9286,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3485" >
<father id="3520" num="12" />
-<cdparam x="139" y="397" />
+<cdparam x="139" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9295,7 +9295,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3487" >
<father id="3520" num="13" />
-<cdparam x="139" y="381" />
+<cdparam x="139" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9304,7 +9304,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3489" >
<father id="3520" num="14" />
-<cdparam x="139" y="364" />
+<cdparam x="139" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9313,7 +9313,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3491" >
<father id="3520" num="15" />
-<cdparam x="139" y="347" />
+<cdparam x="139" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9322,7 +9322,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3493" >
<father id="3520" num="16" />
-<cdparam x="139" y="331" />
+<cdparam x="139" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9331,7 +9331,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3495" >
<father id="3520" num="17" />
-<cdparam x="139" y="314" />
+<cdparam x="139" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9340,7 +9340,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3497" >
<father id="3520" num="18" />
-<cdparam x="139" y="297" />
+<cdparam x="139" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9349,7 +9349,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3499" >
<father id="3520" num="19" />
-<cdparam x="139" y="281" />
+<cdparam x="139" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9358,7 +9358,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3501" >
<father id="3520" num="20" />
-<cdparam x="139" y="264" />
+<cdparam x="139" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9367,7 +9367,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3503" >
<father id="3520" num="21" />
-<cdparam x="139" y="247" />
+<cdparam x="139" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9376,7 +9376,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3505" >
<father id="3520" num="22" />
-<cdparam x="139" y="231" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9385,7 +9385,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3507" >
<father id="3520" num="23" />
-<cdparam x="139" y="214" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9394,7 +9394,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3509" >
<father id="3520" num="24" />
-<cdparam x="139" y="197" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9403,7 +9403,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3511" >
<father id="3520" num="25" />
-<cdparam x="139" y="181" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9412,7 +9412,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3513" >
<father id="3520" num="26" />
-<cdparam x="139" y="164" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9421,7 +9421,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3515" >
<father id="3520" num="27" />
-<cdparam x="139" y="147" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9430,7 +9430,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3517" >
<father id="3520" num="28" />
-<cdparam x="139" y="131" />
+<cdparam x="139" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9439,7 +9439,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3519" >
<father id="3520" num="29" />
-<cdparam x="139" y="114" />
+<cdparam x="139" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9451,96 +9451,96 @@
<cdparam x="289" y="471" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(16)" />
-<P1 x="289" y="471" id="3415" />
-<P2 x="439" y="471" id="3336" />
+<P1 x="289" y="471" id="3423" />
+<P2 x="439" y="471" id="3362" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3522" >
<cdparam x="289" y="238" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(21)" />
-<P1 x="289" y="334" id="3443" />
-<P2 x="439" y="334" id="3364" />
+<P1 x="289" y="334" id="3395" />
+<P2 x="439" y="334" id="3334" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3523" >
<cdparam x="289" y="204" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(18)" />
-<P1 x="289" y="204" id="3447" />
-<P2 x="439" y="204" id="3368" />
+<P1 x="289" y="204" id="3391" />
+<P2 x="439" y="204" id="3330" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3524" >
<cdparam x="289" y="171" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(19)" />
-<P1 x="289" y="171" id="3451" />
-<P2 x="439" y="171" id="3372" />
+<P1 x="289" y="171" id="3387" />
+<P2 x="439" y="171" id="3326" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3525" >
<cdparam x="289" y="138" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(19)" />
-<P1 x="289" y="138" id="3455" />
-<P2 x="439" y="138" id="3376" />
+<P1 x="289" y="138" id="3383" />
+<P2 x="439" y="138" id="3322" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3526" >
<cdparam x="139" y="454" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(16)" />
-<P1 x="139" y="454" id="3478" />
-<P2 x="289" y="454" id="3417" />
+<P1 x="139" y="454" id="3500" />
+<P2 x="289" y="454" id="3421" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3527" >
<cdparam x="289" y="421" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="stopAlarm" />
-<P1 x="289" y="421" id="3421" />
-<P2 x="589" y="421" id="3281" />
+<P1 x="289" y="421" id="3417" />
+<P2 x="589" y="421" id="3295" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3528" >
<cdparam x="289" y="254" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="startAlarm" />
-<P1 x="289" y="254" id="3441" />
-<P2 x="589" y="254" id="3301" />
+<P1 x="289" y="254" id="3397" />
+<P2 x="589" y="254" id="3275" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3529" >
<cdparam x="139" y="221" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="139" y="221" id="3506" />
-<P2 x="289" y="221" id="3445" />
+<P1 x="139" y="221" id="3472" />
+<P2 x="289" y="221" id="3393" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3530" >
<cdparam x="139" y="188" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(18)" />
-<P1 x="139" y="188" id="3510" />
-<P2 x="289" y="188" id="3449" />
+<P1 x="139" y="188" id="3468" />
+<P2 x="289" y="188" id="3389" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3531" >
<cdparam x="139" y="154" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure19" />
-<P1 x="139" y="154" id="3514" />
-<P2 x="289" y="154" id="3453" />
+<P1 x="139" y="154" id="3464" />
+<P2 x="289" y="154" id="3385" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3532" >
<cdparam x="139" y="121" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(19)" />
-<P1 x="139" y="121" id="3518" />
-<P2 x="289" y="121" id="3457" />
+<P1 x="139" y="121" id="3460" />
+<P2 x="289" y="121" id="3381" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -9651,7 +9651,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3533" />
-<P1 x="964" y="240" id="3635" />
+<P1 x="964" y="240" id="3610" />
<P2 x="1088" y="240" id="3559" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -9667,8 +9667,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3535" />
-<P1 x="659" y="240" id="3610" />
-<P2 x="714" y="240" id="3634" />
+<P1 x="659" y="240" id="3635" />
+<P2 x="714" y="240" id="3609" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -9682,7 +9682,7 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3537" />
<P1 x="325" y="241" id="3585" />
-<P2 x="409" y="240" id="3609" />
+<P2 x="409" y="240" id="3634" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -9692,7 +9692,7 @@
</CONNECTOR>
<COMPONENT type="303" id="3555" >
<cdparam x="443" y="462" />
-<sizeparam width="427" height="240" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="460" height="240" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="UPPAAL Pragma" value="A[] MainController.currentPressure < 20
@@ -9887,11 +9887,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="3630" >
<father id="3680" num="0" />
-<cdparam x="409" y="140" />
+<cdparam x="714" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="MainController" />
+<infoparam name="Block0" value="AlarmManager" />
<TGConnectingPoint num="0" id="3606" />
<TGConnectingPoint num="1" id="3607" />
<TGConnectingPoint num="2" id="3608" />
@@ -9919,19 +9919,20 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
-<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
-<Signal value="in pressureValue(int value)" attached="true" />
-<Signal value="out highPressure()" attached="true" />
+<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
+<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
+<Signal value="in highPressure()" attached="true" />
+<Signal value="out alarmOff()" attached="true" />
+<Signal value="out alarmOn()" attached="true" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="3655" >
<father id="3680" num="1" />
-<cdparam x="714" y="140" />
+<cdparam x="409" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="AlarmManager" />
+<infoparam name="Block0" value="MainController" />
<TGConnectingPoint num="0" id="3631" />
<TGConnectingPoint num="1" id="3632" />
<TGConnectingPoint num="2" id="3633" />
@@ -9959,11 +9960,10 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
-<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
-<Signal value="in highPressure()" attached="true" />
-<Signal value="out alarmOff()" attached="true" />
-<Signal value="out alarmOn()" attached="true" />
+<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
+<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
+<Signal value="in pressureValue(int value)" attached="true" />
+<Signal value="out highPressure()" attached="true" />
</extraparam>
</SUBCOMPONENT>
@@ -12352,7 +12352,7 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="4623" />
-<P1 x="964" y="240" id="4683" />
+<P1 x="964" y="240" id="4708" />
<P2 x="1088" y="240" id="4632" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -12368,8 +12368,8 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="4625" />
-<P1 x="659" y="240" id="4708" />
-<P2 x="714" y="240" id="4682" />
+<P1 x="659" y="240" id="4683" />
+<P2 x="714" y="240" id="4707" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -12383,7 +12383,7 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="4627" />
<P1 x="325" y="241" id="4658" />
-<P2 x="409" y="240" id="4707" />
+<P2 x="409" y="240" id="4682" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -12528,11 +12528,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="4703" >
<father id="4753" num="0" />
-<cdparam x="714" y="140" />
+<cdparam x="409" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="AlarmManager" />
+<infoparam name="Block0" value="MainController" />
<TGConnectingPoint num="0" id="4679" />
<TGConnectingPoint num="1" id="4680" />
<TGConnectingPoint num="2" id="4681" />
@@ -12560,20 +12560,19 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
-<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
-<Signal value="in highPressure()" attached="true" />
-<Signal value="out alarmOff()" attached="true" />
-<Signal value="out alarmOn()" attached="true" />
+<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
+<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
+<Signal value="in pressureValue(int value)" attached="true" />
+<Signal value="out highPressure()" attached="true" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="4728" >
<father id="4753" num="1" />
-<cdparam x="409" y="140" />
+<cdparam x="714" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="MainController" />
+<infoparam name="Block0" value="AlarmManager" />
<TGConnectingPoint num="0" id="4704" />
<TGConnectingPoint num="1" id="4705" />
<TGConnectingPoint num="2" id="4706" />
@@ -12601,10 +12600,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
-<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
-<Signal value="in pressureValue(int value)" attached="true" />
-<Signal value="out highPressure()" attached="true" />
+<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
+<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
+<Signal value="in highPressure()" attached="true" />
+<Signal value="out alarmOff()" attached="true" />
+<Signal value="out alarmOn()" attached="true" />
</extraparam>
</SUBCOMPONENT>
@@ -14912,7 +14912,7 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="5606" />
-<P1 x="964" y="240" id="5700" />
+<P1 x="964" y="240" id="5725" />
<P2 x="1088" y="240" id="5649" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -14928,8 +14928,8 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="5608" />
-<P1 x="659" y="240" id="5725" />
-<P2 x="714" y="240" id="5699" />
+<P1 x="659" y="240" id="5700" />
+<P2 x="714" y="240" id="5724" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -14943,7 +14943,7 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="5610" />
<P1 x="325" y="241" id="5675" />
-<P2 x="409" y="240" id="5724" />
+<P2 x="409" y="240" id="5699" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -15179,11 +15179,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="5720" >
<father id="5770" num="0" />
-<cdparam x="714" y="140" />
+<cdparam x="409" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="AlarmManager" />
+<infoparam name="Block0" value="MainController" />
<TGConnectingPoint num="0" id="5696" />
<TGConnectingPoint num="1" id="5697" />
<TGConnectingPoint num="2" id="5698" />
@@ -15211,20 +15211,19 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="alarmDuration" value="5" type="8" typeOther="" />
-<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
-<Signal value="in highPressure()" attached="true" />
-<Signal value="out alarmOff()" attached="true" />
-<Signal value="out alarmOn()" attached="true" />
+<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
+<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
+<Signal value="in pressureValue(int value)" attached="true" />
+<Signal value="out highPressure()" attached="true" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="5745" >
<father id="5770" num="1" />
-<cdparam x="409" y="140" />
+<cdparam x="714" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="MainController" />
+<infoparam name="Block0" value="AlarmManager" />
<TGConnectingPoint num="0" id="5721" />
<TGConnectingPoint num="1" id="5722" />
<TGConnectingPoint num="2" id="5723" />
@@ -15252,10 +15251,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
-<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
-<Signal value="in pressureValue(int value)" attached="true" />
-<Signal value="out highPressure()" attached="true" />
+<Attribute access="0" id="alarmDuration" value="5" type="8" typeOther="" />
+<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
+<Signal value="in highPressure()" attached="true" />
+<Signal value="out alarmOff()" attached="true" />
+<Signal value="out alarmOn()" attached="true" />
</extraparam>
</SUBCOMPONENT>
diff --git a/modeling/DIPLODOCUS/simpleSDF.xml b/modeling/DIPLODOCUS/simpleSDF.xml
index 4c06b60bcd..53fb1b6ea1 100644
--- a/modeling/DIPLODOCUS/simpleSDF.xml
+++ b/modeling/DIPLODOCUS/simpleSDF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="4" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="4" LAST_SELECTED_SUB_TAB="3">
<Modeling type="TML Component Design" nameTab="Application" tabs="TML Component Task Diagram$Src$T1$T2$T3$T4$T5$Dst" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
@@ -8,16 +8,16 @@
<cdparam x="1345" y="398" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1345" y="398" id="119" />
-<P2 x="1783" y="332" id="151" />
+<P1 x="1332" y="385" id="113" />
+<P2 x="1796" y="319" id="147" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="2" >
<cdparam x="1560" y="174" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1560" y="174" id="98" />
-<P2 x="1783" y="286" id="149" />
+<P1 x="1547" y="161" id="100" />
+<P2 x="1796" y="273" id="149" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="3" >
@@ -25,7 +25,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="983" y="264" id="21" />
-<P2 x="1113" y="174" id="85" />
+<P2 x="1126" y="161" id="79" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="4" >
@@ -33,14 +33,14 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="989" y="273" id="19" />
-<P2 x="1169" y="409" id="117" />
+<P2 x="1182" y="396" id="115" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="5" >
<cdparam x="846" y="309" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="846" y="250" id="168" />
+<P1 x="833" y="237" id="162" />
<P2 x="967" y="273" id="18" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -48,7 +48,7 @@
<cdparam x="1345" y="350" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1345" y="350" id="115" />
+<P1 x="1332" y="337" id="117" />
<P2 x="1660" y="178" id="39" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -57,14 +57,14 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="1677" y="170" id="34" />
-<P2 x="1783" y="236" id="147" />
+<P2 x="1796" y="223" id="151" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="8" >
<cdparam x="1560" y="110" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1560" y="110" id="100" />
+<P1 x="1547" y="97" id="98" />
<P2 x="1655" y="170" id="35" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -72,55 +72,55 @@
<cdparam x="1289" y="179" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1289" y="179" id="81" />
-<P2 x="1384" y="169" id="102" />
+<P1 x="1276" y="166" id="83" />
+<P2 x="1397" y="156" id="96" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="10" >
<cdparam x="1289" y="115" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="1289" y="115" id="83" />
-<P2 x="1384" y="105" id="96" />
+<P1 x="1276" y="102" id="81" />
+<P2 x="1397" y="92" id="102" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="11" >
<cdparam x="335" y="300" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="335" y="300" id="68" />
-<P2 x="414" y="300" id="132" />
+<P1 x="322" y="287" id="66" />
+<P2 x="427" y="287" id="134" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="12" >
<cdparam x="335" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="335" y="236" id="66" />
-<P2 x="414" y="236" id="130" />
+<P1 x="322" y="223" id="68" />
+<P2 x="427" y="223" id="136" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="13" >
<cdparam x="590" y="305" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="590" y="305" id="136" />
-<P2 x="670" y="302" id="164" />
+<P1 x="577" y="292" id="130" />
+<P2 x="683" y="289" id="166" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="14" >
<cdparam x="590" y="241" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="590" y="241" id="134" />
-<P2 x="670" y="238" id="162" />
+<P1 x="577" y="228" id="132" />
+<P2 x="683" y="225" id="168" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="15" >
<cdparam x="846" y="265" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="846" y="208" id="166" />
+<P1 x="833" y="195" id="164" />
<P2 x="996" y="175" id="50" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -129,7 +129,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="1012" y="166" id="53" />
-<P2 x="1113" y="110" id="79" />
+<P2 x="1126" y="97" id="85" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="17" >
@@ -137,7 +137,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="1012" y="183" id="55" />
-<P2 x="1169" y="345" id="113" />
+<P2 x="1182" y="332" id="119" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1207" id="33" >
@@ -230,15 +230,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="67" >
<father id="78" num="0" />
-<cdparam x="309" y="223" />
+<cdparam x="309" y="287" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT1" />
+<infoparam name="Primitive port" value="Event evtToT1" />
<TGConnectingPoint num="0" id="66" />
<extraparam>
-<Prop commName="chToT1" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT1" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -247,15 +247,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="69" >
<father id="78" num="1" />
-<cdparam x="309" y="287" />
+<cdparam x="309" y="223" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT1" />
+<infoparam name="Primitive port" value="Channel chToT1" />
<TGConnectingPoint num="0" id="68" />
<extraparam>
-<Prop commName="evtToT1" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT1" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -284,15 +284,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="80" >
<father id="95" num="0" />
-<cdparam x="1113" y="97" />
+<cdparam x="1113" y="161" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT3" />
+<infoparam name="Primitive port" value="Event evtToT3" />
<TGConnectingPoint num="0" id="79" />
<extraparam>
-<Prop commName="chToT3" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT3" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -301,15 +301,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="82" >
<father id="95" num="1" />
-<cdparam x="1263" y="166" />
+<cdparam x="1263" y="102" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT4" />
+<infoparam name="Primitive port" value="Channel chToT4" />
<TGConnectingPoint num="0" id="81" />
<extraparam>
-<Prop commName="evtToT4" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT4" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -318,15 +318,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="84" >
<father id="95" num="2" />
-<cdparam x="1263" y="102" />
+<cdparam x="1263" y="166" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT4" />
+<infoparam name="Primitive port" value="Event evtToT4" />
<TGConnectingPoint num="0" id="83" />
<extraparam>
-<Prop commName="chToT4" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT4" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -335,15 +335,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="86" >
<father id="95" num="3" />
-<cdparam x="1113" y="161" />
+<cdparam x="1113" y="97" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT3" />
+<infoparam name="Primitive port" value="Channel chToT3" />
<TGConnectingPoint num="0" id="85" />
<extraparam>
-<Prop commName="evtToT3" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT3" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -372,15 +372,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="97" >
<father id="112" num="0" />
-<cdparam x="1384" y="92" />
+<cdparam x="1384" y="156" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT4" />
+<infoparam name="Primitive port" value="Event evtToT4" />
<TGConnectingPoint num="0" id="96" />
<extraparam>
-<Prop commName="chToT4" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT4" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -389,15 +389,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="99" >
<father id="112" num="1" />
-<cdparam x="1534" y="161" />
+<cdparam x="1534" y="97" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtFromT4" />
+<infoparam name="Primitive port" value="Channel chFromT4" />
<TGConnectingPoint num="0" id="98" />
<extraparam>
-<Prop commName="evtFromT4" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chFromT4" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -406,15 +406,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="101" >
<father id="112" num="2" />
-<cdparam x="1534" y="97" />
+<cdparam x="1534" y="161" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chFromT4" />
+<infoparam name="Primitive port" value="Event evtFromT4" />
<TGConnectingPoint num="0" id="100" />
<extraparam>
-<Prop commName="chFromT4" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromT4" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -423,15 +423,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="103" >
<father id="112" num="3" />
-<cdparam x="1384" y="156" />
+<cdparam x="1384" y="92" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT4" />
+<infoparam name="Primitive port" value="Channel chToT4" />
<TGConnectingPoint num="0" id="102" />
<extraparam>
-<Prop commName="evtToT4" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT4" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -460,15 +460,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="114" >
<father id="129" num="0" />
-<cdparam x="1169" y="332" />
+<cdparam x="1319" y="385" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT5" />
+<infoparam name="Primitive port" value="Event evtFromT5" />
<TGConnectingPoint num="0" id="113" />
<extraparam>
-<Prop commName="chToT5" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromT5" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -477,15 +477,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="116" >
<father id="129" num="1" />
-<cdparam x="1319" y="337" />
+<cdparam x="1169" y="396" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chFromT5" />
+<infoparam name="Primitive port" value="Event evtToT5" />
<TGConnectingPoint num="0" id="115" />
<extraparam>
-<Prop commName="chFromT5" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT5" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -494,15 +494,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="118" >
<father id="129" num="2" />
-<cdparam x="1169" y="396" />
+<cdparam x="1319" y="337" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT5" />
+<infoparam name="Primitive port" value="Channel chFromT5" />
<TGConnectingPoint num="0" id="117" />
<extraparam>
-<Prop commName="evtToT5" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chFromT5" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -511,15 +511,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="120" >
<father id="129" num="3" />
-<cdparam x="1319" y="385" />
+<cdparam x="1169" y="332" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtFromT5" />
+<infoparam name="Primitive port" value="Channel chToT5" />
<TGConnectingPoint num="0" id="119" />
<extraparam>
-<Prop commName="evtFromT5" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT5" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -548,15 +548,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="131" >
<father id="146" num="0" />
-<cdparam x="414" y="223" />
+<cdparam x="564" y="292" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT1" />
+<infoparam name="Primitive port" value="Event evtToT2" />
<TGConnectingPoint num="0" id="130" />
<extraparam>
-<Prop commName="chToT1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT2" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -565,15 +565,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="133" >
<father id="146" num="1" />
-<cdparam x="414" y="287" />
+<cdparam x="564" y="228" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT1" />
+<infoparam name="Primitive port" value="Channel chToT2" />
<TGConnectingPoint num="0" id="132" />
<extraparam>
-<Prop commName="evtToT1" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -582,15 +582,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="135" >
<father id="146" num="2" />
-<cdparam x="564" y="228" />
+<cdparam x="414" y="287" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT2" />
+<infoparam name="Primitive port" value="Event evtToT1" />
<TGConnectingPoint num="0" id="134" />
<extraparam>
-<Prop commName="chToT2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT1" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -599,15 +599,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="137" >
<father id="146" num="3" />
-<cdparam x="564" y="292" />
+<cdparam x="414" y="223" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT2" />
+<infoparam name="Primitive port" value="Channel chToT1" />
<TGConnectingPoint num="0" id="136" />
<extraparam>
-<Prop commName="evtToT2" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -638,15 +638,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="148" >
<father id="161" num="0" />
-<cdparam x="1783" y="223" />
+<cdparam x="1783" y="319" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chtoDst" />
+<infoparam name="Primitive port" value="Event evtFromT5" />
<TGConnectingPoint num="0" id="147" />
<extraparam>
-<Prop commName="chtoDst" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromT5" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -672,15 +672,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="152" >
<father id="161" num="2" />
-<cdparam x="1783" y="319" />
+<cdparam x="1783" y="223" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtFromT5" />
+<infoparam name="Primitive port" value="Channel chtoDst" />
<TGConnectingPoint num="0" id="151" />
<extraparam>
-<Prop commName="evtFromT5" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chtoDst" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -709,15 +709,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="163" >
<father id="178" num="0" />
-<cdparam x="670" y="225" />
+<cdparam x="820" y="237" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT2" />
+<infoparam name="Primitive port" value="Event evtToT3T5" />
<TGConnectingPoint num="0" id="162" />
<extraparam>
-<Prop commName="chToT2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT3T5" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -726,15 +726,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="165" >
<father id="178" num="1" />
-<cdparam x="670" y="289" />
+<cdparam x="820" y="195" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT2" />
+<infoparam name="Primitive port" value="Channel chToT3T5" />
<TGConnectingPoint num="0" id="164" />
<extraparam>
-<Prop commName="evtToT2" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT3T5" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -743,15 +743,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="167" >
<father id="178" num="2" />
-<cdparam x="820" y="195" />
+<cdparam x="670" y="289" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT3T5" />
+<infoparam name="Primitive port" value="Event evtToT2" />
<TGConnectingPoint num="0" id="166" />
<extraparam>
-<Prop commName="chToT3T5" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT2" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -760,15 +760,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="169" >
<father id="178" num="3" />
-<cdparam x="820" y="237" />
+<cdparam x="670" y="225" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT3T5" />
+<infoparam name="Primitive port" value="Channel chToT2" />
<TGConnectingPoint num="0" id="168" />
<extraparam>
-<Prop commName="evtToT3T5" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1778,11 +1778,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="356" >
<father id="399" num="0" />
-<cdparam x="332" y="523" />
+<cdparam x="411" y="615" />
<sizeparam width="123" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="127" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Application::T3" />
+<infoparam name="TGComponent" value="Application::T5" />
<TGConnectingPoint num="0" id="348" />
<TGConnectingPoint num="1" id="349" />
<TGConnectingPoint num="2" id="350" />
@@ -1792,7 +1792,7 @@
<TGConnectingPoint num="6" id="354" />
<TGConnectingPoint num="7" id="355" />
<extraparam>
-<info value="Application::T3" taskName="T3" referenceTaskName="Application" priority="0" operationMEC="T3" fatherComponentMECType="0" />
+<info value="Application::T5" taskName="T5" referenceTaskName="Application" priority="0" operationMEC="T5" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="365" >
@@ -1816,11 +1816,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="374" >
<father id="399" num="2" />
-<cdparam x="411" y="615" />
+<cdparam x="332" y="523" />
<sizeparam width="123" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="127" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Application::T5" />
+<infoparam name="TGComponent" value="Application::T3" />
<TGConnectingPoint num="0" id="366" />
<TGConnectingPoint num="1" id="367" />
<TGConnectingPoint num="2" id="368" />
@@ -1830,7 +1830,7 @@
<TGConnectingPoint num="6" id="372" />
<TGConnectingPoint num="7" id="373" />
<extraparam>
-<info value="Application::T5" taskName="T5" referenceTaskName="Application" priority="0" operationMEC="T5" fatherComponentMECType="0" />
+<info value="Application::T3" taskName="T3" referenceTaskName="Application" priority="0" operationMEC="T3" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -1979,11 +1979,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="483" >
<father id="526" num="0" />
-<cdparam x="539" y="82" />
-<sizeparam width="123" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="565" y="189" />
+<sizeparam width="126" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="127" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Application::T1" />
+<cdrectangleparam minX="0" maxX="124" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="Application::Dst" />
<TGConnectingPoint num="0" id="475" />
<TGConnectingPoint num="1" id="476" />
<TGConnectingPoint num="2" id="477" />
@@ -1993,7 +1993,7 @@
<TGConnectingPoint num="6" id="481" />
<TGConnectingPoint num="7" id="482" />
<extraparam>
-<info value="Application::T1" taskName="T1" referenceTaskName="Application" priority="0" operationMEC="T3" fatherComponentMECType="0" />
+<info value="Application::Dst" taskName="Dst" referenceTaskName="Application" priority="0" operationMEC="Dst" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="492" >
@@ -2017,11 +2017,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="501" >
<father id="526" num="2" />
-<cdparam x="565" y="189" />
-<sizeparam width="126" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="539" y="82" />
+<sizeparam width="123" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="124" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="Application::Dst" />
+<cdrectangleparam minX="0" maxX="127" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="Application::T1" />
<TGConnectingPoint num="0" id="493" />
<TGConnectingPoint num="1" id="494" />
<TGConnectingPoint num="2" id="495" />
@@ -2031,7 +2031,7 @@
<TGConnectingPoint num="6" id="499" />
<TGConnectingPoint num="7" id="500" />
<extraparam>
-<info value="Application::Dst" taskName="Dst" referenceTaskName="Application" priority="0" operationMEC="Dst" fatherComponentMECType="0" />
+<info value="Application::T1" taskName="T1" referenceTaskName="Application" priority="0" operationMEC="T3" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -2164,32 +2164,32 @@
<cdparam x="335" y="300" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="335" y="300" id="570" />
-<P2 x="414" y="300" id="587" />
+<P1 x="322" y="287" id="572" />
+<P2 x="427" y="287" id="585" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="567" >
<cdparam x="335" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="335" y="237" id="572" />
-<P2 x="414" y="236" id="589" />
+<P1 x="322" y="224" id="570" />
+<P2 x="427" y="223" id="583" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="568" >
<cdparam x="590" y="305" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="590" y="305" id="583" />
-<P2 x="670" y="302" id="600" />
+<P1 x="577" y="292" id="589" />
+<P2 x="683" y="289" id="602" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="569" >
<cdparam x="590" y="241" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="590" y="241" id="585" />
-<P2 x="670" y="238" id="602" />
+<P1 x="577" y="228" id="587" />
+<P2 x="683" y="225" id="600" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="582" >
@@ -2213,15 +2213,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="571" >
<father id="582" num="0" />
-<cdparam x="309" y="287" />
+<cdparam x="309" y="224" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT1" />
+<infoparam name="Primitive port" value="Channel chToT1" />
<TGConnectingPoint num="0" id="570" />
<extraparam>
-<Prop commName="evtToT1" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT1" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2230,15 +2230,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="573" >
<father id="582" num="1" />
-<cdparam x="309" y="224" />
+<cdparam x="309" y="287" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT1" />
+<infoparam name="Primitive port" value="Event evtToT1" />
<TGConnectingPoint num="0" id="572" />
<extraparam>
-<Prop commName="chToT1" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT1" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2267,15 +2267,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="584" >
<father id="599" num="0" />
-<cdparam x="564" y="292" />
+<cdparam x="414" y="223" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT2" />
+<infoparam name="Primitive port" value="Channel chToT1" />
<TGConnectingPoint num="0" id="583" />
<extraparam>
-<Prop commName="evtToT2" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2284,15 +2284,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="586" >
<father id="599" num="1" />
-<cdparam x="564" y="228" />
+<cdparam x="414" y="287" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT2" />
+<infoparam name="Primitive port" value="Event evtToT1" />
<TGConnectingPoint num="0" id="585" />
<extraparam>
-<Prop commName="chToT2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT1" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2301,15 +2301,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="588" >
<father id="599" num="2" />
-<cdparam x="414" y="287" />
+<cdparam x="564" y="228" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT1" />
+<infoparam name="Primitive port" value="Channel chToT2" />
<TGConnectingPoint num="0" id="587" />
<extraparam>
-<Prop commName="evtToT1" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2318,15 +2318,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="590" >
<father id="599" num="3" />
-<cdparam x="414" y="223" />
+<cdparam x="564" y="292" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT1" />
+<infoparam name="Primitive port" value="Event evtToT2" />
<TGConnectingPoint num="0" id="589" />
<extraparam>
-<Prop commName="chToT1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT2" commType="1" origin="true" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2355,15 +2355,15 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="601" >
<father id="612" num="0" />
-<cdparam x="670" y="289" />
+<cdparam x="670" y="225" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event evtToT2" />
+<infoparam name="Primitive port" value="Channel chToT2" />
<TGConnectingPoint num="0" id="600" />
<extraparam>
-<Prop commName="evtToT2" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chToT2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2372,15 +2372,15 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="603" >
<father id="612" num="1" />
-<cdparam x="670" y="225" />
+<cdparam x="670" y="289" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT2" />
+<infoparam name="Primitive port" value="Event evtToT2" />
<TGConnectingPoint num="0" id="602" />
<extraparam>
-<Prop commName="chToT2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToT2" commType="1" origin="false" finite="true" blocking="true" maxSamples="2" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -2831,11 +2831,11 @@
</COMPONENT>
<SUBCOMPONENT type="1101" id="728" >
<father id="762" num="0" />
-<cdparam x="550" y="132" />
+<cdparam x="539" y="82" />
<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="ApplicationSimple::T2" />
+<infoparam name="TGComponent" value="ApplicationSimple::T1" />
<TGConnectingPoint num="0" id="720" />
<TGConnectingPoint num="1" id="721" />
<TGConnectingPoint num="2" id="722" />
@@ -2845,16 +2845,16 @@
<TGConnectingPoint num="6" id="726" />
<TGConnectingPoint num="7" id="727" />
<extraparam>
-<info value="ApplicationSimple::T2" taskName="T2" referenceTaskName="ApplicationSimple" priority="0" operationMEC="T2" fatherComponentMECType="0" />
+<info value="ApplicationSimple::T1" taskName="T1" referenceTaskName="ApplicationSimple" priority="0" operationMEC="T1" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1101" id="737" >
<father id="762" num="1" />
-<cdparam x="539" y="82" />
+<cdparam x="550" y="132" />
<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="ApplicationSimple::T1" />
+<infoparam name="TGComponent" value="ApplicationSimple::T2" />
<TGConnectingPoint num="0" id="729" />
<TGConnectingPoint num="1" id="730" />
<TGConnectingPoint num="2" id="731" />
@@ -2864,7 +2864,7 @@
<TGConnectingPoint num="6" id="735" />
<TGConnectingPoint num="7" id="736" />
<extraparam>
-<info value="ApplicationSimple::T1" taskName="T1" referenceTaskName="ApplicationSimple" priority="0" operationMEC="T1" fatherComponentMECType="0" />
+<info value="ApplicationSimple::T2" taskName="T2" referenceTaskName="ApplicationSimple" priority="0" operationMEC="T2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
@@ -2974,14 +2974,14 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
<P1 x="335" y="237" id="802" />
-<P2 x="414" y="236" id="813" />
+<P2 x="414" y="236" id="815" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="801" >
<cdparam x="590" y="241" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="590" y="241" id="815" />
+<P1 x="590" y="241" id="813" />
<P2 x="670" y="238" id="826" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -3012,7 +3012,7 @@
<infoparam name="Primitive port" value="Channel chToT1" />
<TGConnectingPoint num="0" id="802" />
<extraparam>
-<Prop commName="chToT1" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" vc="0" />
+<Prop commName="chToT1" commType="0" origin="true" finite="false" blocking="true" maxSamples="500" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -3041,14 +3041,14 @@
</COMPONENT>
<SUBCOMPONENT type="1203" id="814" >
<father id="825" num="0" />
-<cdparam x="414" y="223" />
+<cdparam x="564" y="228" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT1" />
+<infoparam name="Primitive port" value="Channel chToT2" />
<TGConnectingPoint num="0" id="813" />
<extraparam>
-<Prop commName="chToT1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Prop commName="chToT2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -3058,14 +3058,14 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="1203" id="816" >
<father id="825" num="1" />
-<cdparam x="564" y="228" />
+<cdparam x="414" y="223" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="137" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel chToT2" />
+<infoparam name="Primitive port" value="Channel chToT1" />
<TGConnectingPoint num="0" id="815" />
<extraparam>
-<Prop commName="chToT2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" vc="0" />
+<Prop commName="chToT1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -3114,95 +3114,101 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="Src" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="115" id="837" >
-<cdparam x="332" y="160" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="332" y="160" id="843" />
-<P2 x="332" y="240" id="840" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1001" id="839" >
+<COMPONENT type="1001" id="838" >
<cdparam x="322" y="286" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="838" />
+<TGConnectingPoint num="0" id="837" />
</COMPONENT>
-<COMPONENT type="1006" id="842" >
+<COMPONENT type="1006" id="841" >
<cdparam x="292" y="245" />
<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="chToT1(50)" />
-<TGConnectingPoint num="0" id="840" />
-<TGConnectingPoint num="1" id="841" />
+<TGConnectingPoint num="0" id="839" />
+<TGConnectingPoint num="1" id="840" />
<extraparam>
<Data channelName="chToT1" nbOfSamples="50" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="844" >
+<COMPONENT type="1000" id="843" >
<cdparam x="325" y="145" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="843" />
+<TGConnectingPoint num="0" id="842" />
</COMPONENT>
+<CONNECTOR type="115" id="844" >
+<cdparam x="332" y="160" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="332" y="160" id="842" />
+<P2 x="332" y="240" id="839" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
<CONNECTOR type="115" id="845" >
<cdparam x="332" y="223" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="332" y="270" id="841" />
-<P2 x="332" y="281" id="838" />
+<P1 x="332" y="270" id="840" />
+<P2 x="332" y="281" id="837" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="T1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="115" id="846" >
-<cdparam x="422" y="251" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="422" y="251" id="852" />
-<P2 x="422" y="363" id="848" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="847" >
-<cdparam x="423" y="91" />
+<CONNECTOR type="115" id="916" >
+<cdparam x="432" y="325" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="423" y="91" id="857" />
-<P2 x="422" y="157" id="854" />
+<P1 x="422" y="328" id="915" />
+<P2 x="422" y="363" id="846" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1001" id="849" >
+<COMPONENT type="1006" id="913" >
+<cdparam x="382" y="303" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="write channel" value="chToT2(15)" />
+<TGConnectingPoint num="0" id="914" />
+<TGConnectingPoint num="1" id="915" />
+<extraparam>
+<Data channelName="chToT2" nbOfSamples="15" secPattern="" isAttacker="No" isEncForm="Yes" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="847" >
<cdparam x="412" y="368" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="848" />
+<TGConnectingPoint num="0" id="846" />
</COMPONENT>
-<COMPONENT type="1013" id="853" >
+<COMPONENT type="1013" id="851" >
<cdparam x="417" y="216" />
<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="851" />
-<TGConnectingPoint num="1" id="852" />
+<TGConnectingPoint num="0" id="849" />
+<TGConnectingPoint num="1" id="850" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="850" >
-<father id="853" num="0" />
+<SUBCOMPONENT type="-1" id="848" >
+<father id="851" num="0" />
<cdparam x="432" y="236" />
<sizeparam width="24" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3210,49 +3216,57 @@
<infoparam name="value of the delay" value="100" />
</SUBCOMPONENT>
-<COMPONENT type="1009" id="856" >
+<COMPONENT type="1009" id="854" >
<cdparam x="380" y="162" />
<sizeparam width="85" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="chToT1(50) " />
-<TGConnectingPoint num="0" id="854" />
-<TGConnectingPoint num="1" id="855" />
+<TGConnectingPoint num="0" id="852" />
+<TGConnectingPoint num="1" id="853" />
<extraparam>
<Data channelName="chToT1" nbOfSamples="50" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="858" >
+<COMPONENT type="1000" id="856" >
<cdparam x="416" y="76" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="857" />
+<TGConnectingPoint num="0" id="855" />
</COMPONENT>
+<CONNECTOR type="115" id="857" >
+<cdparam x="422" y="251" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="422" y="251" id="850" />
+<P2 x="422" y="298" id="914" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="858" >
+<cdparam x="423" y="91" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="423" y="91" id="855" />
+<P2 x="422" y="157" id="852" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
<CONNECTOR type="115" id="859" >
<cdparam x="432" y="199" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="422" y="187" id="855" />
-<P2 x="422" y="211" id="851" />
+<P1 x="422" y="187" id="853" />
+<P2 x="422" y="211" id="849" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="T2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="115" id="912" >
-<cdparam x="411" y="128" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="411" y="128" id="879" />
-<P2 x="353" y="221" id="906" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
<COMPONENT type="1013" id="863" >
<cdparam x="348" y="280" />
<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3272,26 +3286,18 @@
<infoparam name="value of the delay" value="20" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="864" >
-<cdparam x="579" y="176" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="579" y="176" id="874" />
-<P2 x="738" y="220" id="899" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1013" id="868" >
+<COMPONENT type="1013" id="867" >
<cdparam x="733" y="279" />
<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="866" />
-<TGConnectingPoint num="1" id="867" />
+<TGConnectingPoint num="0" id="865" />
+<TGConnectingPoint num="1" id="866" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="865" >
-<father id="868" num="0" />
+<SUBCOMPONENT type="-1" id="864" >
+<father id="867" num="0" />
<cdparam x="748" y="299" />
<sizeparam width="16" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3299,75 +3305,75 @@
<infoparam name="value of the delay" value="25" />
</SUBCOMPONENT>
-<COMPONENT type="1012" id="876" >
+<COMPONENT type="1012" id="875" >
<cdparam x="524" y="161" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="30" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="872" />
-<TGConnectingPoint num="1" id="873" />
-<TGConnectingPoint num="2" id="874" />
-<TGConnectingPoint num="3" id="875" />
+<TGConnectingPoint num="0" id="871" />
+<TGConnectingPoint num="1" id="872" />
+<TGConnectingPoint num="2" id="873" />
+<TGConnectingPoint num="3" id="874" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="869" >
-<father id="876" num="0" />
+<SUBCOMPONENT type="-1" id="868" >
+<father id="875" num="0" />
<cdparam x="499" y="171" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="870" >
-<father id="876" num="1" />
+<SUBCOMPONENT type="-1" id="869" >
+<father id="875" num="1" />
<cdparam x="559" y="171" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="871" >
-<father id="876" num="2" />
+<SUBCOMPONENT type="-1" id="870" >
+<father id="875" num="2" />
<cdparam x="544" y="206" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1020" id="880" >
+<COMPONENT type="1020" id="879" >
<cdparam x="366" y="103" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="for loop" value="1" />
-<TGConnectingPoint num="0" id="877" />
-<TGConnectingPoint num="1" id="878" />
-<TGConnectingPoint num="2" id="879" />
+<TGConnectingPoint num="0" id="876" />
+<TGConnectingPoint num="1" id="877" />
+<TGConnectingPoint num="2" id="878" />
</COMPONENT>
-<COMPONENT type="1001" id="882" >
+<COMPONENT type="1001" id="881" >
<cdparam x="533" y="533" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="881" />
+<TGConnectingPoint num="0" id="880" />
</COMPONENT>
-<COMPONENT type="1013" id="886" >
+<COMPONENT type="1013" id="885" >
<cdparam x="538" y="306" />
<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="884" />
-<TGConnectingPoint num="1" id="885" />
+<TGConnectingPoint num="0" id="883" />
+<TGConnectingPoint num="1" id="884" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="883" >
-<father id="886" num="0" />
+<SUBCOMPONENT type="-1" id="882" >
+<father id="885" num="0" />
<cdparam x="553" y="326" />
<sizeparam width="24" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3375,144 +3381,160 @@
<infoparam name="value of the delay" value="150" />
</SUBCOMPONENT>
-<COMPONENT type="1009" id="889" >
+<COMPONENT type="1009" id="888" >
<cdparam x="497" y="252" />
<sizeparam width="93" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="chToT2(100) " />
-<TGConnectingPoint num="0" id="887" />
-<TGConnectingPoint num="1" id="888" />
+<TGConnectingPoint num="0" id="886" />
+<TGConnectingPoint num="1" id="887" />
<extraparam>
<Data channelName="chToT2" nbOfSamples="100" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="891" >
+<COMPONENT type="1000" id="890" >
<cdparam x="396" y="55" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="890" />
+<TGConnectingPoint num="0" id="889" />
</COMPONENT>
-<CONNECTOR type="115" id="892" >
-<cdparam x="543" y="341" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="543" y="341" id="885" />
-<P2 x="543" y="528" id="881" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="893" >
-<cdparam x="553" y="289" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="543" y="277" id="888" />
-<P2 x="543" y="301" id="884" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="894" >
-<cdparam x="403" y="70" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="403" y="70" id="890" />
-<P2 x="411" y="98" id="877" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="895" >
-<cdparam x="456" y="117" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="456" y="117" id="878" />
-<P2 x="539" y="151" id="872" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="896" >
-<cdparam x="539" y="216" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="539" y="216" id="875" />
-<P2 x="543" y="247" id="887" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1001" id="898" >
+<COMPONENT type="1001" id="892" >
<cdparam x="728" y="506" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="897" />
+<TGConnectingPoint num="0" id="891" />
</COMPONENT>
-<COMPONENT type="1009" id="901" >
+<COMPONENT type="1009" id="895" >
<cdparam x="696" y="225" />
<sizeparam width="85" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="chToT2(50) " />
-<TGConnectingPoint num="0" id="899" />
-<TGConnectingPoint num="1" id="900" />
+<TGConnectingPoint num="0" id="893" />
+<TGConnectingPoint num="1" id="894" />
<extraparam>
<Data channelName="chToT2" nbOfSamples="50" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="115" id="902" >
-<cdparam x="738" y="314" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="738" y="314" id="867" />
-<P2 x="738" y="501" id="897" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="903" >
-<cdparam x="748" y="262" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="738" y="250" id="900" />
-<P2 x="738" y="274" id="866" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1001" id="905" >
+<COMPONENT type="1001" id="897" >
<cdparam x="343" y="507" />
<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="904" />
+<TGConnectingPoint num="0" id="896" />
</COMPONENT>
-<COMPONENT type="1009" id="908" >
+<COMPONENT type="1009" id="900" >
<cdparam x="311" y="226" />
<sizeparam width="85" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="chToT2(50) " />
-<TGConnectingPoint num="0" id="906" />
-<TGConnectingPoint num="1" id="907" />
+<TGConnectingPoint num="0" id="898" />
+<TGConnectingPoint num="1" id="899" />
<extraparam>
<Data channelName="chToT2" nbOfSamples="50" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
+<CONNECTOR type="115" id="901" >
+<cdparam x="411" y="128" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="411" y="128" id="878" />
+<P2 x="353" y="221" id="898" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="902" >
+<cdparam x="579" y="176" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="579" y="176" id="873" />
+<P2 x="738" y="220" id="893" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="903" >
+<cdparam x="543" y="341" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="543" y="341" id="884" />
+<P2 x="543" y="528" id="880" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="904" >
+<cdparam x="553" y="289" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="543" y="277" id="887" />
+<P2 x="543" y="301" id="883" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="905" >
+<cdparam x="403" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="403" y="70" id="889" />
+<P2 x="411" y="98" id="876" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="906" >
+<cdparam x="456" y="117" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="456" y="117" id="877" />
+<P2 x="539" y="151" id="871" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="907" >
+<cdparam x="539" y="216" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="539" y="216" id="874" />
+<P2 x="543" y="247" id="886" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="908" >
+<cdparam x="738" y="314" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="738" y="314" id="866" />
+<P2 x="738" y="501" id="891" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
<CONNECTOR type="115" id="909" >
+<cdparam x="748" y="262" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="738" y="250" id="894" />
+<P2 x="738" y="274" id="865" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="910" >
<cdparam x="353" y="315" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<P1 x="353" y="315" id="862" />
-<P2 x="353" y="502" id="904" />
+<P2 x="353" y="502" id="896" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="910" >
+<CONNECTOR type="115" id="911" >
<cdparam x="363" y="263" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="353" y="251" id="907" />
+<P1 x="353" y="251" id="899" />
<P2 x="353" y="275" id="861" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/src/main/java/tmltranslator/TMLTask.java b/src/main/java/tmltranslator/TMLTask.java
index 426a1f5aa1..a10aa5b3e2 100755
--- a/src/main/java/tmltranslator/TMLTask.java
+++ b/src/main/java/tmltranslator/TMLTask.java
@@ -472,7 +472,7 @@ public class TMLTask extends TMLElement {
return -1;
}
//TraceManager.addDev("Handling task:" + getTaskName());
- return activity.getWorstCaseDataSending(c);
+ return activity.getWorstCaseDataSending(c) * c.getSize();
}
// returns -1 if the WC cannot be computed
@@ -482,7 +482,7 @@ public class TMLTask extends TMLElement {
return -1;
}
//TraceManager.addDev("Handling task:" + getTaskName());
- return activity.getWorstCaseDataReceiving(c);
+ return activity.getWorstCaseDataReceiving(c) * c.getSize();
}
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusGeneralTest.java b/ttool/src/test/java/tmltranslator/DiplodocusGeneralTest.java
index 3ca1af4ac6..00e8c3ea10 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusGeneralTest.java
+++ b/ttool/src/test/java/tmltranslator/DiplodocusGeneralTest.java
@@ -28,9 +28,23 @@ import static org.junit.Assert.*;
public class DiplodocusGeneralTest extends AbstractUITest {
//final String [] MODELS = {"scp"};
- final String [] MODELS = {"ssdf"};
- final String [] TASKS = {"ssdf"};
- final int [] WorstCaseExecIValueByTask = {181, 2743};
+ final String [] MODELS = {"spec_sdf_simple.tml"};
+ final String [] TASKS = {"ApplicationSimple_FixedSize__T1", "ApplicationSimple_FixedSize__T2"};
+
+ // Complexity
+ final int [] WorstCaseExecIValueByTask = {100, 170};
+
+ // Write in channels
+ final String [] WRITE_CHANNELS = {"ApplicationSimple_FixedSize__chToT2"};
+ final String [] WRITE_TASKS = {"ApplicationSimple_FixedSize__T1"};
+ final int [] WRITE_RESULTS = {60}; // in bytes
+
+ // Read in channels
+ final String [] READ_CHANNELS = {"ApplicationSimple_FixedSize__chToT1", "ApplicationSimple_FixedSize__chToT2"};
+ final String [] READ_TASKS = {"ApplicationSimple_FixedSize__T1", "ApplicationSimple_FixedSize__T2"};
+ final int [] READ_RESULTS = {200, 600}; // in bytes
+
+
@@ -56,8 +70,8 @@ public class DiplodocusGeneralTest extends AbstractUITest {
String s = MODELS[i];
// Load the TML
System.out.println("Executing: loading " + s);
- TMLMappingTextSpecification tmts = new TMLMappingTextSpecification(s);
- File f = new File(RESOURCES_DIR + s + ".tmap");
+ TMLTextSpecification tmt = new TMLTextSpecification(s);
+ File f = new File(RESOURCES_DIR + s);
System.out.println("Executing: new file loaded " + s);
String spec = null;
try {
@@ -69,22 +83,57 @@ public class DiplodocusGeneralTest extends AbstractUITest {
System.out.println("executing: testing spec " + s);
assertTrue(spec != null);
System.out.println("executing: testing parsed " + s);
- boolean parsed = tmts.makeTMLMapping(spec, RESOURCES_DIR);
+ boolean parsed = tmt.makeTMLModeling(spec);
assertTrue(parsed);
System.out.println("executing: checking syntax " + s);
// Checking syntax
- TMLMapping tmap = tmts.getTMLMapping();
+ TMLModeling tmlm = tmt.getTMLModeling();
- TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmap);
+ TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmlm);
syntax.checkSyntax();
assertTrue(syntax.hasErrors() == 0);
// Checking Worst Case ExecI
-
+ System.out.println("TMLModeling:" + tmlm.toString());
+
+ int cpt = 0;
+ for(String task: TASKS) {
+ TMLTask t = tmlm.getTMLTaskByName(task);
+ assertNotNull(t);
+
+ int worstCaseExecI = t.getWorstCaseIComplexity();
+ assertEquals(worstCaseExecI, WorstCaseExecIValueByTask[cpt]);
+
+ cpt++;
+ }
+
+ for (cpt=0; cpt<WRITE_CHANNELS.length; cpt++) {
+ TMLChannel ch = tmlm.getChannelByName(WRITE_CHANNELS[cpt]);
+ assertNotNull(ch);
+
+ TMLTask t = tmlm.getTMLTaskByName(WRITE_TASKS[cpt]);
+ assertNotNull(t);
+
+ int worstCaseWriteChannel = t.getWorstCaseDataSending(ch);
+ assertEquals(worstCaseWriteChannel, WRITE_RESULTS[cpt]);
+ }
+
+ for (cpt=0; cpt<READ_CHANNELS.length; cpt++) {
+ TMLChannel ch = tmlm.getChannelByName(READ_CHANNELS[cpt]);
+ assertNotNull(ch);
+
+ TMLTask t = tmlm.getTMLTaskByName(READ_TASKS[cpt]);
+ assertNotNull(t);
+
+
+ int worstCaseReadChannel = t.getWorstCaseDataReceiving(ch);
+ System.out.println("Task=" + t.getTaskName() + " channel=" + ch.getName() + " read WC=" + worstCaseReadChannel);
+ assertEquals(worstCaseReadChannel, READ_RESULTS[cpt]);
+ }
}
diff --git a/ttool/src/test/resources/tmltranslator/general/spec_sdf_simple.tml b/ttool/src/test/resources/tmltranslator/general/spec_sdf_simple.tml
new file mode 100644
index 0000000000..ccc2c6d3d7
--- /dev/null
+++ b/ttool/src/test/resources/tmltranslator/general/spec_sdf_simple.tml
@@ -0,0 +1,54 @@
+// TML Application - FORMAT 0.1
+// Application: /Users/localapvrille/TToolgit/TTool/modeling/DIPLODOCUS/simpleSDF.xml
+// Generated: Tue Oct 22 14:46:16 CEST 2019
+
+// Channels
+CHANNEL ApplicationSimple_FixedSize__chToT1 BRBW 4 500 OUT ApplicationSimple_FixedSize__Src IN ApplicationSimple_FixedSize__T1
+VCCHANNEL ApplicationSimple_FixedSize__chToT1 0
+CHANNEL ApplicationSimple_FixedSize__chToT2 BRBW 4 8 OUT ApplicationSimple_FixedSize__T1 IN ApplicationSimple_FixedSize__T2
+VCCHANNEL ApplicationSimple_FixedSize__chToT2 0
+
+// Events
+
+// Requests
+
+TASK ApplicationSimple_FixedSize__Src
+ TASKOP
+ //Local variables
+
+ //Behavior
+ WRITE ApplicationSimple_FixedSize__chToT1 50
+ENDTASK
+
+TASK ApplicationSimple_FixedSize__T1
+ TASKOP
+ //Local variables
+
+ //Behavior
+ READ ApplicationSimple_FixedSize__chToT1 50
+ EXECI 100
+ WRITE ApplicationSimple_FixedSize__chToT2 15
+ENDTASK
+
+TASK ApplicationSimple_FixedSize__T2
+ TASKOP
+ //Local variables
+ int loop__0 = 0
+
+ //Behavior
+ FOR(loop__0 = 0; loop__0<1; loop__0 = loop__0 + 1)
+ RAND
+ CASERAND 50
+ READ ApplicationSimple_FixedSize__chToT2 50
+ EXECI 25
+ ENDCASERAND
+ CASERAND 50
+ READ ApplicationSimple_FixedSize__chToT2 100
+ EXECI 150
+ ENDCASERAND
+ ENDRAND
+ ENDFOR
+ READ ApplicationSimple_FixedSize__chToT2 50
+ EXECI 20
+ENDTASK
+
diff --git a/ttool/src/test/resources/tmltranslator/general/ssdf.tarchi b/ttool/src/test/resources/tmltranslator/general/ssdf.tarchi
deleted file mode 100644
index 409056eaaa..0000000000
--- a/ttool/src/test/resources/tmltranslator/general/ssdf.tarchi
+++ /dev/null
@@ -1,83 +0,0 @@
-// Master clock frequency - in MHz
-MASTERCLOCKFREQUENCY 200
-
-NODE CPU CPU2
-SET CPU2 nbOfCores 3
-SET CPU2 byteDataSize 4
-SET CPU2 pipelineSize 5
-SET CPU2 goIdleTime 10
-SET CPU2 maxConsecutiveIdleCycles 10
-SET CPU2 taskSwitchingTime 20
-SET CPU2 branchingPredictionPenalty 2
-SET CPU2 cacheMiss 5
-SET CPU2 schedulingPolicy 0
-SET CPU2 sliceTime 10000
-SET CPU2 execiTime 1
-SET CPU2 execcTime 1
-
-NODE MEMORY Memory0
-SET Memory0 byteDataSize 4
-
-NODE BUS Bus0
-SET Bus0 byteDataSize 4
-SET Bus0 pipelineSize 1
-SET Bus0 arbitration 0
-
-NODE FPGA FPGA2
-SET FPGA2 capacity 100
-SET FPGA2 byteDataSize 4
-SET FPGA2 mappingPenalty 0
-SET FPGA2 goIdleTime 10
-SET FPGA2 maxConsecutiveIdleCycles 10
-SET FPGA2 reconfigurationTime 50
-SET FPGA2 execiTime 1
-SET FPGA2 execcTime 1
-
-NODE CPU FPGA1
-SET FPGA1 nbOfCores 1
-SET FPGA1 byteDataSize 4
-SET FPGA1 pipelineSize 5
-SET FPGA1 goIdleTime 10
-SET FPGA1 maxConsecutiveIdleCycles 10
-SET FPGA1 taskSwitchingTime 20
-SET FPGA1 branchingPredictionPenalty 2
-SET FPGA1 cacheMiss 5
-SET FPGA1 schedulingPolicy 0
-SET FPGA1 sliceTime 10000
-SET FPGA1 execiTime 1
-SET FPGA1 execcTime 1
-
-NODE CPU Src
-SET Src nbOfCores 1
-SET Src byteDataSize 4
-SET Src pipelineSize 5
-SET Src goIdleTime 10
-SET Src maxConsecutiveIdleCycles 10
-SET Src taskSwitchingTime 20
-SET Src branchingPredictionPenalty 2
-SET Src cacheMiss 5
-SET Src schedulingPolicy 0
-SET Src sliceTime 10000
-SET Src execiTime 1
-SET Src execcTime 1
-
-NODE LINK link_CPU2_to_Bus0
-SET link_CPU2_to_Bus0 node CPU2
-SET link_CPU2_to_Bus0 bus Bus0
-SET link_CPU2_to_Bus0 priority 0
-NODE LINK link_FPGA2_to_Bus0
-SET link_FPGA2_to_Bus0 node FPGA2
-SET link_FPGA2_to_Bus0 bus Bus0
-SET link_FPGA2_to_Bus0 priority 0
-NODE LINK link_Memory0_to_Bus0
-SET link_Memory0_to_Bus0 node Memory0
-SET link_Memory0_to_Bus0 bus Bus0
-SET link_Memory0_to_Bus0 priority 0
-NODE LINK link_FPGA1_to_Bus0
-SET link_FPGA1_to_Bus0 node FPGA1
-SET link_FPGA1_to_Bus0 bus Bus0
-SET link_FPGA1_to_Bus0 priority 0
-NODE LINK link_Src_to_Bus0
-SET link_Src_to_Bus0 node Src
-SET link_Src_to_Bus0 bus Bus0
-SET link_Src_to_Bus0 priority 0
diff --git a/ttool/src/test/resources/tmltranslator/general/ssdf.tmap b/ttool/src/test/resources/tmltranslator/general/ssdf.tmap
deleted file mode 100644
index 2610212bca..0000000000
--- a/ttool/src/test/resources/tmltranslator/general/ssdf.tmap
+++ /dev/null
@@ -1,30 +0,0 @@
-TMLSPEC
- #include "ssdf.tml"
-ENDTMLSPEC
-
-TMLARCHI
- #include "ssdf.tarchi"
-ENDTMLARCHI
-
-TMLMAPPING
- MAP CPU2 Application__T3
- SET Application__T3 priority 0
- MAP CPU2 Application__T4
- SET Application__T4 priority 0
- MAP CPU2 Application__T5
- SET Application__T5 priority 0
- MAP FPGA1 Application__T1
- SET Application__T1 priority 0
- MAP FPGA1 Application__T2
- SET Application__T2 priority 0
- MAP FPGA1 Application__Dst
- SET Application__Dst priority 0
- MAP Src Application__Src
- SET Application__Src priority 0
- MAP FPGA1 FORKTASK_S_Application__chToT3T5__chToT3__chToT5
- SET FORKTASK_S_Application__chToT3T5__chToT3__chToT5 priority 0
- MAP FPGA1 FORKTASK_S_EVT_S_Application__evtToT3T5__evtToT3__evtToT5
- SET FORKTASK_S_EVT_S_Application__evtToT3T5__evtToT3__evtToT5 priority 0
- MAP FPGA1 JOINTASK_S_Application__chFromT4__chFromT5__chtoDst
- SET JOINTASK_S_Application__chFromT4__chFromT5__chtoDst priority 0
-ENDTMLMAPPING
diff --git a/ttool/src/test/resources/tmltranslator/general/ssdf.tml b/ttool/src/test/resources/tmltranslator/general/ssdf.tml
deleted file mode 100644
index ecabd91a99..0000000000
--- a/ttool/src/test/resources/tmltranslator/general/ssdf.tml
+++ /dev/null
@@ -1,166 +0,0 @@
-// TML Application - FORMAT 0.1
-// Application: /Users/localapvrille/TToolgit/TTool/modeling/DIPLODOCUS/simpleSDF.xml
-// Generated: Wed Jun 26 16:24:54 CEST 2019
-
-// Channels
-CHANNEL Application__chFromT4__chFromT5__chtoDst BRBW 4 500 OUT JOINTASK_S_Application__chFromT4__chFromT5__chtoDst IN Application__Dst
-VCCHANNEL Application__chFromT4__chFromT5__chtoDst 0
-CHANNEL Application__chToT1 BRBW 4 500 OUT Application__Src IN Application__T1
-VCCHANNEL Application__chToT1 0
-CHANNEL Application__chToT2 BRBW 4 8 OUT Application__T1 IN Application__T2
-VCCHANNEL Application__chToT2 0
-CHANNEL Application__chToT3T5__chToT3__chToT5 BRBW 4 500 OUT Application__T2 IN FORKTASK_S_Application__chToT3T5__chToT3__chToT5
-VCCHANNEL Application__chToT3T5__chToT3__chToT5 0
-CHANNEL Application__chToT4 BRBW 4 500 OUT Application__T3 IN Application__T4
-VCCHANNEL Application__chToT4 0
-CHANNEL FORKCHANNEL_S_0_S_Application__chToT3T5__chToT3__chToT5 BRBW 4 500 OUT FORKTASK_S_Application__chToT3T5__chToT3__chToT5 IN Application__T3
-VCCHANNEL FORKCHANNEL_S_0_S_Application__chToT3T5__chToT3__chToT5 0
-CHANNEL FORKCHANNEL_S_1_S_Application__chToT3T5__chToT3__chToT5 BRBW 4 500 OUT FORKTASK_S_Application__chToT3T5__chToT3__chToT5 IN Application__T5
-VCCHANNEL FORKCHANNEL_S_1_S_Application__chToT3T5__chToT3__chToT5 0
-CHANNEL JOINCHANNEL_S_0__Application__chFromT4__chFromT5__chtoDst BRBW 4 500 OUT Application__T4 IN JOINTASK_S_Application__chFromT4__chFromT5__chtoDst
-VCCHANNEL JOINCHANNEL_S_0__Application__chFromT4__chFromT5__chtoDst 0
-CHANNEL JOINCHANNEL_S_1__Application__chFromT4__chFromT5__chtoDst BRBW 4 500 OUT Application__T5 IN JOINTASK_S_Application__chFromT4__chFromT5__chtoDst
-VCCHANNEL JOINCHANNEL_S_1__Application__chFromT4__chFromT5__chtoDst 0
-
-// Events
-EVENT Application__evtFromT4__Application__evtFromT4(int) NIB 2 Application__T4 Application__Dst
-EVENT Application__evtFromT5__Application__evtFromT5(int) NIB 2 Application__T5 Application__Dst
-EVENT Application__evtToT1__Application__evtToT1(int) NIB 2 Application__Src Application__T1
-EVENT Application__evtToT2__Application__evtToT2(int) NIB 2 Application__T1 Application__T2
-EVENT Application__evtToT3T5__evtToT3__evtToT5(int) NIB 2 Application__T2 FORKTASK_S_EVT_S_Application__evtToT3T5__evtToT3__evtToT5
-EVENT Application__evtToT4__Application__evtToT4(int) NIB 2 Application__T3 Application__T4
-EVENT FORKEVENT_S_0_S_Application__evtToT3T5__evtToT3__evtToT5(int) NIB 2 FORKTASK_S_EVT_S_Application__evtToT3T5__evtToT3__evtToT5 Application__T3
-EVENT FORKEVENT_S_1_S_Application__evtToT3T5__evtToT3__evtToT5(int) NIB 2 FORKTASK_S_EVT_S_Application__evtToT3T5__evtToT3__evtToT5 Application__T5
-
-// Requests
-
-TASK Application__Dst
- TASKOP
- //Local variables
- int size
- int size1
- int size2
-
- //Behavior
- WAIT Application__evtFromT4__Application__evtFromT4 size1
- WAIT Application__evtFromT5__Application__evtFromT5 size2
- READ Application__chFromT4__chFromT5__chtoDst (size1+size2)/2
- size=size1+size2
- EXECI size
-ENDTASK
-
-TASK Application__Src
- TASKOP
- //Local variables
- int size = 100
-
- //Behavior
- NOTIFY Application__evtToT1__Application__evtToT1 size
- WRITE Application__chToT1 size
-ENDTASK
-
-TASK Application__T1
- TASKOP
- //Local variables
- int size
-
- //Behavior
- WAIT Application__evtToT1__Application__evtToT1 size
- READ Application__chToT1 size
- EXECI size
- NOTIFY Application__evtToT2__Application__evtToT2 size
- WRITE Application__chToT2 size
-ENDTASK
-
-TASK Application__T2
- TASKOP
- //Local variables
- int size
-
- //Behavior
- WAIT Application__evtToT2__Application__evtToT2 size
- READ Application__chToT2 size
- EXECI size
- NOTIFY Application__evtToT3T5__evtToT3__evtToT5 size
- WRITE Application__chToT3T5__chToT3__chToT5 size
-ENDTASK
-
-TASK Application__T3
- TASKOP
- //Local variables
- int size
-
- //Behavior
- WAIT FORKEVENT_S_0_S_Application__evtToT3T5__evtToT3__evtToT5 size
- READ FORKCHANNEL_S_0_S_Application__chToT3T5__chToT3__chToT5 size
- EXECI size
- NOTIFY Application__evtToT4__Application__evtToT4 size
- WRITE Application__chToT4 size
-ENDTASK
-
-TASK Application__T4
- TASKOP
- //Local variables
- int size
-
- //Behavior
- WAIT Application__evtToT4__Application__evtToT4 size
- READ Application__chToT4 size
- EXECI size
- NOTIFY Application__evtFromT4__Application__evtFromT4 size
- WRITE JOINCHANNEL_S_0__Application__chFromT4__chFromT5__chtoDst size
-ENDTASK
-
-TASK Application__T5
- TASKOP
- //Local variables
- int size
-
- //Behavior
- WAIT FORKEVENT_S_1_S_Application__evtToT3T5__evtToT3__evtToT5 size
- READ FORKCHANNEL_S_1_S_Application__chToT3T5__chToT3__chToT5 size
- EXECI size
- NOTIFY Application__evtFromT5__Application__evtFromT5 size
- WRITE JOINCHANNEL_S_1__Application__chFromT4__chFromT5__chtoDst size
-ENDTASK
-
-TASK FORKTASK_S_Application__chToT3T5__chToT3__chToT5
- TASKOP
- //Local variables
- int i = 0
-
- //Behavior
- FOR(i=0; i<1; i=i)
- READ Application__chToT3T5__chToT3__chToT5 1
- WRITE FORKCHANNEL_S_0_S_Application__chToT3T5__chToT3__chToT5 1
- WRITE FORKCHANNEL_S_1_S_Application__chToT3T5__chToT3__chToT5 1
- ENDFOR
-ENDTASK
-
-TASK FORKTASK_S_EVT_S_Application__evtToT3T5__evtToT3__evtToT5
- TASKOP
- //Local variables
- int attr_0
- int fork_S_i = 0
-
- //Behavior
- FOR(fork_S_i=0; fork_S_i<1; fork_S_i=0)
- WAIT Application__evtToT3T5__evtToT3__evtToT5 attr_0
- NOTIFY FORKEVENT_S_0_S_Application__evtToT3T5__evtToT3__evtToT5 attr_0
- NOTIFY FORKEVENT_S_1_S_Application__evtToT3T5__evtToT3__evtToT5 attr_0
- ENDFOR
-ENDTASK
-
-TASK JOINTASK_S_Application__chFromT4__chFromT5__chtoDst
- TASKOP
- //Local variables
- int i = 0
-
- //Behavior
- FOR(i=0; i<1; i=i)
- READ JOINCHANNEL_S_0__Application__chFromT4__chFromT5__chtoDst 1
- READ JOINCHANNEL_S_1__Application__chFromT4__chFromT5__chtoDst 1
- WRITE Application__chFromT4__chFromT5__chtoDst 1
- ENDFOR
-ENDTASK
-
--
GitLab