From 28078423d5c6cfac60972b50d156b3dec2f8527f Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr>
Date: Fri, 24 Mar 2023 11:02:13 +0100
Subject: [PATCH] Adding Name checking for RD, UCD, ATD
---
modeling/AVATAR/PressureController.xml | 2690 ++++++++---------
modeling/SysMLSec/at_chuli.xml | 303 +-
src/main/java/ui/GTURTLEModeling.java | 8 +-
src/main/java/ui/MainGUI.java | 29 +-
src/main/java/ui/atd/ATDBlock.java | 4 +-
.../java/ui/atd/AttackTreeDiagramPanel.java | 3 +-
src/main/java/ui/avatarrd/AvatarRDPanel.java | 3 +-
.../java/ui/avatarrd/AvatarRDProperty.java | 4 +-
.../java/ui/avatarrd/AvatarRDRequirement.java | 4 +-
.../java/ui/avatarrd/AvatarRDToolBar.java | 2 +-
src/main/java/ui/ucd/UCDActorBox.java | 4 +-
11 files changed, 1583 insertions(+), 1471 deletions(-)
diff --git a/modeling/AVATAR/PressureController.xml b/modeling/AVATAR/PressureController.xml
index d8209a15cc..ba44adccf9 100644
--- a/modeling/AVATAR/PressureController.xml
+++ b/modeling/AVATAR/PressureController.xml
@@ -1394,11 +1394,11 @@
</COMPONENT>
<COMPONENT type="701" id="874" index="1" uid="f31d4dc2-7390-42eb-96c2-fab486f1feb3" >
-<cdparam x="460" y="233" />
-<sizeparam width="87" height="40" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="459" y="233" />
+<sizeparam width="88" height="40" 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="Use case" value="MonitorAlarm" />
+<infoparam name="Use case" value="monitorAlarm" />
<new d="false" />
<TGConnectingPoint num="0" id="850" />
<TGConnectingPoint num="1" id="851" />
@@ -1619,7 +1619,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<include>>" />
<P1 x="362" y="211" id="877" />
-<P2 x="460" y="253" id="851" />
+<P2 x="459" y="253" id="851" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -3146,9 +3146,9 @@
<Actor data="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="1644" index="10" uid="8c823b16-212c-40cb-ad55-cd46f77e11d6" >
+<SUBCOMPONENT type="630" id="1644" index="10" uid="b44927d1-5cad-4013-990d-00487e5a0c47" >
<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" />
@@ -3156,9 +3156,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1643" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1646" index="11" uid="719c5c95-d6e7-4f51-aa50-af461076d7e6" >
+<SUBCOMPONENT type="630" id="1646" index="11" uid="794c7007-8cd8-44bf-b267-69caea3be6a5" >
<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" />
@@ -3166,9 +3166,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1645" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1648" index="12" uid="ca02a286-6b61-4e87-afc5-3d7bc1ffc68b" >
+<SUBCOMPONENT type="630" id="1648" index="12" uid="e729f82a-8c51-4e21-b052-8dc6f7de9130" >
<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" />
@@ -3176,9 +3176,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1647" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1650" index="13" uid="7dd58099-72f3-46f9-9934-861d6d1fc932" >
+<SUBCOMPONENT type="630" id="1650" index="13" uid="2e132899-4b90-45ef-80e0-14f0e703ac97" >
<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" />
@@ -3186,9 +3186,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1649" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1652" index="14" uid="ddc8c4a4-f26f-4297-8a1d-f8482140f3f7" >
+<SUBCOMPONENT type="630" id="1652" index="14" uid="64c7324f-9c62-4bf7-8389-3e16ba139771" >
<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" />
@@ -3196,9 +3196,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1651" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1654" index="15" uid="b070444b-bce3-4ecc-a11d-c37228f07a09" >
+<SUBCOMPONENT type="630" id="1654" index="15" uid="b4f9f86c-9dab-4af9-aef4-267d2a266a1b" >
<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" />
@@ -3206,9 +3206,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1653" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1656" index="16" uid="5ca72746-87f7-416b-941f-135951b8084f" >
+<SUBCOMPONENT type="630" id="1656" index="16" uid="4c8cc1a7-967d-4edf-942b-299f27a0314b" >
<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" />
@@ -3216,9 +3216,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1655" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1658" index="17" uid="0d29f9e6-b70c-4d58-8d68-0ae8feb44bd4" >
+<SUBCOMPONENT type="630" id="1658" index="17" uid="05ad1542-6f62-4716-9635-d73afebe9fe1" >
<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" />
@@ -3226,9 +3226,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1657" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1660" index="18" uid="0813556f-5ce3-4f93-b487-06cc266bd9c0" >
+<SUBCOMPONENT type="630" id="1660" index="18" uid="426aff79-efa3-46f5-b52c-17aa75132566" >
<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" />
@@ -3236,9 +3236,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1659" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1662" index="19" uid="3ed0dd86-419f-4f90-b4b6-8b327a3c94ec" >
+<SUBCOMPONENT type="630" id="1662" index="19" uid="6f395a04-9541-413a-a69e-517c94a00909" >
<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" />
@@ -3246,9 +3246,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1661" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1664" index="20" uid="e65f54fe-36ea-4690-8572-e3e988517b83" >
+<SUBCOMPONENT type="630" id="1664" index="20" uid="86f1f275-02c1-48cd-9f87-58a848e17258" >
<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" />
@@ -3256,9 +3256,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1663" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1666" index="21" uid="a6a0984a-b818-48e5-bc29-95d2522c8713" >
+<SUBCOMPONENT type="630" id="1666" index="21" uid="caa0cfad-fd46-4f3c-a5c9-3f9dbbc9827b" >
<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" />
@@ -3266,9 +3266,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1665" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1668" index="22" uid="33fcfa6f-6ac5-4c97-9661-7b7be7fcaf75" >
+<SUBCOMPONENT type="630" id="1668" index="22" uid="2d51e5b3-2ae7-471c-8a22-952970a5d9bd" >
<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" />
@@ -3276,9 +3276,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1667" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1670" index="23" uid="136e4f30-88e7-4c46-afa6-5331b8d67e8c" >
+<SUBCOMPONENT type="630" id="1670" index="23" uid="b5d904fd-9fdf-4c0d-a02a-7655d4a72808" >
<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" />
@@ -3286,9 +3286,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1669" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1672" index="24" uid="0af9d4a6-3efa-408d-aaba-3d4fe3df7479" >
+<SUBCOMPONENT type="630" id="1672" index="24" uid="f0d21be4-4a05-45f6-a679-b2b29f3c9957" >
<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" />
@@ -3296,9 +3296,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1671" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1674" index="25" uid="f0d21be4-4a05-45f6-a679-b2b29f3c9957" >
+<SUBCOMPONENT type="630" id="1674" index="25" uid="0af9d4a6-3efa-408d-aaba-3d4fe3df7479" >
<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" />
@@ -3306,9 +3306,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1673" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1676" index="26" uid="b5d904fd-9fdf-4c0d-a02a-7655d4a72808" >
+<SUBCOMPONENT type="630" id="1676" index="26" uid="136e4f30-88e7-4c46-afa6-5331b8d67e8c" >
<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" />
@@ -3316,9 +3316,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1675" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1678" index="27" uid="2d51e5b3-2ae7-471c-8a22-952970a5d9bd" >
+<SUBCOMPONENT type="630" id="1678" index="27" uid="33fcfa6f-6ac5-4c97-9661-7b7be7fcaf75" >
<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" />
@@ -3326,9 +3326,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1677" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1680" index="28" uid="caa0cfad-fd46-4f3c-a5c9-3f9dbbc9827b" >
+<SUBCOMPONENT type="630" id="1680" index="28" uid="a6a0984a-b818-48e5-bc29-95d2522c8713" >
<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" />
@@ -3336,9 +3336,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1679" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1682" index="29" uid="86f1f275-02c1-48cd-9f87-58a848e17258" >
+<SUBCOMPONENT type="630" id="1682" index="29" uid="e65f54fe-36ea-4690-8572-e3e988517b83" >
<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" />
@@ -3346,9 +3346,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1681" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1684" index="30" uid="6f395a04-9541-413a-a69e-517c94a00909" >
+<SUBCOMPONENT type="630" id="1684" index="30" uid="3ed0dd86-419f-4f90-b4b6-8b327a3c94ec" >
<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" />
@@ -3356,9 +3356,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1683" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1686" index="31" uid="426aff79-efa3-46f5-b52c-17aa75132566" >
+<SUBCOMPONENT type="630" id="1686" index="31" uid="0813556f-5ce3-4f93-b487-06cc266bd9c0" >
<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" />
@@ -3366,9 +3366,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1685" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1688" index="32" uid="05ad1542-6f62-4716-9635-d73afebe9fe1" >
+<SUBCOMPONENT type="630" id="1688" index="32" uid="0d29f9e6-b70c-4d58-8d68-0ae8feb44bd4" >
<father id="1703" num="22" />
-<cdparam x="595" y="461" />
+<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" />
@@ -3376,9 +3376,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1687" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1690" index="33" uid="4c8cc1a7-967d-4edf-942b-299f27a0314b" >
+<SUBCOMPONENT type="630" id="1690" index="33" uid="5ca72746-87f7-416b-941f-135951b8084f" >
<father id="1703" num="23" />
-<cdparam x="595" y="461" />
+<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" />
@@ -3386,9 +3386,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1689" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1692" index="34" uid="b4f9f86c-9dab-4af9-aef4-267d2a266a1b" >
+<SUBCOMPONENT type="630" id="1692" index="34" uid="b070444b-bce3-4ecc-a11d-c37228f07a09" >
<father id="1703" num="24" />
-<cdparam x="595" y="461" />
+<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" />
@@ -3396,9 +3396,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1691" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1694" index="35" uid="64c7324f-9c62-4bf7-8389-3e16ba139771" >
+<SUBCOMPONENT type="630" id="1694" index="35" uid="ddc8c4a4-f26f-4297-8a1d-f8482140f3f7" >
<father id="1703" num="25" />
-<cdparam x="595" y="461" />
+<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" />
@@ -3406,9 +3406,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1693" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1696" index="36" uid="2e132899-4b90-45ef-80e0-14f0e703ac97" >
+<SUBCOMPONENT type="630" id="1696" index="36" uid="7dd58099-72f3-46f9-9934-861d6d1fc932" >
<father id="1703" num="26" />
-<cdparam x="595" y="461" />
+<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" />
@@ -3416,9 +3416,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1695" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1698" index="37" uid="e729f82a-8c51-4e21-b052-8dc6f7de9130" >
+<SUBCOMPONENT type="630" id="1698" index="37" uid="ca02a286-6b61-4e87-afc5-3d7bc1ffc68b" >
<father id="1703" num="27" />
-<cdparam x="595" y="461" />
+<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" />
@@ -3426,9 +3426,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1697" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1700" index="38" uid="794c7007-8cd8-44bf-b267-69caea3be6a5" >
+<SUBCOMPONENT type="630" id="1700" index="38" uid="719c5c95-d6e7-4f51-aa50-af461076d7e6" >
<father id="1703" num="28" />
-<cdparam x="595" y="461" />
+<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" />
@@ -3436,9 +3436,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1699" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1702" index="39" uid="b44927d1-5cad-4013-990d-00487e5a0c47" >
+<SUBCOMPONENT type="630" id="1702" index="39" uid="8c823b16-212c-40cb-ad55-cd46f77e11d6" >
<father id="1703" num="29" />
-<cdparam x="595" y="461" />
+<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" />
@@ -3458,13 +3458,13 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="625" id="1712" index="40" uid="307fa1e3-bb4c-4aa3-bde4-11aea9e84f35" >
+<SUBCOMPONENT type="627" id="1712" index="40" uid="28c90d41-87f4-463d-9426-ddd68fe53bc1" >
<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}" />
<new d="false" />
<TGConnectingPoint num="0" id="1704" />
<TGConnectingPoint num="1" id="1705" />
@@ -3475,12 +3475,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" index="41" uid="90d66eaf-5ebc-4965-990c-d85bf0fe0cb9" >
+<SUBCOMPONENT type="630" id="1714" index="41" uid="fe2c0f8e-00c9-4401-9226-abefe7a4bd1e" >
<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" />
@@ -3488,9 +3488,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1713" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1716" index="42" uid="96cc6abc-54f0-40a4-870b-49352c2da49f" >
+<SUBCOMPONENT type="630" id="1716" index="42" uid="9676a272-ff84-4776-92ec-b6021ef44e3a" >
<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" />
@@ -3498,9 +3498,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1715" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1718" index="43" uid="35d983e9-10cd-4a98-87ce-3c3ae95c228a" >
+<SUBCOMPONENT type="630" id="1718" index="43" uid="b9f20c43-1ea5-45f1-89a0-5f766c87cb16" >
<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" />
@@ -3508,9 +3508,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1717" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1720" index="44" uid="445a9d06-47d1-4343-b247-9bab4bb85401" >
+<SUBCOMPONENT type="630" id="1720" index="44" uid="e2f58d1e-b68e-4a5b-b5c1-819b9f8ae38a" >
<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" />
@@ -3518,9 +3518,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1719" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1722" index="45" uid="c058b0a8-4dcc-410d-9da6-a20e77a0845e" >
+<SUBCOMPONENT type="630" id="1722" index="45" uid="3a4a4820-3a32-477e-9ccf-c49036948680" >
<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" />
@@ -3528,9 +3528,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1721" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1724" index="46" uid="5bb17ce7-9353-4340-9c45-fbbda3f8a3c7" >
+<SUBCOMPONENT type="630" id="1724" index="46" uid="0593b5aa-55bd-4b5d-bf9f-acff81b093d2" >
<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" />
@@ -3538,9 +3538,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1723" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1726" index="47" uid="7bf89378-b53a-4303-8adb-6524713be5d9" >
+<SUBCOMPONENT type="630" id="1726" index="47" uid="8d1c96ad-8fba-4da7-a3e0-939d163e745f" >
<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" />
@@ -3548,9 +3548,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1725" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1728" index="48" uid="bcf14cd6-23b3-49c6-bd55-af25e46e557d" >
+<SUBCOMPONENT type="630" id="1728" index="48" uid="94617cd0-9ba2-4a31-8150-86d95e1acec9" >
<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" />
@@ -3558,9 +3558,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1727" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1730" index="49" uid="4d709db7-c213-4865-96d5-08482634b999" >
+<SUBCOMPONENT type="630" id="1730" index="49" uid="a96495df-c781-4f00-a554-1d9b1b2f2dca" >
<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" />
@@ -3568,9 +3568,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1729" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1732" index="50" uid="2f3405b8-3416-4198-b3cb-ed2bc70f2736" >
+<SUBCOMPONENT type="630" id="1732" index="50" uid="10e4bd45-245d-4917-a107-26fc0301f7cf" >
<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" />
@@ -3578,9 +3578,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1731" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1734" index="51" uid="f3e2eeef-f580-4fbe-b887-3f820397e66c" >
+<SUBCOMPONENT type="630" id="1734" index="51" uid="5daf9c95-858a-4b71-ad07-4a4cec202852" >
<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" />
@@ -3588,9 +3588,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1733" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1736" index="52" uid="74d4668e-c4c7-42cb-9078-77dbb8efaaa6" >
+<SUBCOMPONENT type="630" id="1736" index="52" uid="a8fc28c6-2cf1-487e-b8c4-df8ec01cc86d" >
<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" />
@@ -3598,9 +3598,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1735" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1738" index="53" uid="c7141445-477e-4dd1-a2c7-1b9cdbf33728" >
+<SUBCOMPONENT type="630" id="1738" index="53" uid="36f1115e-bc1d-4664-bb39-3dfd015041e2" >
<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" />
@@ -3608,9 +3608,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1737" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1740" index="54" uid="4e677d7b-f86e-4e3b-80ce-781a88566689" >
+<SUBCOMPONENT type="630" id="1740" index="54" uid="7f860cbb-c37e-4de4-af22-d841a2e5724d" >
<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" />
@@ -3618,9 +3618,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1739" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1742" index="55" uid="6361be39-c855-4ade-8b8f-f44a99c1ec6b" >
+<SUBCOMPONENT type="630" id="1742" index="55" uid="754c0cd0-0656-4324-b900-74db058a5b16" >
<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" />
@@ -3628,9 +3628,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1741" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1744" index="56" uid="754c0cd0-0656-4324-b900-74db058a5b16" >
+<SUBCOMPONENT type="630" id="1744" index="56" uid="6361be39-c855-4ade-8b8f-f44a99c1ec6b" >
<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" />
@@ -3638,9 +3638,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1743" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1746" index="57" uid="7f860cbb-c37e-4de4-af22-d841a2e5724d" >
+<SUBCOMPONENT type="630" id="1746" index="57" uid="4e677d7b-f86e-4e3b-80ce-781a88566689" >
<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" />
@@ -3648,9 +3648,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1745" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1748" index="58" uid="36f1115e-bc1d-4664-bb39-3dfd015041e2" >
+<SUBCOMPONENT type="630" id="1748" index="58" uid="c7141445-477e-4dd1-a2c7-1b9cdbf33728" >
<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" />
@@ -3658,9 +3658,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1747" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1750" index="59" uid="a8fc28c6-2cf1-487e-b8c4-df8ec01cc86d" >
+<SUBCOMPONENT type="630" id="1750" index="59" uid="74d4668e-c4c7-42cb-9078-77dbb8efaaa6" >
<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" />
@@ -3668,9 +3668,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1749" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1752" index="60" uid="5daf9c95-858a-4b71-ad07-4a4cec202852" >
+<SUBCOMPONENT type="630" id="1752" index="60" uid="f3e2eeef-f580-4fbe-b887-3f820397e66c" >
<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" />
@@ -3678,9 +3678,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1751" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1754" index="61" uid="10e4bd45-245d-4917-a107-26fc0301f7cf" >
+<SUBCOMPONENT type="630" id="1754" index="61" uid="2f3405b8-3416-4198-b3cb-ed2bc70f2736" >
<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" />
@@ -3688,9 +3688,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1753" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1756" index="62" uid="a96495df-c781-4f00-a554-1d9b1b2f2dca" >
+<SUBCOMPONENT type="630" id="1756" index="62" uid="4d709db7-c213-4865-96d5-08482634b999" >
<father id="1782" num="22" />
-<cdparam x="352" y="461" />
+<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" />
@@ -3698,9 +3698,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1755" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1758" index="63" uid="94617cd0-9ba2-4a31-8150-86d95e1acec9" >
+<SUBCOMPONENT type="630" id="1758" index="63" uid="bcf14cd6-23b3-49c6-bd55-af25e46e557d" >
<father id="1782" num="23" />
-<cdparam x="352" y="461" />
+<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" />
@@ -3708,9 +3708,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1757" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1760" index="64" uid="8d1c96ad-8fba-4da7-a3e0-939d163e745f" >
+<SUBCOMPONENT type="630" id="1760" index="64" uid="7bf89378-b53a-4303-8adb-6524713be5d9" >
<father id="1782" num="24" />
-<cdparam x="352" y="461" />
+<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" />
@@ -3718,9 +3718,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1759" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1762" index="65" uid="0593b5aa-55bd-4b5d-bf9f-acff81b093d2" >
+<SUBCOMPONENT type="630" id="1762" index="65" uid="5bb17ce7-9353-4340-9c45-fbbda3f8a3c7" >
<father id="1782" num="25" />
-<cdparam x="352" y="461" />
+<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" />
@@ -3728,9 +3728,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1761" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1764" index="66" uid="3a4a4820-3a32-477e-9ccf-c49036948680" >
+<SUBCOMPONENT type="630" id="1764" index="66" uid="c058b0a8-4dcc-410d-9da6-a20e77a0845e" >
<father id="1782" num="26" />
-<cdparam x="352" y="461" />
+<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" />
@@ -3738,9 +3738,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1763" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1766" index="67" uid="e2f58d1e-b68e-4a5b-b5c1-819b9f8ae38a" >
+<SUBCOMPONENT type="630" id="1766" index="67" uid="445a9d06-47d1-4343-b247-9bab4bb85401" >
<father id="1782" num="27" />
-<cdparam x="352" y="461" />
+<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" />
@@ -3748,9 +3748,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1765" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1768" index="68" uid="b9f20c43-1ea5-45f1-89a0-5f766c87cb16" >
+<SUBCOMPONENT type="630" id="1768" index="68" uid="35d983e9-10cd-4a98-87ce-3c3ae95c228a" >
<father id="1782" num="28" />
-<cdparam x="352" y="461" />
+<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" />
@@ -3758,9 +3758,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1767" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1770" index="69" uid="9676a272-ff84-4776-92ec-b6021ef44e3a" >
+<SUBCOMPONENT type="630" id="1770" index="69" uid="96cc6abc-54f0-40a4-870b-49352c2da49f" >
<father id="1782" num="29" />
-<cdparam x="352" y="461" />
+<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" />
@@ -3768,9 +3768,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1769" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1772" index="70" uid="fe2c0f8e-00c9-4401-9226-abefe7a4bd1e" >
+<SUBCOMPONENT type="630" id="1772" index="70" uid="90d66eaf-5ebc-4965-990c-d85bf0fe0cb9" >
<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" />
@@ -3778,13 +3778,13 @@
<new d="false" />
<TGConnectingPoint num="0" id="1771" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="1781" index="71" uid="28c90d41-87f4-463d-9426-ddd68fe53bc1" >
+<SUBCOMPONENT type="625" id="1781" index="71" uid="307fa1e3-bb4c-4aa3-bde4-11aea9e84f35" >
<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}" />
<new d="false" />
<TGConnectingPoint num="0" id="1773" />
<TGConnectingPoint num="1" id="1774" />
@@ -3795,7 +3795,7 @@
<TGConnectingPoint num="6" id="1779" />
<TGConnectingPoint num="7" id="1780" />
<extraparam>
-<Interval timer="timerAlarm" />
+<Interval timer="timerAlarm" duration="60" />
</extraparam>
</SUBCOMPONENT>
@@ -3810,9 +3810,9 @@
<Actor data="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="1784" index="72" uid="fc46b9c9-23db-4592-8eb8-d7d2c472ca26" >
+<SUBCOMPONENT type="630" id="1784" index="72" uid="54cd3f50-d946-4343-8ff4-db9927876acf" >
<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" />
@@ -3820,9 +3820,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1783" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1786" index="73" uid="d376fc2a-0523-49c7-b6b2-18c759f87b59" >
+<SUBCOMPONENT type="630" id="1786" index="73" uid="715a1a11-fc5e-4356-bf91-60d5ff9e1378" >
<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" />
@@ -3830,9 +3830,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1785" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1788" index="74" uid="b042fa41-f912-4dec-9c71-d2bb7c1282d3" >
+<SUBCOMPONENT type="630" id="1788" index="74" uid="e8f8cfb9-4102-4124-9d86-c3b6b4ddf029" >
<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" />
@@ -3840,9 +3840,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1787" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1790" index="75" uid="62c2bd07-1c16-4e59-b670-4dfe54771c01" >
+<SUBCOMPONENT type="630" id="1790" index="75" uid="767e0365-da9a-4fd4-a540-ab9ad5e605e7" >
<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" />
@@ -3850,9 +3850,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1789" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1792" index="76" uid="9e4a1dc3-bdc2-47d2-be2c-9e1f71cb1ebc" >
+<SUBCOMPONENT type="630" id="1792" index="76" uid="ea1cd47f-bc53-4243-89e9-73d1448fd77c" >
<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" />
@@ -3860,9 +3860,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1791" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1794" index="77" uid="2348627f-b1a8-4eb9-9830-54e45c232a59" >
+<SUBCOMPONENT type="630" id="1794" index="77" uid="268512cb-6509-4f3f-83ab-e0e10be6e70e" >
<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" />
@@ -3870,9 +3870,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1793" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1796" index="78" uid="53768b00-b3c2-486d-8381-8302f38ef440" >
+<SUBCOMPONENT type="630" id="1796" index="78" uid="557a0287-2b0c-44e6-802f-c3d37b28058e" >
<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" />
@@ -3880,9 +3880,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1795" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1798" index="79" uid="71062df9-4b7a-4bd0-b201-718d64263667" >
+<SUBCOMPONENT type="630" id="1798" index="79" uid="56a3360d-8f7f-48fb-9bbf-3a90a6ddc209" >
<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" />
@@ -3890,9 +3890,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1797" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1800" index="80" uid="b95fd80e-39b0-45ee-ab63-f2a0617c2043" >
+<SUBCOMPONENT type="630" id="1800" index="80" uid="32320648-84fa-473e-afb4-1a5d00ab3a6b" >
<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" />
@@ -3900,9 +3900,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1799" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1802" index="81" uid="46ba4801-a011-4d7e-9de7-b99c61b08ca9" >
+<SUBCOMPONENT type="630" id="1802" index="81" uid="991dd15b-c418-4f5d-a3f8-fd8cd6668913" >
<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" />
@@ -3910,9 +3910,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1801" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1804" index="82" uid="533965c7-112b-4f60-8ff1-ab667a2fb9c7" >
+<SUBCOMPONENT type="630" id="1804" index="82" uid="74f17162-0f2d-441a-8371-bcff5606a52d" >
<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" />
@@ -3920,9 +3920,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1803" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1806" index="83" uid="bc601433-ae72-4375-9027-a154d011907e" >
+<SUBCOMPONENT type="630" id="1806" index="83" uid="b573e8bf-6584-4500-a0d4-daa758ba5020" >
<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" />
@@ -3930,9 +3930,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1805" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1808" index="84" uid="9417436b-0df0-4287-bfb1-4c25eb19c739" >
+<SUBCOMPONENT type="630" id="1808" index="84" uid="9f6297d2-7035-4c4e-a710-ded15a89d733" >
<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" />
@@ -3940,9 +3940,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1807" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1810" index="85" uid="ecece65d-b160-4655-848d-89fa6ae160a6" >
+<SUBCOMPONENT type="630" id="1810" index="85" uid="715b0b47-7232-4047-958e-d725cbcc0729" >
<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" />
@@ -3950,9 +3950,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1809" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1812" index="86" uid="d1598871-085b-4614-a900-a5dd9492a3a3" >
+<SUBCOMPONENT type="630" id="1812" index="86" uid="21856ca8-41bc-4aa4-9f4f-453c64c470f5" >
<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" />
@@ -3960,9 +3960,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1811" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1814" index="87" uid="21856ca8-41bc-4aa4-9f4f-453c64c470f5" >
+<SUBCOMPONENT type="630" id="1814" index="87" uid="d1598871-085b-4614-a900-a5dd9492a3a3" >
<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" />
@@ -3970,9 +3970,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1813" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1816" index="88" uid="715b0b47-7232-4047-958e-d725cbcc0729" >
+<SUBCOMPONENT type="630" id="1816" index="88" uid="ecece65d-b160-4655-848d-89fa6ae160a6" >
<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" />
@@ -3980,9 +3980,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1815" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1818" index="89" uid="9f6297d2-7035-4c4e-a710-ded15a89d733" >
+<SUBCOMPONENT type="630" id="1818" index="89" uid="9417436b-0df0-4287-bfb1-4c25eb19c739" >
<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" />
@@ -3990,9 +3990,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1817" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1820" index="90" uid="b573e8bf-6584-4500-a0d4-daa758ba5020" >
+<SUBCOMPONENT type="630" id="1820" index="90" uid="bc601433-ae72-4375-9027-a154d011907e" >
<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" />
@@ -4000,9 +4000,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1819" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1822" index="91" uid="74f17162-0f2d-441a-8371-bcff5606a52d" >
+<SUBCOMPONENT type="630" id="1822" index="91" uid="533965c7-112b-4f60-8ff1-ab667a2fb9c7" >
<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" />
@@ -4010,9 +4010,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1821" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1824" index="92" uid="991dd15b-c418-4f5d-a3f8-fd8cd6668913" >
+<SUBCOMPONENT type="630" id="1824" index="92" uid="46ba4801-a011-4d7e-9de7-b99c61b08ca9" >
<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" />
@@ -4020,9 +4020,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1823" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1826" index="93" uid="32320648-84fa-473e-afb4-1a5d00ab3a6b" >
+<SUBCOMPONENT type="630" id="1826" index="93" uid="b95fd80e-39b0-45ee-ab63-f2a0617c2043" >
<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" />
@@ -4030,9 +4030,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1825" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1828" index="94" uid="56a3360d-8f7f-48fb-9bbf-3a90a6ddc209" >
+<SUBCOMPONENT type="630" id="1828" index="94" uid="71062df9-4b7a-4bd0-b201-718d64263667" >
<father id="1843" num="22" />
-<cdparam x="105" y="461" />
+<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" />
@@ -4040,9 +4040,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1827" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1830" index="95" uid="557a0287-2b0c-44e6-802f-c3d37b28058e" >
+<SUBCOMPONENT type="630" id="1830" index="95" uid="53768b00-b3c2-486d-8381-8302f38ef440" >
<father id="1843" num="23" />
-<cdparam x="105" y="461" />
+<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" />
@@ -4050,9 +4050,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1829" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1832" index="96" uid="268512cb-6509-4f3f-83ab-e0e10be6e70e" >
+<SUBCOMPONENT type="630" id="1832" index="96" uid="2348627f-b1a8-4eb9-9830-54e45c232a59" >
<father id="1843" num="24" />
-<cdparam x="105" y="461" />
+<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" />
@@ -4060,9 +4060,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1831" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1834" index="97" uid="ea1cd47f-bc53-4243-89e9-73d1448fd77c" >
+<SUBCOMPONENT type="630" id="1834" index="97" uid="9e4a1dc3-bdc2-47d2-be2c-9e1f71cb1ebc" >
<father id="1843" num="25" />
-<cdparam x="105" y="461" />
+<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" />
@@ -4070,9 +4070,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1833" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1836" index="98" uid="767e0365-da9a-4fd4-a540-ab9ad5e605e7" >
+<SUBCOMPONENT type="630" id="1836" index="98" uid="62c2bd07-1c16-4e59-b670-4dfe54771c01" >
<father id="1843" num="26" />
-<cdparam x="105" y="461" />
+<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" />
@@ -4080,9 +4080,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1835" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1838" index="99" uid="e8f8cfb9-4102-4124-9d86-c3b6b4ddf029" >
+<SUBCOMPONENT type="630" id="1838" index="99" uid="b042fa41-f912-4dec-9c71-d2bb7c1282d3" >
<father id="1843" num="27" />
-<cdparam x="105" y="461" />
+<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" />
@@ -4090,9 +4090,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1837" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1840" index="100" uid="715a1a11-fc5e-4356-bf91-60d5ff9e1378" >
+<SUBCOMPONENT type="630" id="1840" index="100" uid="d376fc2a-0523-49c7-b6b2-18c759f87b59" >
<father id="1843" num="28" />
-<cdparam x="105" y="461" />
+<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" />
@@ -4100,9 +4100,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1839" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1842" index="101" uid="54cd3f50-d946-4343-8ff4-db9927876acf" >
+<SUBCOMPONENT type="630" id="1842" index="101" uid="fc46b9c9-23db-4592-8eb8-d7d2c472ca26" >
<father id="1843" num="29" />
-<cdparam x="105" y="461" />
+<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" />
@@ -4115,8 +4115,8 @@
<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="468" id="1827" />
-<P2 x="352" y="468" id="1755" />
+<P1 x="105" y="468" id="1797" />
+<P2 x="352" y="468" id="1729" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -4124,8 +4124,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -4133,8 +4133,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -4142,8 +4142,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -4151,8 +4151,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -4160,8 +4160,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -4169,8 +4169,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -4189,177 +4189,214 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="1852" index="13" uid="7fe8ecec-e70e-4642-803d-589b8e553305" >
+<SUBCOMPONENT type="623" id="1859" index="13" uid="17961d53-92be-4fca-b9e0-6ee24aca6528" >
<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" />
<new d="false" />
<TGConnectingPoint num="0" id="1851" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1854" index="14" uid="0da85087-066f-4d31-b4b7-98cebdf67b0d" >
+<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" index="14" uid="b090f01f-b18c-4d69-9bad-b33ac30f3ce3" >
<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" />
+<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="355" />
+<infoparam name="Line of relative time constraint" value="rtc" />
<new d="false" />
-<TGConnectingPoint num="0" id="1853" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1856" index="15" uid="fe132aa2-65d9-40a9-9997-701421816a4f" >
+<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" index="15" uid="b33841e7-330a-471f-8f5c-60172c372631" >
<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" />
+<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="355" />
+<infoparam name="Line of relative time constraint" value="rtc" />
<new d="false" />
-<TGConnectingPoint num="0" id="1855" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1858" index="16" uid="849242f4-58be-4d7d-a277-774b1d6b4c0b" >
+<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" index="16" uid="8a941455-cb6e-41a0-be20-a2a6f745680b" >
<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" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
+<infoparam name="action state" value="timerValue = 59" />
<new d="false" />
-<TGConnectingPoint num="0" id="1857" />
+<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="630" id="1860" index="17" uid="90bfcc6d-c955-430c-b3da-8198b48f7f2d" >
+<SUBCOMPONENT type="623" id="1897" index="17" uid="4a8b03bd-a9be-4d25-8204-06cce92d5501" >
<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" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
+<infoparam name="action state" value="timerValue = 60" />
<new d="false" />
-<TGConnectingPoint num="0" id="1859" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1862" index="18" uid="abc596d1-1c81-449e-b17b-d37975630c5e" >
+<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" index="18" uid="9b2fba88-d123-498c-b4bf-67ce016dca46" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1861" />
+<TGConnectingPoint num="0" id="1898" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1864" index="19" uid="1078ea7f-7be2-4c17-89f9-3e4d89558f87" >
+<SUBCOMPONENT type="630" id="1901" index="19" uid="daf27d4c-a6a1-4cf4-91b8-a24d9d885822" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1863" />
+<TGConnectingPoint num="0" id="1900" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1866" index="20" uid="5ac0ee27-a74d-41b8-8b54-95baa5988b33" >
+<SUBCOMPONENT type="630" id="1903" index="20" uid="b6fb9a05-c198-40f9-99ad-dc01fe49be3d" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1865" />
+<TGConnectingPoint num="0" id="1902" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1868" index="21" uid="c01660b0-ee2a-4070-b840-037fd95d1f94" >
+<SUBCOMPONENT type="630" id="1905" index="21" uid="90dfdcf7-d8b8-46ef-9980-399a46c2713e" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1867" />
+<TGConnectingPoint num="0" id="1904" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1870" index="22" uid="fc2a8fe2-152d-411e-bea5-f3355e60edcb" >
+<SUBCOMPONENT type="630" id="1907" index="22" uid="fb51b31b-7b4b-4211-881a-0ea89568ce6a" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1869" />
+<TGConnectingPoint num="0" id="1906" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1872" index="23" uid="86cb5eab-ed02-494b-a5f4-7ca24216b135" >
+<SUBCOMPONENT type="630" id="1909" index="23" uid="a92479ac-c71a-45dc-8c1e-6d3599c6846e" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1871" />
+<TGConnectingPoint num="0" id="1908" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1874" index="24" uid="0e2048b8-7453-4c68-ae13-0049e305015e" >
+<SUBCOMPONENT type="630" id="1911" index="24" uid="7261b289-8929-4bca-92c5-d5b15728c681" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1873" />
+<TGConnectingPoint num="0" id="1910" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1876" index="25" uid="ec5a2d2a-e03e-47f4-bbd4-8bbf0d4e90cc" >
+<SUBCOMPONENT type="630" id="1913" index="25" uid="df4cb2c0-287d-4b8a-999d-a91b41ac60b8" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1875" />
+<TGConnectingPoint num="0" id="1912" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1878" index="26" uid="abd51e21-8b86-4511-8e0e-e10494077550" >
+<SUBCOMPONENT type="630" id="1915" index="26" uid="35517c38-363f-4d11-8f05-2787acc00376" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1877" />
+<TGConnectingPoint num="0" id="1914" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1880" index="27" uid="8c6fba24-7add-43f5-9347-9560d8447d3b" >
+<SUBCOMPONENT type="630" id="1917" index="27" uid="2cd98976-b915-4c4a-9f19-6225402e9a74" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1879" />
+<TGConnectingPoint num="0" id="1916" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1882" index="28" uid="1cc07eee-34a1-46d7-b744-26bfc2042542" >
+<SUBCOMPONENT type="630" id="1919" index="28" uid="a068f50c-9c12-438b-b888-3c1a0bb319b8" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1881" />
+<TGConnectingPoint num="0" id="1918" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1884" index="29" uid="9e9be8c7-eb66-47b5-8fa9-b4e3ea515c18" >
+<SUBCOMPONENT type="630" id="1921" index="29" uid="b7fce60e-b3cd-4b2a-9c16-12d6951ad51c" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1883" />
+<TGConnectingPoint num="0" id="1920" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1886" index="30" uid="f6ec400f-a9cf-4edd-bf69-16f47f3cf8c8" >
+<SUBCOMPONENT type="630" id="1923" index="30" uid="f6ec400f-a9cf-4edd-bf69-16f47f3cf8c8" >
<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" />
@@ -4367,214 +4404,177 @@
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
<new d="false" />
-<TGConnectingPoint num="0" id="1885" />
+<TGConnectingPoint num="0" id="1922" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1888" index="31" uid="b7fce60e-b3cd-4b2a-9c16-12d6951ad51c" >
+<SUBCOMPONENT type="630" id="1925" index="31" uid="9e9be8c7-eb66-47b5-8fa9-b4e3ea515c18" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1887" />
+<TGConnectingPoint num="0" id="1924" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1890" index="32" uid="a068f50c-9c12-438b-b888-3c1a0bb319b8" >
+<SUBCOMPONENT type="630" id="1927" index="32" uid="1cc07eee-34a1-46d7-b744-26bfc2042542" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1889" />
+<TGConnectingPoint num="0" id="1926" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1892" index="33" uid="2cd98976-b915-4c4a-9f19-6225402e9a74" >
+<SUBCOMPONENT type="630" id="1929" index="33" uid="8c6fba24-7add-43f5-9347-9560d8447d3b" >
<father id="1958" num="20" />
-<cdparam x="516" y="436" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1891" />
+<TGConnectingPoint num="0" id="1928" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1894" index="34" uid="35517c38-363f-4d11-8f05-2787acc00376" >
+<SUBCOMPONENT type="630" id="1931" index="34" uid="abd51e21-8b86-4511-8e0e-e10494077550" >
<father id="1958" num="21" />
-<cdparam x="516" y="436" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1893" />
+<TGConnectingPoint num="0" id="1930" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1896" index="35" uid="df4cb2c0-287d-4b8a-999d-a91b41ac60b8" >
+<SUBCOMPONENT type="630" id="1933" index="35" uid="ec5a2d2a-e03e-47f4-bbd4-8bbf0d4e90cc" >
<father id="1958" num="22" />
-<cdparam x="516" y="436" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1895" />
+<TGConnectingPoint num="0" id="1932" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1898" index="36" uid="7261b289-8929-4bca-92c5-d5b15728c681" >
+<SUBCOMPONENT type="630" id="1935" index="36" uid="0e2048b8-7453-4c68-ae13-0049e305015e" >
<father id="1958" num="23" />
-<cdparam x="516" y="436" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1897" />
+<TGConnectingPoint num="0" id="1934" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1900" index="37" uid="a92479ac-c71a-45dc-8c1e-6d3599c6846e" >
+<SUBCOMPONENT type="630" id="1937" index="37" uid="86cb5eab-ed02-494b-a5f4-7ca24216b135" >
<father id="1958" num="24" />
-<cdparam x="516" y="436" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1899" />
+<TGConnectingPoint num="0" id="1936" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1902" index="38" uid="fb51b31b-7b4b-4211-881a-0ea89568ce6a" >
+<SUBCOMPONENT type="630" id="1939" index="38" uid="fc2a8fe2-152d-411e-bea5-f3355e60edcb" >
<father id="1958" num="25" />
-<cdparam x="516" y="436" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1901" />
+<TGConnectingPoint num="0" id="1938" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1904" index="39" uid="90dfdcf7-d8b8-46ef-9980-399a46c2713e" >
+<SUBCOMPONENT type="630" id="1941" index="39" uid="c01660b0-ee2a-4070-b840-037fd95d1f94" >
<father id="1958" num="26" />
-<cdparam x="516" y="436" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1903" />
+<TGConnectingPoint num="0" id="1940" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1906" index="40" uid="b6fb9a05-c198-40f9-99ad-dc01fe49be3d" >
+<SUBCOMPONENT type="630" id="1943" index="40" uid="5ac0ee27-a74d-41b8-8b54-95baa5988b33" >
<father id="1958" num="27" />
-<cdparam x="516" y="436" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1905" />
+<TGConnectingPoint num="0" id="1942" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1908" index="41" uid="daf27d4c-a6a1-4cf4-91b8-a24d9d885822" >
+<SUBCOMPONENT type="630" id="1945" index="41" uid="1078ea7f-7be2-4c17-89f9-3e4d89558f87" >
<father id="1958" num="28" />
-<cdparam x="516" y="436" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1907" />
+<TGConnectingPoint num="0" id="1944" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1910" index="42" uid="9b2fba88-d123-498c-b4bf-67ce016dca46" >
+<SUBCOMPONENT type="630" id="1947" index="42" uid="abc596d1-1c81-449e-b17b-d37975630c5e" >
<father id="1958" num="29" />
-<cdparam x="516" y="436" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="1909" />
+<TGConnectingPoint num="0" id="1946" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1919" index="43" uid="4a8b03bd-a9be-4d25-8204-06cce92d5501" >
+<SUBCOMPONENT type="630" id="1949" index="43" uid="90bfcc6d-c955-430c-b3da-8198b48f7f2d" >
<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" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
<new d="false" />
-<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" />
+<TGConnectingPoint num="0" id="1948" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1928" index="44" uid="8a941455-cb6e-41a0-be20-a2a6f745680b" >
+<SUBCOMPONENT type="630" id="1951" index="44" uid="849242f4-58be-4d7d-a277-774b1d6b4c0b" >
<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" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
<new d="false" />
-<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" index="45" uid="b33841e7-330a-471f-8f5c-60172c372631" >
+<TGConnectingPoint num="0" id="1950" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1953" index="45" uid="fe132aa2-65d9-40a9-9997-701421816a4f" >
<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" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
<new d="false" />
-<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" index="46" uid="b090f01f-b18c-4d69-9bad-b33ac30f3ce3" >
+<TGConnectingPoint num="0" id="1952" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1955" index="46" uid="0da85087-066f-4d31-b4b7-98cebdf67b0d" >
<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" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
<new d="false" />
-<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" index="47" uid="17961d53-92be-4fca-b9e0-6ee24aca6528" >
+<TGConnectingPoint num="0" id="1954" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1957" index="47" uid="7fe8ecec-e70e-4642-803d-589b8e553305" >
<father id="1958" num="34" />
-<cdparam x="516" y="431" />
-<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" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
<new d="false" />
-<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" />
+<TGConnectingPoint num="0" id="1956" />
</SUBCOMPONENT>
<COMPONENT type="620" id="2019" index="1" uid="c740cbe2-fe81-4bab-941a-4c88b58bf748" >
@@ -4588,9 +4588,9 @@
<Actor data="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="1960" index="48" uid="4e136747-4ba2-46fd-95ea-776cbf0982bb" >
+<SUBCOMPONENT type="630" id="1960" index="48" uid="932875fe-72ab-46a3-b584-eafab2316ddc" >
<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" />
@@ -4598,9 +4598,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1959" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1962" index="49" uid="36274c81-2e64-4c46-8e21-26ee2823a8e7" >
+<SUBCOMPONENT type="630" id="1962" index="49" uid="0a28b8e7-6508-41a4-ae67-70ecaf54110a" >
<father id="2019" num="1" />
-<cdparam x="716" y="434" />
+<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" />
@@ -4608,9 +4608,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1961" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1964" index="50" uid="f250be3e-de27-4eaf-ada3-97f8c7f210a8" >
+<SUBCOMPONENT type="630" id="1964" index="50" uid="96479917-a72a-4773-bb6e-73b6aa479d2d" >
<father id="2019" num="2" />
-<cdparam x="716" y="434" />
+<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" />
@@ -4618,9 +4618,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1963" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1966" index="51" uid="aaac4e7d-67ac-4e5a-8bca-9fbadac4e626" >
+<SUBCOMPONENT type="630" id="1966" index="51" uid="3e2343e2-918a-4ca4-a81e-8a0db3b677a1" >
<father id="2019" num="3" />
-<cdparam x="716" y="434" />
+<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" />
@@ -4628,9 +4628,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1965" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1968" index="52" uid="ee53fa59-5bbf-49f9-b294-fe35f6523c0a" >
+<SUBCOMPONENT type="630" id="1968" index="52" uid="f4bc4122-1669-4225-a32a-a19d0f879b6e" >
<father id="2019" num="4" />
-<cdparam x="716" y="434" />
+<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" />
@@ -4638,9 +4638,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1967" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1970" index="53" uid="e35927b7-3edf-4971-9eb1-d68fac373a52" >
+<SUBCOMPONENT type="630" id="1970" index="53" uid="89241893-984e-41c4-b3ac-85c664112f3b" >
<father id="2019" num="5" />
-<cdparam x="716" y="434" />
+<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" />
@@ -4648,9 +4648,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1969" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1972" index="54" uid="333116a7-fd4c-4e7f-828e-4ca66e62ed15" >
+<SUBCOMPONENT type="630" id="1972" index="54" uid="5b884835-e1ad-4564-b97c-340ed9207967" >
<father id="2019" num="6" />
-<cdparam x="716" y="434" />
+<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" />
@@ -4658,9 +4658,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1971" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1974" index="55" uid="4c426045-7f35-44d0-acdc-b010dc2aecea" >
+<SUBCOMPONENT type="630" id="1974" index="55" uid="4e832e20-62f0-4778-8c88-e8ef9967a6d2" >
<father id="2019" num="7" />
-<cdparam x="716" y="434" />
+<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" />
@@ -4668,9 +4668,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1973" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1976" index="56" uid="880a52e8-9803-42e6-b887-567d721bd956" >
+<SUBCOMPONENT type="630" id="1976" index="56" uid="35e7d20b-7b08-4b0d-9be5-4224c9dcf3f7" >
<father id="2019" num="8" />
-<cdparam x="716" y="434" />
+<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" />
@@ -4678,9 +4678,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1975" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1978" index="57" uid="93589e37-83cc-4eec-95db-fe1dba6929e8" >
+<SUBCOMPONENT type="630" id="1978" index="57" uid="9415ea82-3a93-43e9-bcc7-1abc5425e489" >
<father id="2019" num="9" />
-<cdparam x="716" y="434" />
+<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" />
@@ -4688,9 +4688,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1977" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1980" index="58" uid="fb19e2b3-1b1c-4b2f-95ae-4cdf902529c7" >
+<SUBCOMPONENT type="630" id="1980" index="58" uid="b74f5829-a5a7-48a4-afd8-636c35fce436" >
<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" />
@@ -4698,9 +4698,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1979" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1982" index="59" uid="8ef66257-ed03-45d6-ab84-4b93517cbbb5" >
+<SUBCOMPONENT type="630" id="1982" index="59" uid="517fcaa9-e667-4357-92a7-e5df9352551e" >
<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" />
@@ -4708,9 +4708,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1981" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1984" index="60" uid="9ff5390c-9ca5-4fcc-a84e-5e56f8f02936" >
+<SUBCOMPONENT type="630" id="1984" index="60" uid="5085753e-b473-4033-8ec1-0e0fb18774d2" >
<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" />
@@ -4718,9 +4718,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1983" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1986" index="61" uid="6a54821f-0e04-41a1-a997-00131aacefaf" >
+<SUBCOMPONENT type="630" id="1986" index="61" uid="4b7b74a4-ee12-4a8d-a4e2-0f8bd0f5cffa" >
<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" />
@@ -4728,9 +4728,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1985" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1988" index="62" uid="5237a5b4-e296-4286-9f29-575ac21191f8" >
+<SUBCOMPONENT type="630" id="1988" index="62" uid="6ea9a808-2511-407e-8512-c91674f34e5f" >
<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" />
@@ -4738,9 +4738,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1987" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1990" index="63" uid="6ea9a808-2511-407e-8512-c91674f34e5f" >
+<SUBCOMPONENT type="630" id="1990" index="63" uid="5237a5b4-e296-4286-9f29-575ac21191f8" >
<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" />
@@ -4748,9 +4748,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1989" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1992" index="64" uid="4b7b74a4-ee12-4a8d-a4e2-0f8bd0f5cffa" >
+<SUBCOMPONENT type="630" id="1992" index="64" uid="6a54821f-0e04-41a1-a997-00131aacefaf" >
<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" />
@@ -4758,9 +4758,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1991" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1994" index="65" uid="5085753e-b473-4033-8ec1-0e0fb18774d2" >
+<SUBCOMPONENT type="630" id="1994" index="65" uid="9ff5390c-9ca5-4fcc-a84e-5e56f8f02936" >
<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" />
@@ -4768,9 +4768,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1993" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1996" index="66" uid="517fcaa9-e667-4357-92a7-e5df9352551e" >
+<SUBCOMPONENT type="630" id="1996" index="66" uid="8ef66257-ed03-45d6-ab84-4b93517cbbb5" >
<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" />
@@ -4778,9 +4778,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1995" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1998" index="67" uid="b74f5829-a5a7-48a4-afd8-636c35fce436" >
+<SUBCOMPONENT type="630" id="1998" index="67" uid="fb19e2b3-1b1c-4b2f-95ae-4cdf902529c7" >
<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" />
@@ -4788,9 +4788,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1997" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2000" index="68" uid="9415ea82-3a93-43e9-bcc7-1abc5425e489" >
+<SUBCOMPONENT type="630" id="2000" index="68" uid="93589e37-83cc-4eec-95db-fe1dba6929e8" >
<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" />
@@ -4798,9 +4798,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="1999" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2002" index="69" uid="35e7d20b-7b08-4b0d-9be5-4224c9dcf3f7" >
+<SUBCOMPONENT type="630" id="2002" index="69" uid="880a52e8-9803-42e6-b887-567d721bd956" >
<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" />
@@ -4808,9 +4808,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2001" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2004" index="70" uid="4e832e20-62f0-4778-8c88-e8ef9967a6d2" >
+<SUBCOMPONENT type="630" id="2004" index="70" uid="4c426045-7f35-44d0-acdc-b010dc2aecea" >
<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" />
@@ -4818,9 +4818,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2003" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2006" index="71" uid="5b884835-e1ad-4564-b97c-340ed9207967" >
+<SUBCOMPONENT type="630" id="2006" index="71" uid="333116a7-fd4c-4e7f-828e-4ca66e62ed15" >
<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" />
@@ -4828,9 +4828,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2005" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2008" index="72" uid="89241893-984e-41c4-b3ac-85c664112f3b" >
+<SUBCOMPONENT type="630" id="2008" index="72" uid="e35927b7-3edf-4971-9eb1-d68fac373a52" >
<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" />
@@ -4838,9 +4838,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2007" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2010" index="73" uid="f4bc4122-1669-4225-a32a-a19d0f879b6e" >
+<SUBCOMPONENT type="630" id="2010" index="73" uid="ee53fa59-5bbf-49f9-b294-fe35f6523c0a" >
<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" />
@@ -4848,9 +4848,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2009" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2012" index="74" uid="3e2343e2-918a-4ca4-a81e-8a0db3b677a1" >
+<SUBCOMPONENT type="630" id="2012" index="74" uid="aaac4e7d-67ac-4e5a-8bca-9fbadac4e626" >
<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" />
@@ -4858,9 +4858,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2011" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2014" index="75" uid="96479917-a72a-4773-bb6e-73b6aa479d2d" >
+<SUBCOMPONENT type="630" id="2014" index="75" uid="f250be3e-de27-4eaf-ada3-97f8c7f210a8" >
<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" />
@@ -4868,9 +4868,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2013" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2016" index="76" uid="0a28b8e7-6508-41a4-ae67-70ecaf54110a" >
+<SUBCOMPONENT type="630" id="2016" index="76" uid="36274c81-2e64-4c46-8e21-26ee2823a8e7" >
<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" />
@@ -4878,9 +4878,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2015" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2018" index="77" uid="932875fe-72ab-46a3-b584-eafab2316ddc" >
+<SUBCOMPONENT type="630" id="2018" index="77" uid="4e136747-4ba2-46fd-95ea-776cbf0982bb" >
<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" />
@@ -4900,9 +4900,9 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="2021" index="78" uid="403e80ff-5cb6-4891-ac7d-184b5b77c8f9" >
+<SUBCOMPONENT type="630" id="2021" index="78" uid="e727e979-dc31-4c5d-9955-2b864ce5eda1" >
<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" />
@@ -4910,9 +4910,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2020" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2023" index="79" uid="09bad183-6b46-4d97-8202-487703efcbb7" >
+<SUBCOMPONENT type="630" id="2023" index="79" uid="e45d8911-b96e-49df-b074-2cbb649bb498" >
<father id="2080" num="1" />
-<cdparam x="309" y="434" />
+<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" />
@@ -4920,9 +4920,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2022" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2025" index="80" uid="6bde67bc-7eb3-4111-89c4-61fe4495df25" >
+<SUBCOMPONENT type="630" id="2025" index="80" uid="e67a7aac-0fcb-4eab-bf2d-eba7696f200f" >
<father id="2080" num="2" />
-<cdparam x="309" y="434" />
+<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" />
@@ -4930,9 +4930,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2024" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2027" index="81" uid="831f903b-9c33-4597-987c-9ff9325dfa82" >
+<SUBCOMPONENT type="630" id="2027" index="81" uid="b478d72d-a0db-4b22-a8ca-ad8c0d1a6332" >
<father id="2080" num="3" />
-<cdparam x="309" y="434" />
+<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" />
@@ -4940,9 +4940,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2026" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2029" index="82" uid="41a729e2-0c5a-44aa-a6ac-f3ce0e312e06" >
+<SUBCOMPONENT type="630" id="2029" index="82" uid="a6e95700-89fb-4895-8f08-a5e4ecc55446" >
<father id="2080" num="4" />
-<cdparam x="309" y="434" />
+<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" />
@@ -4950,9 +4950,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2028" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2031" index="83" uid="aa13d3b5-9fd4-4b05-9102-29f1973513d4" >
+<SUBCOMPONENT type="630" id="2031" index="83" uid="4dac1b6a-49d6-4d69-8752-9f0d54682bd5" >
<father id="2080" num="5" />
-<cdparam x="309" y="434" />
+<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" />
@@ -4960,9 +4960,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2030" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2033" index="84" uid="faf18044-53a5-483c-b004-f4b3a706784a" >
+<SUBCOMPONENT type="630" id="2033" index="84" uid="a9671779-c88e-463b-8f40-8e1dda747315" >
<father id="2080" num="6" />
-<cdparam x="309" y="434" />
+<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" />
@@ -4970,9 +4970,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2032" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2035" index="85" uid="af8dba66-5038-49ee-878c-620b03348667" >
+<SUBCOMPONENT type="630" id="2035" index="85" uid="e3810dd9-8691-4be2-b578-c9acc5e6a675" >
<father id="2080" num="7" />
-<cdparam x="309" y="434" />
+<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" />
@@ -4980,9 +4980,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2034" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2037" index="86" uid="f44c9c9d-d7eb-4abb-8254-17a824011876" >
+<SUBCOMPONENT type="630" id="2037" index="86" uid="66bf3497-a446-4bd0-90f0-b38c977592ab" >
<father id="2080" num="8" />
-<cdparam x="309" y="434" />
+<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" />
@@ -4990,9 +4990,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2036" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2039" index="87" uid="3180af9c-171b-4e79-8a02-95c13d22817f" >
+<SUBCOMPONENT type="630" id="2039" index="87" uid="fef5ff34-659d-47c3-9618-f44d308e79ca" >
<father id="2080" num="9" />
-<cdparam x="309" y="434" />
+<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" />
@@ -5000,9 +5000,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2038" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2041" index="88" uid="424d37c0-6b9c-4415-8ae1-2355d6a6ddb2" >
+<SUBCOMPONENT type="630" id="2041" index="88" uid="e5422afe-1c60-4e52-ae58-7274f0ff3e3d" >
<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" />
@@ -5010,9 +5010,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2040" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2043" index="89" uid="b0f662ae-df98-47fa-91a1-43f5e7c88feb" >
+<SUBCOMPONENT type="630" id="2043" index="89" uid="9eca1fe0-1954-4c77-a4ee-6263f561053f" >
<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" />
@@ -5020,9 +5020,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2042" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2045" index="90" uid="f14a02b3-dfc4-4fc8-ad85-4c095495815b" >
+<SUBCOMPONENT type="630" id="2045" index="90" uid="94bac879-7c0b-42ad-9e20-47fee70412fd" >
<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" />
@@ -5030,9 +5030,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2044" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2047" index="91" uid="86cd88ec-35c5-4027-a3cb-c0223bb2d74b" >
+<SUBCOMPONENT type="630" id="2047" index="91" uid="76f6e759-c1be-4f7b-b389-d2fdef24aca7" >
<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" />
@@ -5040,9 +5040,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2046" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2049" index="92" uid="8c7cb775-abf5-4cd6-8ab8-ce29d56a1d43" >
+<SUBCOMPONENT type="630" id="2049" index="92" uid="ec785943-e0d7-4c0c-84df-1aa9d7e7df73" >
<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" />
@@ -5050,9 +5050,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2048" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2051" index="93" uid="ec785943-e0d7-4c0c-84df-1aa9d7e7df73" >
+<SUBCOMPONENT type="630" id="2051" index="93" uid="8c7cb775-abf5-4cd6-8ab8-ce29d56a1d43" >
<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" />
@@ -5060,9 +5060,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2050" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2053" index="94" uid="76f6e759-c1be-4f7b-b389-d2fdef24aca7" >
+<SUBCOMPONENT type="630" id="2053" index="94" uid="86cd88ec-35c5-4027-a3cb-c0223bb2d74b" >
<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" />
@@ -5070,9 +5070,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2052" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2055" index="95" uid="94bac879-7c0b-42ad-9e20-47fee70412fd" >
+<SUBCOMPONENT type="630" id="2055" index="95" uid="f14a02b3-dfc4-4fc8-ad85-4c095495815b" >
<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" />
@@ -5080,9 +5080,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2054" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2057" index="96" uid="9eca1fe0-1954-4c77-a4ee-6263f561053f" >
+<SUBCOMPONENT type="630" id="2057" index="96" uid="b0f662ae-df98-47fa-91a1-43f5e7c88feb" >
<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" />
@@ -5090,9 +5090,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2056" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2059" index="97" uid="e5422afe-1c60-4e52-ae58-7274f0ff3e3d" >
+<SUBCOMPONENT type="630" id="2059" index="97" uid="424d37c0-6b9c-4415-8ae1-2355d6a6ddb2" >
<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" />
@@ -5100,9 +5100,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2058" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2061" index="98" uid="fef5ff34-659d-47c3-9618-f44d308e79ca" >
+<SUBCOMPONENT type="630" id="2061" index="98" uid="3180af9c-171b-4e79-8a02-95c13d22817f" >
<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" />
@@ -5110,9 +5110,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2060" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2063" index="99" uid="66bf3497-a446-4bd0-90f0-b38c977592ab" >
+<SUBCOMPONENT type="630" id="2063" index="99" uid="f44c9c9d-d7eb-4abb-8254-17a824011876" >
<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" />
@@ -5120,9 +5120,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2062" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2065" index="100" uid="e3810dd9-8691-4be2-b578-c9acc5e6a675" >
+<SUBCOMPONENT type="630" id="2065" index="100" uid="af8dba66-5038-49ee-878c-620b03348667" >
<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" />
@@ -5130,9 +5130,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2064" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2067" index="101" uid="a9671779-c88e-463b-8f40-8e1dda747315" >
+<SUBCOMPONENT type="630" id="2067" index="101" uid="faf18044-53a5-483c-b004-f4b3a706784a" >
<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" />
@@ -5140,9 +5140,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2066" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2069" index="102" uid="4dac1b6a-49d6-4d69-8752-9f0d54682bd5" >
+<SUBCOMPONENT type="630" id="2069" index="102" uid="aa13d3b5-9fd4-4b05-9102-29f1973513d4" >
<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" />
@@ -5150,9 +5150,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2068" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2071" index="103" uid="a6e95700-89fb-4895-8f08-a5e4ecc55446" >
+<SUBCOMPONENT type="630" id="2071" index="103" uid="41a729e2-0c5a-44aa-a6ac-f3ce0e312e06" >
<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" />
@@ -5160,9 +5160,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2070" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2073" index="104" uid="b478d72d-a0db-4b22-a8ca-ad8c0d1a6332" >
+<SUBCOMPONENT type="630" id="2073" index="104" uid="831f903b-9c33-4597-987c-9ff9325dfa82" >
<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" />
@@ -5170,9 +5170,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2072" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2075" index="105" uid="e67a7aac-0fcb-4eab-bf2d-eba7696f200f" >
+<SUBCOMPONENT type="630" id="2075" index="105" uid="6bde67bc-7eb3-4111-89c4-61fe4495df25" >
<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" />
@@ -5180,9 +5180,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2074" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2077" index="106" uid="e45d8911-b96e-49df-b074-2cbb649bb498" >
+<SUBCOMPONENT type="630" id="2077" index="106" uid="09bad183-6b46-4d97-8202-487703efcbb7" >
<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" />
@@ -5190,9 +5190,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2076" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2079" index="107" uid="e727e979-dc31-4c5d-9955-2b864ce5eda1" >
+<SUBCOMPONENT type="630" id="2079" index="107" uid="403e80ff-5cb6-4891-ac7d-184b5b77c8f9" >
<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" />
@@ -5212,9 +5212,9 @@
<Actor data="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="2082" index="108" uid="4b0d5c1a-d079-49cb-b248-eddaf97747d5" >
+<SUBCOMPONENT type="630" id="2082" index="108" uid="73026f97-10c2-4afd-a5d4-eb869fbc18ca" >
<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" />
@@ -5222,9 +5222,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2081" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2084" index="109" uid="90f4f1fb-a08c-4b79-af9f-b480d3c6829b" >
+<SUBCOMPONENT type="630" id="2084" index="109" uid="28d82c3d-b098-4923-a7eb-18874f5975f5" >
<father id="2141" num="1" />
-<cdparam x="131" y="434" />
+<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" />
@@ -5232,9 +5232,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2083" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2086" index="110" uid="4c4aec12-2644-4b87-bcb2-5628002ec194" >
+<SUBCOMPONENT type="630" id="2086" index="110" uid="f8fb3ef7-158d-4ad4-9655-f253372fddfe" >
<father id="2141" num="2" />
-<cdparam x="131" y="434" />
+<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" />
@@ -5242,9 +5242,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2085" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2088" index="111" uid="c1049cc8-cff4-42dd-854d-f5ff779167a5" >
+<SUBCOMPONENT type="630" id="2088" index="111" uid="354cf078-c0f4-42f1-ba04-daf417b11923" >
<father id="2141" num="3" />
-<cdparam x="131" y="434" />
+<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" />
@@ -5252,9 +5252,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2087" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2090" index="112" uid="a8074dbc-e9af-4700-bd3b-0dc1e8d653db" >
+<SUBCOMPONENT type="630" id="2090" index="112" uid="4d089b09-93c0-4d17-99ba-10a52ad599e6" >
<father id="2141" num="4" />
-<cdparam x="131" y="434" />
+<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" />
@@ -5262,9 +5262,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2089" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2092" index="113" uid="c3c45008-064b-4052-b1d8-268132e2a34c" >
+<SUBCOMPONENT type="630" id="2092" index="113" uid="f21ba852-b95d-4f33-99f2-35b8127b50f6" >
<father id="2141" num="5" />
-<cdparam x="131" y="434" />
+<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" />
@@ -5272,9 +5272,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2091" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2094" index="114" uid="b0c6bb8c-68b8-4ec4-9496-4ddc465d1a35" >
+<SUBCOMPONENT type="630" id="2094" index="114" uid="34681b0d-95f8-4ccb-b5cd-f2a594f39f51" >
<father id="2141" num="6" />
-<cdparam x="131" y="434" />
+<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" />
@@ -5282,9 +5282,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2093" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2096" index="115" uid="82161c9f-b79e-4f63-9bb9-990e6ec88b28" >
+<SUBCOMPONENT type="630" id="2096" index="115" uid="dd54ea5a-4b6b-4c7a-8aa9-8dd883254f37" >
<father id="2141" num="7" />
-<cdparam x="131" y="434" />
+<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" />
@@ -5292,9 +5292,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2095" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2098" index="116" uid="f5c9678a-6d29-4848-b62f-e138bee26b69" >
+<SUBCOMPONENT type="630" id="2098" index="116" uid="b3348f7f-88cc-4629-bb4d-73269a141a17" >
<father id="2141" num="8" />
-<cdparam x="131" y="434" />
+<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" />
@@ -5302,9 +5302,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2097" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2100" index="117" uid="828d1239-7f41-491a-9537-ead760098a2f" >
+<SUBCOMPONENT type="630" id="2100" index="117" uid="639ff600-bfdd-4dbd-b61b-75faa1d00c5f" >
<father id="2141" num="9" />
-<cdparam x="131" y="434" />
+<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" />
@@ -5312,9 +5312,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2099" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2102" index="118" uid="31ba9e56-95b2-462a-8ad2-2e802962b9dc" >
+<SUBCOMPONENT type="630" id="2102" index="118" uid="a40199d2-4062-421b-aada-a8dedea8dac4" >
<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" />
@@ -5322,9 +5322,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2101" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2104" index="119" uid="22ba5d8a-da23-4f64-870e-d0d1c2e95144" >
+<SUBCOMPONENT type="630" id="2104" index="119" uid="c5d9e8a0-85ba-4563-b19d-bb1a7449ab20" >
<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" />
@@ -5332,9 +5332,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2103" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2106" index="120" uid="6d8b2953-ba22-40ce-905b-e05e6afb18bf" >
+<SUBCOMPONENT type="630" id="2106" index="120" uid="e30537bc-35dd-4d84-b656-53bb4e75566d" >
<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" />
@@ -5342,9 +5342,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2105" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2108" index="121" uid="9a8a4717-d2e6-4e32-a1d4-13abdde4d2ef" >
+<SUBCOMPONENT type="630" id="2108" index="121" uid="94d2f935-e3c2-4141-8828-1f5420677d08" >
<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" />
@@ -5352,9 +5352,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2107" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2110" index="122" uid="4e250b3f-3467-409d-a38d-1b0bb3cb4f62" >
+<SUBCOMPONENT type="630" id="2110" index="122" uid="af05178e-dcc3-4954-96a4-db1dc7969171" >
<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" />
@@ -5362,9 +5362,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2109" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2112" index="123" uid="af05178e-dcc3-4954-96a4-db1dc7969171" >
+<SUBCOMPONENT type="630" id="2112" index="123" uid="4e250b3f-3467-409d-a38d-1b0bb3cb4f62" >
<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" />
@@ -5372,9 +5372,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2111" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2114" index="124" uid="94d2f935-e3c2-4141-8828-1f5420677d08" >
+<SUBCOMPONENT type="630" id="2114" index="124" uid="9a8a4717-d2e6-4e32-a1d4-13abdde4d2ef" >
<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" />
@@ -5382,9 +5382,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2113" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2116" index="125" uid="e30537bc-35dd-4d84-b656-53bb4e75566d" >
+<SUBCOMPONENT type="630" id="2116" index="125" uid="6d8b2953-ba22-40ce-905b-e05e6afb18bf" >
<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" />
@@ -5392,9 +5392,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2115" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2118" index="126" uid="c5d9e8a0-85ba-4563-b19d-bb1a7449ab20" >
+<SUBCOMPONENT type="630" id="2118" index="126" uid="22ba5d8a-da23-4f64-870e-d0d1c2e95144" >
<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" />
@@ -5402,9 +5402,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2117" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2120" index="127" uid="a40199d2-4062-421b-aada-a8dedea8dac4" >
+<SUBCOMPONENT type="630" id="2120" index="127" uid="31ba9e56-95b2-462a-8ad2-2e802962b9dc" >
<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" />
@@ -5412,9 +5412,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2119" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2122" index="128" uid="639ff600-bfdd-4dbd-b61b-75faa1d00c5f" >
+<SUBCOMPONENT type="630" id="2122" index="128" uid="828d1239-7f41-491a-9537-ead760098a2f" >
<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" />
@@ -5422,9 +5422,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2121" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2124" index="129" uid="b3348f7f-88cc-4629-bb4d-73269a141a17" >
+<SUBCOMPONENT type="630" id="2124" index="129" uid="f5c9678a-6d29-4848-b62f-e138bee26b69" >
<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" />
@@ -5432,9 +5432,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2123" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2126" index="130" uid="dd54ea5a-4b6b-4c7a-8aa9-8dd883254f37" >
+<SUBCOMPONENT type="630" id="2126" index="130" uid="82161c9f-b79e-4f63-9bb9-990e6ec88b28" >
<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" />
@@ -5442,9 +5442,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2125" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2128" index="131" uid="34681b0d-95f8-4ccb-b5cd-f2a594f39f51" >
+<SUBCOMPONENT type="630" id="2128" index="131" uid="b0c6bb8c-68b8-4ec4-9496-4ddc465d1a35" >
<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" />
@@ -5452,9 +5452,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2127" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2130" index="132" uid="f21ba852-b95d-4f33-99f2-35b8127b50f6" >
+<SUBCOMPONENT type="630" id="2130" index="132" uid="c3c45008-064b-4052-b1d8-268132e2a34c" >
<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" />
@@ -5462,9 +5462,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2129" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2132" index="133" uid="4d089b09-93c0-4d17-99ba-10a52ad599e6" >
+<SUBCOMPONENT type="630" id="2132" index="133" uid="a8074dbc-e9af-4700-bd3b-0dc1e8d653db" >
<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" />
@@ -5472,9 +5472,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2131" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2134" index="134" uid="354cf078-c0f4-42f1-ba04-daf417b11923" >
+<SUBCOMPONENT type="630" id="2134" index="134" uid="c1049cc8-cff4-42dd-854d-f5ff779167a5" >
<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" />
@@ -5482,9 +5482,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2133" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2136" index="135" uid="f8fb3ef7-158d-4ad4-9655-f253372fddfe" >
+<SUBCOMPONENT type="630" id="2136" index="135" uid="4c4aec12-2644-4b87-bcb2-5628002ec194" >
<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" />
@@ -5492,9 +5492,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2135" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2138" index="136" uid="28d82c3d-b098-4923-a7eb-18874f5975f5" >
+<SUBCOMPONENT type="630" id="2138" index="136" uid="90f4f1fb-a08c-4b79-af9f-b480d3c6829b" >
<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" />
@@ -5502,9 +5502,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2137" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2140" index="137" uid="73026f97-10c2-4afd-a5d4-eb869fbc18ca" >
+<SUBCOMPONENT type="630" id="2140" index="137" uid="4b0d5c1a-d079-49cb-b248-eddaf97747d5" >
<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" />
@@ -5517,8 +5517,8 @@
<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" />
+<P1 x="486" y="292" id="1870" />
+<P2 x="486" y="342" id="1860" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -5529,8 +5529,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -5538,8 +5538,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -5547,8 +5547,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -5556,8 +5556,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -5565,8 +5565,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -5574,8 +5574,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -5583,8 +5583,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -5592,8 +5592,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -7547,9 +7547,9 @@
<Actor data="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="2986" index="16" uid="301f121b-5494-4853-9e51-8f4b27ac8de3" >
+<SUBCOMPONENT type="630" id="2986" index="16" uid="b172c66c-da6f-4040-8c08-4917ce5182d6" >
<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" />
@@ -7557,9 +7557,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2985" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2988" index="17" uid="225460df-c364-4176-9533-3820484caf11" >
+<SUBCOMPONENT type="630" id="2988" index="17" uid="d116618d-363d-4d98-b03b-8b9d07e718af" >
<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" />
@@ -7567,9 +7567,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2987" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2990" index="18" uid="aec93da8-5a5d-413c-a0fe-6b36a1dcd117" >
+<SUBCOMPONENT type="630" id="2990" index="18" uid="7f2a9732-c9c6-4e73-b7e6-6de862b0906f" >
<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" />
@@ -7577,9 +7577,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2989" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2992" index="19" uid="69eda276-aaec-4ced-8d74-ba1d1855530e" >
+<SUBCOMPONENT type="630" id="2992" index="19" uid="37501b1d-64c1-45c6-8049-5319a4ef5a50" >
<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" />
@@ -7587,9 +7587,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2991" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2994" index="20" uid="4a6da1c7-6320-4f9d-b7fc-a95584fd61b0" >
+<SUBCOMPONENT type="630" id="2994" index="20" uid="2824872f-3378-4db1-9fe4-7ad9f8cb4e61" >
<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" />
@@ -7597,9 +7597,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2993" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2996" index="21" uid="c2c142ce-0cba-497b-9791-7bf1ab9d59fa" >
+<SUBCOMPONENT type="630" id="2996" index="21" uid="9650d754-66b3-4ec9-9134-74612551a129" >
<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" />
@@ -7607,9 +7607,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2995" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="2998" index="22" uid="687cb1ce-25a3-449c-a4e4-82921240db20" >
+<SUBCOMPONENT type="630" id="2998" index="22" uid="2c6d65f9-1057-4c34-a48a-634545d658e7" >
<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" />
@@ -7617,9 +7617,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2997" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3000" index="23" uid="f1dc0d3b-56e1-4c14-817b-5860a6f68394" >
+<SUBCOMPONENT type="630" id="3000" index="23" uid="1dce73f8-0c70-447b-86a4-33c0f899ad16" >
<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" />
@@ -7627,9 +7627,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="2999" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3002" index="24" uid="6c73b2c1-3f2d-4a4b-a108-e462916a94e1" >
+<SUBCOMPONENT type="630" id="3002" index="24" uid="5a70f48a-17a0-474b-8ffc-96951f90e3fb" >
<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" />
@@ -7637,9 +7637,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3001" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3004" index="25" uid="a16106c6-0106-4d5d-b974-a298da61d6f3" >
+<SUBCOMPONENT type="630" id="3004" index="25" uid="995fe8b2-d1f4-4ea9-b0ff-342863a185eb" >
<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" />
@@ -7647,9 +7647,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3003" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3006" index="26" uid="a3f43fd0-6d6c-4a57-a725-eaf8c179f0d3" >
+<SUBCOMPONENT type="630" id="3006" index="26" uid="0ee18349-a691-4080-9cb0-dd46611af41a" >
<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" />
@@ -7657,9 +7657,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3005" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3008" index="27" uid="53db143b-a1ac-4ba9-81d4-1974cc15dda5" >
+<SUBCOMPONENT type="630" id="3008" index="27" uid="4bdeb6ae-b38f-4bc3-b0c0-a0e0071cbcec" >
<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" />
@@ -7667,9 +7667,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3007" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3010" index="28" uid="c072dbfb-ca2e-4128-92b1-700e465e59a3" >
+<SUBCOMPONENT type="630" id="3010" index="28" uid="01bb7a5b-91e9-4165-83bf-1056d73f6cea" >
<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" />
@@ -7677,9 +7677,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3009" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3012" index="29" uid="fa5d4c88-04ec-4cbb-9bf8-7ff3a9ad45af" >
+<SUBCOMPONENT type="630" id="3012" index="29" uid="f6e1a283-76c0-49ba-b12c-2b77bdd5ca8e" >
<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" />
@@ -7687,9 +7687,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3011" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3014" index="30" uid="b58da967-4508-4269-8a98-a3ba4968d6b7" >
+<SUBCOMPONENT type="630" id="3014" index="30" uid="cdc8aa44-2b34-4e3a-b798-c606cd4b1d76" >
<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" />
@@ -7697,9 +7697,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3013" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3016" index="31" uid="cdc8aa44-2b34-4e3a-b798-c606cd4b1d76" >
+<SUBCOMPONENT type="630" id="3016" index="31" uid="b58da967-4508-4269-8a98-a3ba4968d6b7" >
<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" />
@@ -7707,9 +7707,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3015" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3018" index="32" uid="f6e1a283-76c0-49ba-b12c-2b77bdd5ca8e" >
+<SUBCOMPONENT type="630" id="3018" index="32" uid="fa5d4c88-04ec-4cbb-9bf8-7ff3a9ad45af" >
<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" />
@@ -7717,9 +7717,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3017" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3020" index="33" uid="01bb7a5b-91e9-4165-83bf-1056d73f6cea" >
+<SUBCOMPONENT type="630" id="3020" index="33" uid="c072dbfb-ca2e-4128-92b1-700e465e59a3" >
<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" />
@@ -7727,9 +7727,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3019" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3022" index="34" uid="4bdeb6ae-b38f-4bc3-b0c0-a0e0071cbcec" >
+<SUBCOMPONENT type="630" id="3022" index="34" uid="53db143b-a1ac-4ba9-81d4-1974cc15dda5" >
<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" />
@@ -7737,9 +7737,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3021" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3024" index="35" uid="0ee18349-a691-4080-9cb0-dd46611af41a" >
+<SUBCOMPONENT type="630" id="3024" index="35" uid="a3f43fd0-6d6c-4a57-a725-eaf8c179f0d3" >
<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" />
@@ -7747,9 +7747,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3023" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3026" index="36" uid="995fe8b2-d1f4-4ea9-b0ff-342863a185eb" >
+<SUBCOMPONENT type="630" id="3026" index="36" uid="a16106c6-0106-4d5d-b974-a298da61d6f3" >
<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" />
@@ -7757,9 +7757,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3025" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3028" index="37" uid="5a70f48a-17a0-474b-8ffc-96951f90e3fb" >
+<SUBCOMPONENT type="630" id="3028" index="37" uid="6c73b2c1-3f2d-4a4b-a108-e462916a94e1" >
<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" />
@@ -7767,9 +7767,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3027" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3030" index="38" uid="1dce73f8-0c70-447b-86a4-33c0f899ad16" >
+<SUBCOMPONENT type="630" id="3030" index="38" uid="f1dc0d3b-56e1-4c14-817b-5860a6f68394" >
<father id="3045" num="22" />
-<cdparam x="606" y="475" />
+<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" />
@@ -7777,9 +7777,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3029" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3032" index="39" uid="2c6d65f9-1057-4c34-a48a-634545d658e7" >
+<SUBCOMPONENT type="630" id="3032" index="39" uid="687cb1ce-25a3-449c-a4e4-82921240db20" >
<father id="3045" num="23" />
-<cdparam x="606" y="475" />
+<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" />
@@ -7787,9 +7787,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3031" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3034" index="40" uid="9650d754-66b3-4ec9-9134-74612551a129" >
+<SUBCOMPONENT type="630" id="3034" index="40" uid="c2c142ce-0cba-497b-9791-7bf1ab9d59fa" >
<father id="3045" num="24" />
-<cdparam x="606" y="475" />
+<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" />
@@ -7797,9 +7797,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3033" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3036" index="41" uid="2824872f-3378-4db1-9fe4-7ad9f8cb4e61" >
+<SUBCOMPONENT type="630" id="3036" index="41" uid="4a6da1c7-6320-4f9d-b7fc-a95584fd61b0" >
<father id="3045" num="25" />
-<cdparam x="606" y="475" />
+<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" />
@@ -7807,9 +7807,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3035" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3038" index="42" uid="37501b1d-64c1-45c6-8049-5319a4ef5a50" >
+<SUBCOMPONENT type="630" id="3038" index="42" uid="69eda276-aaec-4ced-8d74-ba1d1855530e" >
<father id="3045" num="26" />
-<cdparam x="606" y="475" />
+<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" />
@@ -7817,9 +7817,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3037" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3040" index="43" uid="7f2a9732-c9c6-4e73-b7e6-6de862b0906f" >
+<SUBCOMPONENT type="630" id="3040" index="43" uid="aec93da8-5a5d-413c-a0fe-6b36a1dcd117" >
<father id="3045" num="27" />
-<cdparam x="606" y="475" />
+<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" />
@@ -7827,9 +7827,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3039" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3042" index="44" uid="d116618d-363d-4d98-b03b-8b9d07e718af" >
+<SUBCOMPONENT type="630" id="3042" index="44" uid="225460df-c364-4176-9533-3820484caf11" >
<father id="3045" num="28" />
-<cdparam x="606" y="475" />
+<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" />
@@ -7837,9 +7837,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3041" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3044" index="45" uid="b172c66c-da6f-4040-8c08-4917ce5182d6" >
+<SUBCOMPONENT type="630" id="3044" index="45" uid="301f121b-5494-4853-9e51-8f4b27ac8de3" >
<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" />
@@ -7859,9 +7859,9 @@
<Actor data="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="3047" index="46" uid="0cc1c602-d57a-48eb-9826-f4ef023748a3" >
+<SUBCOMPONENT type="630" id="3047" index="46" uid="047d9385-c74a-4c32-bbd1-07857c1f5595" >
<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" />
@@ -7869,9 +7869,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3046" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3049" index="47" uid="edd461b9-e297-403a-9b8e-fa3a3fb34bb7" >
+<SUBCOMPONENT type="630" id="3049" index="47" uid="d272b8b1-b932-43e9-82ef-9e21be8df34e" >
<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" />
@@ -7879,9 +7879,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3048" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3051" index="48" uid="1e5ae3a6-0560-4543-8e1d-ec87e6b23a3e" >
+<SUBCOMPONENT type="630" id="3051" index="48" uid="e86aa296-6c69-4075-93db-f798566742f8" >
<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" />
@@ -7889,9 +7889,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3050" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3053" index="49" uid="0855b86a-d2d9-4f7f-9ca3-5d18d1b685f7" >
+<SUBCOMPONENT type="630" id="3053" index="49" uid="f311c4bd-75e2-472f-8974-71d6722172c7" >
<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" />
@@ -7899,9 +7899,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3052" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3055" index="50" uid="2b325f28-5f07-47b0-bb84-08e6562f5f5d" >
+<SUBCOMPONENT type="630" id="3055" index="50" uid="ba094340-b750-42f1-a205-1b22255702de" >
<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" />
@@ -7909,9 +7909,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3054" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3057" index="51" uid="24d072b0-68d5-4806-a3be-c0dcea7c2934" >
+<SUBCOMPONENT type="630" id="3057" index="51" uid="681ffe87-d52a-43d2-a64d-b8d9f394f8c2" >
<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" />
@@ -7919,9 +7919,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3056" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3059" index="52" uid="6e6a47c3-a7b0-4bc7-a736-567b9f2fec4b" >
+<SUBCOMPONENT type="630" id="3059" index="52" uid="6178fefd-2040-4839-b871-a8f17a70fc93" >
<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" />
@@ -7929,9 +7929,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3058" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3061" index="53" uid="bd92c09d-5bf5-4d42-b782-28d49f35af2c" >
+<SUBCOMPONENT type="630" id="3061" index="53" uid="35306336-e109-4ef1-8053-2c5619d19839" >
<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" />
@@ -7939,9 +7939,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3060" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3063" index="54" uid="c0113572-50f4-4b7d-943c-a3f1332b3b7d" >
+<SUBCOMPONENT type="630" id="3063" index="54" uid="287717eb-be3c-451f-8cfe-66bfd4e4115d" >
<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" />
@@ -7949,9 +7949,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3062" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3065" index="55" uid="941422dd-7865-4f70-a2c8-2b291bc56403" >
+<SUBCOMPONENT type="630" id="3065" index="55" uid="8dd69e33-f46f-401d-af77-0c0101e7a73e" >
<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" />
@@ -7959,9 +7959,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3064" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3067" index="56" uid="6857cb08-c3f7-49ae-8e7d-e18ba11f6b85" >
+<SUBCOMPONENT type="630" id="3067" index="56" uid="7b8e370e-503d-4f2a-9e44-8360adb85a33" >
<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" />
@@ -7969,9 +7969,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3066" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3069" index="57" uid="3bb87ed5-b752-4599-ad0e-ba766550d367" >
+<SUBCOMPONENT type="630" id="3069" index="57" uid="360c8ecf-28dd-49c9-a34a-bf22f57a5871" >
<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" />
@@ -7979,9 +7979,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3068" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3071" index="58" uid="5a67e28f-b017-4896-9c4e-5ea4f757756c" >
+<SUBCOMPONENT type="630" id="3071" index="58" uid="ff585a4a-82b4-4bfe-8535-6a8dbccd2155" >
<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" />
@@ -7989,9 +7989,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3070" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3073" index="59" uid="e2398ac1-14d9-4e1a-9654-c0ee5db8d566" >
+<SUBCOMPONENT type="630" id="3073" index="59" uid="fab14492-a371-41e9-ba62-b7b0376832ab" >
<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" />
@@ -7999,9 +7999,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3072" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3075" index="60" uid="1f20a51f-9508-4ba1-aa51-56fffbf03b3a" >
+<SUBCOMPONENT type="630" id="3075" index="60" uid="005d80d2-e709-4539-bd22-5615c4469f76" >
<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" />
@@ -8009,9 +8009,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3074" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3077" index="61" uid="005d80d2-e709-4539-bd22-5615c4469f76" >
+<SUBCOMPONENT type="630" id="3077" index="61" uid="1f20a51f-9508-4ba1-aa51-56fffbf03b3a" >
<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" />
@@ -8019,9 +8019,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3076" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3079" index="62" uid="fab14492-a371-41e9-ba62-b7b0376832ab" >
+<SUBCOMPONENT type="630" id="3079" index="62" uid="e2398ac1-14d9-4e1a-9654-c0ee5db8d566" >
<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" />
@@ -8029,9 +8029,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3078" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3081" index="63" uid="ff585a4a-82b4-4bfe-8535-6a8dbccd2155" >
+<SUBCOMPONENT type="630" id="3081" index="63" uid="5a67e28f-b017-4896-9c4e-5ea4f757756c" >
<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" />
@@ -8039,9 +8039,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3080" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3083" index="64" uid="360c8ecf-28dd-49c9-a34a-bf22f57a5871" >
+<SUBCOMPONENT type="630" id="3083" index="64" uid="3bb87ed5-b752-4599-ad0e-ba766550d367" >
<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" />
@@ -8049,9 +8049,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3082" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3085" index="65" uid="7b8e370e-503d-4f2a-9e44-8360adb85a33" >
+<SUBCOMPONENT type="630" id="3085" index="65" uid="6857cb08-c3f7-49ae-8e7d-e18ba11f6b85" >
<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" />
@@ -8059,9 +8059,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3084" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3087" index="66" uid="8dd69e33-f46f-401d-af77-0c0101e7a73e" >
+<SUBCOMPONENT type="630" id="3087" index="66" uid="941422dd-7865-4f70-a2c8-2b291bc56403" >
<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" />
@@ -8069,9 +8069,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3086" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3089" index="67" uid="287717eb-be3c-451f-8cfe-66bfd4e4115d" >
+<SUBCOMPONENT type="630" id="3089" index="67" uid="c0113572-50f4-4b7d-943c-a3f1332b3b7d" >
<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" />
@@ -8079,9 +8079,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3088" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3091" index="68" uid="35306336-e109-4ef1-8053-2c5619d19839" >
+<SUBCOMPONENT type="630" id="3091" index="68" uid="bd92c09d-5bf5-4d42-b782-28d49f35af2c" >
<father id="3106" num="22" />
-<cdparam x="456" y="475" />
+<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" />
@@ -8089,9 +8089,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3090" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3093" index="69" uid="6178fefd-2040-4839-b871-a8f17a70fc93" >
+<SUBCOMPONENT type="630" id="3093" index="69" uid="6e6a47c3-a7b0-4bc7-a736-567b9f2fec4b" >
<father id="3106" num="23" />
-<cdparam x="456" y="475" />
+<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" />
@@ -8099,9 +8099,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3092" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3095" index="70" uid="681ffe87-d52a-43d2-a64d-b8d9f394f8c2" >
+<SUBCOMPONENT type="630" id="3095" index="70" uid="24d072b0-68d5-4806-a3be-c0dcea7c2934" >
<father id="3106" num="24" />
-<cdparam x="456" y="475" />
+<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" />
@@ -8109,9 +8109,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3094" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3097" index="71" uid="ba094340-b750-42f1-a205-1b22255702de" >
+<SUBCOMPONENT type="630" id="3097" index="71" uid="2b325f28-5f07-47b0-bb84-08e6562f5f5d" >
<father id="3106" num="25" />
-<cdparam x="456" y="475" />
+<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" />
@@ -8119,9 +8119,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3096" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3099" index="72" uid="f311c4bd-75e2-472f-8974-71d6722172c7" >
+<SUBCOMPONENT type="630" id="3099" index="72" uid="0855b86a-d2d9-4f7f-9ca3-5d18d1b685f7" >
<father id="3106" num="26" />
-<cdparam x="456" y="475" />
+<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" />
@@ -8129,9 +8129,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3098" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3101" index="73" uid="e86aa296-6c69-4075-93db-f798566742f8" >
+<SUBCOMPONENT type="630" id="3101" index="73" uid="1e5ae3a6-0560-4543-8e1d-ec87e6b23a3e" >
<father id="3106" num="27" />
-<cdparam x="456" y="475" />
+<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" />
@@ -8139,9 +8139,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3100" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3103" index="74" uid="d272b8b1-b932-43e9-82ef-9e21be8df34e" >
+<SUBCOMPONENT type="630" id="3103" index="74" uid="edd461b9-e297-403a-9b8e-fa3a3fb34bb7" >
<father id="3106" num="28" />
-<cdparam x="456" y="475" />
+<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" />
@@ -8149,9 +8149,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3102" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3105" index="75" uid="047d9385-c74a-4c32-bbd1-07857c1f5595" >
+<SUBCOMPONENT type="630" id="3105" index="75" uid="0cc1c602-d57a-48eb-9826-f4ef023748a3" >
<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" />
@@ -8171,9 +8171,9 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="3108" index="76" uid="22ad102d-eea4-4814-8aec-0435cebe0f8c" >
+<SUBCOMPONENT type="630" id="3108" index="76" uid="e692d999-fee2-4e78-98b0-9da129d65c17" >
<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" />
@@ -8181,329 +8181,329 @@
<new d="false" />
<TGConnectingPoint num="0" id="3107" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3110" index="77" uid="8bb3cd03-739c-429c-8698-3e4161a9da4b" >
+<SUBCOMPONENT type="627" id="3117" index="77" uid="85969a4f-8027-400d-bb08-accd5c6f69dc" >
<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}" />
<new d="false" />
<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" index="78" uid="be582e01-2c6d-4700-aa09-d1c1237b225c" >
+<SUBCOMPONENT type="625" id="3126" index="78" uid="e7edc39e-d721-4d3f-be32-52b19e5e4e9b" >
<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" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="382" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
<new d="false" />
-<TGConnectingPoint num="0" id="3111" />
+<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" index="79" uid="dce379c7-a274-4419-bbf3-dc9dae0a3478" >
+<SUBCOMPONENT type="630" id="3128" index="79" uid="4de438b6-6a9f-42af-ba69-cb0210ab0962" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3113" />
+<TGConnectingPoint num="0" id="3127" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3116" index="80" uid="5972820d-113e-4e54-8dc9-ba0028e4b784" >
+<SUBCOMPONENT type="630" id="3130" index="80" uid="d68902c6-26e0-4be5-b17b-53121a5cc0ed" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3115" />
+<TGConnectingPoint num="0" id="3129" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3118" index="81" uid="9647b83c-9914-43cd-92fb-57fabdd431a7" >
+<SUBCOMPONENT type="630" id="3132" index="81" uid="6f2e5557-dbc9-45e2-8a10-570d02e272ba" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3117" />
+<TGConnectingPoint num="0" id="3131" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3120" index="82" uid="14ca6243-28d2-463c-9fd8-e1d5838f6c25" >
+<SUBCOMPONENT type="630" id="3134" index="82" uid="ffdd6b53-041c-46f6-ab69-eaa1d8d6393f" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3119" />
+<TGConnectingPoint num="0" id="3133" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3122" index="83" uid="5f67842c-0901-46a1-888d-d2c458c1201b" >
+<SUBCOMPONENT type="630" id="3136" index="83" uid="730991b2-c09b-4f8f-b11e-4db53cbcff53" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3121" />
+<TGConnectingPoint num="0" id="3135" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3124" index="84" uid="ac851e15-9571-41cf-b7e4-0d67b84f1f76" >
+<SUBCOMPONENT type="630" id="3138" index="84" uid="c04fc311-16d9-44db-9c84-35571cce4679" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3123" />
+<TGConnectingPoint num="0" id="3137" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3126" index="85" uid="922d013c-6aef-44ce-8e98-c1bf2fce8950" >
+<SUBCOMPONENT type="630" id="3140" index="85" uid="0510bfcb-a5bc-4b84-a402-6062f8d09c2a" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3125" />
+<TGConnectingPoint num="0" id="3139" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3128" index="86" uid="6025bb53-b1c1-42f4-855a-b9a5620e2a6f" >
+<SUBCOMPONENT type="630" id="3142" index="86" uid="874d50b0-3ca6-4859-afd1-33156e7fa3cb" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3127" />
+<TGConnectingPoint num="0" id="3141" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3130" index="87" uid="6bee498d-d9c4-484c-85a2-11f36fb38215" >
+<SUBCOMPONENT type="630" id="3144" index="87" uid="a5c79afb-c8c0-4654-a582-a1f983fbff93" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3129" />
+<TGConnectingPoint num="0" id="3143" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3132" index="88" uid="d9582368-28f6-4ef3-83fc-4f047027721d" >
+<SUBCOMPONENT type="630" id="3146" index="88" uid="c50a3f88-6b65-434e-8fe1-ee6f067ccf63" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3131" />
+<TGConnectingPoint num="0" id="3145" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3134" index="89" uid="d8e4a423-6a87-4838-a620-7f5ab4b315b1" >
+<SUBCOMPONENT type="630" id="3148" index="89" uid="32e6b954-af45-47b1-b23e-e0c62dc9e86b" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3133" />
+<TGConnectingPoint num="0" id="3147" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3136" index="90" uid="7e47d7d3-2e3c-4006-a746-4471b912fdf8" >
+<SUBCOMPONENT type="630" id="3150" index="90" uid="218d3847-882b-4da9-a5cd-6ff2351b9357" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3135" />
+<TGConnectingPoint num="0" id="3149" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3138" index="91" uid="446e154c-f2e6-488e-93b2-3f8335cb96d5" >
+<SUBCOMPONENT type="630" id="3152" index="91" uid="2d17e25b-12e9-45b6-b505-af359da672bc" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3137" />
+<TGConnectingPoint num="0" id="3151" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3140" index="92" uid="2d17e25b-12e9-45b6-b505-af359da672bc" >
+<SUBCOMPONENT type="630" id="3154" index="92" uid="446e154c-f2e6-488e-93b2-3f8335cb96d5" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3139" />
+<TGConnectingPoint num="0" id="3153" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3142" index="93" uid="218d3847-882b-4da9-a5cd-6ff2351b9357" >
+<SUBCOMPONENT type="630" id="3156" index="93" uid="7e47d7d3-2e3c-4006-a746-4471b912fdf8" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3141" />
+<TGConnectingPoint num="0" id="3155" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3144" index="94" uid="32e6b954-af45-47b1-b23e-e0c62dc9e86b" >
+<SUBCOMPONENT type="630" id="3158" index="94" uid="d8e4a423-6a87-4838-a620-7f5ab4b315b1" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3143" />
+<TGConnectingPoint num="0" id="3157" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3146" index="95" uid="c50a3f88-6b65-434e-8fe1-ee6f067ccf63" >
+<SUBCOMPONENT type="630" id="3160" index="95" uid="d9582368-28f6-4ef3-83fc-4f047027721d" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3145" />
+<TGConnectingPoint num="0" id="3159" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3148" index="96" uid="a5c79afb-c8c0-4654-a582-a1f983fbff93" >
+<SUBCOMPONENT type="630" id="3162" index="96" uid="6bee498d-d9c4-484c-85a2-11f36fb38215" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3147" />
+<TGConnectingPoint num="0" id="3161" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3150" index="97" uid="874d50b0-3ca6-4859-afd1-33156e7fa3cb" >
+<SUBCOMPONENT type="630" id="3164" index="97" uid="6025bb53-b1c1-42f4-855a-b9a5620e2a6f" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3149" />
+<TGConnectingPoint num="0" id="3163" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3152" index="98" uid="0510bfcb-a5bc-4b84-a402-6062f8d09c2a" >
+<SUBCOMPONENT type="630" id="3166" index="98" uid="922d013c-6aef-44ce-8e98-c1bf2fce8950" >
<father id="3185" num="22" />
-<cdparam x="306" y="475" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3151" />
+<TGConnectingPoint num="0" id="3165" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3154" index="99" uid="c04fc311-16d9-44db-9c84-35571cce4679" >
+<SUBCOMPONENT type="630" id="3168" index="99" uid="ac851e15-9571-41cf-b7e4-0d67b84f1f76" >
<father id="3185" num="23" />
-<cdparam x="306" y="475" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3153" />
+<TGConnectingPoint num="0" id="3167" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3156" index="100" uid="730991b2-c09b-4f8f-b11e-4db53cbcff53" >
+<SUBCOMPONENT type="630" id="3170" index="100" uid="5f67842c-0901-46a1-888d-d2c458c1201b" >
<father id="3185" num="24" />
-<cdparam x="306" y="475" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3155" />
+<TGConnectingPoint num="0" id="3169" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3158" index="101" uid="ffdd6b53-041c-46f6-ab69-eaa1d8d6393f" >
+<SUBCOMPONENT type="630" id="3172" index="101" uid="14ca6243-28d2-463c-9fd8-e1d5838f6c25" >
<father id="3185" num="25" />
-<cdparam x="306" y="475" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3157" />
+<TGConnectingPoint num="0" id="3171" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3160" index="102" uid="6f2e5557-dbc9-45e2-8a10-570d02e272ba" >
+<SUBCOMPONENT type="630" id="3174" index="102" uid="9647b83c-9914-43cd-92fb-57fabdd431a7" >
<father id="3185" num="26" />
-<cdparam x="306" y="475" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3159" />
+<TGConnectingPoint num="0" id="3173" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3162" index="103" uid="d68902c6-26e0-4be5-b17b-53121a5cc0ed" >
+<SUBCOMPONENT type="630" id="3176" index="103" uid="5972820d-113e-4e54-8dc9-ba0028e4b784" >
<father id="3185" num="27" />
-<cdparam x="306" y="475" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3161" />
+<TGConnectingPoint num="0" id="3175" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3164" index="104" uid="4de438b6-6a9f-42af-ba69-cb0210ab0962" >
+<SUBCOMPONENT type="630" id="3178" index="104" uid="dce379c7-a274-4419-bbf3-dc9dae0a3478" >
<father id="3185" num="28" />
-<cdparam x="306" y="475" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3163" />
+<TGConnectingPoint num="0" id="3177" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="625" id="3173" index="105" uid="e7edc39e-d721-4d3f-be32-52b19e5e4e9b" >
+<SUBCOMPONENT type="630" id="3180" index="105" uid="be582e01-2c6d-4700-aa09-d1c1237b225c" >
<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}" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
+<infoparam name="port" value="port" />
<new d="false" />
-<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>
+<TGConnectingPoint num="0" id="3179" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="3182" index="106" uid="85969a4f-8027-400d-bb08-accd5c6f69dc" >
+<SUBCOMPONENT type="630" id="3182" index="106" uid="8bb3cd03-739c-429c-8698-3e4161a9da4b" >
<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}" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
+<infoparam name="port" value="port" />
<new d="false" />
-<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>
+<TGConnectingPoint num="0" id="3181" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3184" index="107" uid="e692d999-fee2-4e78-98b0-9da129d65c17" >
+<SUBCOMPONENT type="630" id="3184" index="107" uid="22ad102d-eea4-4814-8aec-0435cebe0f8c" >
<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" />
@@ -8523,9 +8523,9 @@
<Actor data="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="3187" index="108" uid="e38be881-fdca-42bf-8f68-051f84a399ae" >
+<SUBCOMPONENT type="630" id="3187" index="108" uid="5572b45d-6701-4d9b-9449-5a3ea4ab4ebe" >
<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" />
@@ -8533,9 +8533,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3186" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3189" index="109" uid="137f96b8-7a9c-40f7-a735-982403b396ef" >
+<SUBCOMPONENT type="630" id="3189" index="109" uid="5089330f-4035-41a3-bfea-90d4d95c456f" >
<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" />
@@ -8543,9 +8543,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3188" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3191" index="110" uid="c1f2fb7c-2c10-4f40-b746-86401cc93c5d" >
+<SUBCOMPONENT type="630" id="3191" index="110" uid="9695ad67-d6dc-4655-ad5a-117890a27441" >
<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" />
@@ -8553,9 +8553,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3190" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3193" index="111" uid="e12ae104-c16a-4778-bd98-457e15f4bf06" >
+<SUBCOMPONENT type="630" id="3193" index="111" uid="be53e8ae-a530-464a-bb36-6dc9f3b21d45" >
<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" />
@@ -8563,9 +8563,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3192" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3195" index="112" uid="07dac1a0-58d6-4934-adbb-c49c851e538b" >
+<SUBCOMPONENT type="630" id="3195" index="112" uid="9f42c09b-ed0c-4103-8f6c-c06ada33e5f9" >
<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" />
@@ -8573,9 +8573,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3194" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3197" index="113" uid="561aa9dc-f0c6-4dbc-bb6c-b375d381b94a" >
+<SUBCOMPONENT type="630" id="3197" index="113" uid="662dced8-2dd2-4662-907d-c8d6c5da78da" >
<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" />
@@ -8583,9 +8583,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3196" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3199" index="114" uid="39eaba17-4d05-4340-b732-11884749545b" >
+<SUBCOMPONENT type="630" id="3199" index="114" uid="173e7276-9a00-42e0-bdc5-00b879f19730" >
<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" />
@@ -8593,9 +8593,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3198" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3201" index="115" uid="7fbf3de9-aef7-4239-ad1c-857dc8a8942d" >
+<SUBCOMPONENT type="630" id="3201" index="115" uid="f4eed198-c5b0-426d-8d83-6b7a9a934334" >
<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" />
@@ -8603,9 +8603,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3200" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3203" index="116" uid="92f3833f-6203-40d7-a4e0-b748488cb1d1" >
+<SUBCOMPONENT type="630" id="3203" index="116" uid="6eacacbc-96f3-4031-b81e-0b24e7410c01" >
<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" />
@@ -8613,9 +8613,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3202" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3205" index="117" uid="4fd46f1f-46a0-4dac-b039-a7ebdca0f246" >
+<SUBCOMPONENT type="630" id="3205" index="117" uid="42a5d213-d4f4-46cf-a5dd-4ef1ba9725ab" >
<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" />
@@ -8623,9 +8623,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3204" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3207" index="118" uid="1f7bd358-9938-4221-8148-85eed1a9fce8" >
+<SUBCOMPONENT type="630" id="3207" index="118" uid="a869c6ae-1f99-47de-a376-13ac20a788b9" >
<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" />
@@ -8633,9 +8633,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3206" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3209" index="119" uid="e01a8934-dee3-48e9-8dc4-84106dbc2ba9" >
+<SUBCOMPONENT type="630" id="3209" index="119" uid="0153bb54-db39-4327-aa8d-5e4b26101fdb" >
<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" />
@@ -8643,9 +8643,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3208" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3211" index="120" uid="992e763a-bca2-433b-a4dd-c8797ed81a1e" >
+<SUBCOMPONENT type="630" id="3211" index="120" uid="0d7fb2bb-69af-41d4-a0b9-e2b7a9485a52" >
<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" />
@@ -8653,9 +8653,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3210" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3213" index="121" uid="50fee8b2-28a4-464f-8640-a37a04c9283a" >
+<SUBCOMPONENT type="630" id="3213" index="121" uid="40c5cf36-8c47-4ff2-a904-836b92976375" >
<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" />
@@ -8663,9 +8663,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3212" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3215" index="122" uid="182dd0a3-30c9-4a7a-8572-551afb2fab91" >
+<SUBCOMPONENT type="630" id="3215" index="122" uid="6d7939b8-1085-4d41-98ef-084f78dbcc2c" >
<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" />
@@ -8673,9 +8673,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3214" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3217" index="123" uid="6d7939b8-1085-4d41-98ef-084f78dbcc2c" >
+<SUBCOMPONENT type="630" id="3217" index="123" uid="182dd0a3-30c9-4a7a-8572-551afb2fab91" >
<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" />
@@ -8683,9 +8683,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3216" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3219" index="124" uid="40c5cf36-8c47-4ff2-a904-836b92976375" >
+<SUBCOMPONENT type="630" id="3219" index="124" uid="50fee8b2-28a4-464f-8640-a37a04c9283a" >
<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" />
@@ -8693,9 +8693,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3218" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3221" index="125" uid="0d7fb2bb-69af-41d4-a0b9-e2b7a9485a52" >
+<SUBCOMPONENT type="630" id="3221" index="125" uid="992e763a-bca2-433b-a4dd-c8797ed81a1e" >
<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" />
@@ -8703,9 +8703,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3220" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3223" index="126" uid="0153bb54-db39-4327-aa8d-5e4b26101fdb" >
+<SUBCOMPONENT type="630" id="3223" index="126" uid="e01a8934-dee3-48e9-8dc4-84106dbc2ba9" >
<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" />
@@ -8713,9 +8713,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3222" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3225" index="127" uid="a869c6ae-1f99-47de-a376-13ac20a788b9" >
+<SUBCOMPONENT type="630" id="3225" index="127" uid="1f7bd358-9938-4221-8148-85eed1a9fce8" >
<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" />
@@ -8723,9 +8723,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3224" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3227" index="128" uid="42a5d213-d4f4-46cf-a5dd-4ef1ba9725ab" >
+<SUBCOMPONENT type="630" id="3227" index="128" uid="4fd46f1f-46a0-4dac-b039-a7ebdca0f246" >
<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" />
@@ -8733,9 +8733,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3226" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3229" index="129" uid="6eacacbc-96f3-4031-b81e-0b24e7410c01" >
+<SUBCOMPONENT type="630" id="3229" index="129" uid="92f3833f-6203-40d7-a4e0-b748488cb1d1" >
<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" />
@@ -8743,9 +8743,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3228" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3231" index="130" uid="f4eed198-c5b0-426d-8d83-6b7a9a934334" >
+<SUBCOMPONENT type="630" id="3231" index="130" uid="7fbf3de9-aef7-4239-ad1c-857dc8a8942d" >
<father id="3246" num="22" />
-<cdparam x="156" y="475" />
+<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" />
@@ -8753,9 +8753,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3230" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3233" index="131" uid="173e7276-9a00-42e0-bdc5-00b879f19730" >
+<SUBCOMPONENT type="630" id="3233" index="131" uid="39eaba17-4d05-4340-b732-11884749545b" >
<father id="3246" num="23" />
-<cdparam x="156" y="475" />
+<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" />
@@ -8763,9 +8763,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3232" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3235" index="132" uid="662dced8-2dd2-4662-907d-c8d6c5da78da" >
+<SUBCOMPONENT type="630" id="3235" index="132" uid="561aa9dc-f0c6-4dbc-bb6c-b375d381b94a" >
<father id="3246" num="24" />
-<cdparam x="156" y="475" />
+<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" />
@@ -8773,9 +8773,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3234" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3237" index="133" uid="9f42c09b-ed0c-4103-8f6c-c06ada33e5f9" >
+<SUBCOMPONENT type="630" id="3237" index="133" uid="07dac1a0-58d6-4934-adbb-c49c851e538b" >
<father id="3246" num="25" />
-<cdparam x="156" y="475" />
+<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" />
@@ -8783,9 +8783,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3236" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3239" index="134" uid="be53e8ae-a530-464a-bb36-6dc9f3b21d45" >
+<SUBCOMPONENT type="630" id="3239" index="134" uid="e12ae104-c16a-4778-bd98-457e15f4bf06" >
<father id="3246" num="26" />
-<cdparam x="156" y="475" />
+<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" />
@@ -8793,9 +8793,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3238" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3241" index="135" uid="9695ad67-d6dc-4655-ad5a-117890a27441" >
+<SUBCOMPONENT type="630" id="3241" index="135" uid="c1f2fb7c-2c10-4f40-b746-86401cc93c5d" >
<father id="3246" num="27" />
-<cdparam x="156" y="475" />
+<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" />
@@ -8803,9 +8803,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3240" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3243" index="136" uid="5089330f-4035-41a3-bfea-90d4d95c456f" >
+<SUBCOMPONENT type="630" id="3243" index="136" uid="137f96b8-7a9c-40f7-a735-982403b396ef" >
<father id="3246" num="28" />
-<cdparam x="156" y="475" />
+<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" />
@@ -8813,9 +8813,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3242" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3245" index="137" uid="5572b45d-6701-4d9b-9449-5a3ea4ab4ebe" >
+<SUBCOMPONENT type="630" id="3245" index="137" uid="e38be881-fdca-42bf-8f68-051f84a399ae" >
<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" />
@@ -8828,8 +8828,8 @@
<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="482" id="3151" />
-<P2 x="456" y="482" id="3090" />
+<P1 x="306" y="482" id="3139" />
+<P2 x="456" y="482" id="3060" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -8837,8 +8837,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8846,8 +8846,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8855,8 +8855,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8864,8 +8864,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8873,8 +8873,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8883,7 +8883,7 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8891,8 +8891,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8900,8 +8900,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8909,8 +8909,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8918,8 +8918,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8927,8 +8927,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -8947,9 +8947,9 @@
<Actor data="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="3260" index="16" uid="31e29017-c39e-40b4-962b-94c51e1ec7cd" >
+<SUBCOMPONENT type="630" id="3260" index="16" uid="a9b0be35-6648-462e-a37d-2430379b009c" >
<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" />
@@ -8957,9 +8957,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3259" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3262" index="17" uid="9b79640f-06b5-42d4-a802-cc1f24e2772c" >
+<SUBCOMPONENT type="630" id="3262" index="17" uid="2d880f87-7737-4d17-b91b-0241cfadcacb" >
<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" />
@@ -8967,9 +8967,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3261" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3264" index="18" uid="e580e34f-7e33-4b5e-8eb5-72086f14bb36" >
+<SUBCOMPONENT type="630" id="3264" index="18" uid="28cc664c-3fbf-494d-be62-6253d38ed9ee" >
<father id="3319" num="2" />
-<cdparam x="589" y="469" />
+<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" />
@@ -8977,9 +8977,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3263" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3266" index="19" uid="5ecf3ace-1b6c-45e3-97dc-f1363b8bc7df" >
+<SUBCOMPONENT type="630" id="3266" index="19" uid="554f64eb-a6ba-42be-97da-a4e1301f694f" >
<father id="3319" num="3" />
-<cdparam x="589" y="469" />
+<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" />
@@ -8987,9 +8987,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3265" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3268" index="20" uid="9d3e47ca-d87c-4dfc-aa4c-b87ac99dd78e" >
+<SUBCOMPONENT type="630" id="3268" index="20" uid="7ff1fa0f-c473-476e-b30f-4deef0d3c542" >
<father id="3319" num="4" />
-<cdparam x="589" y="469" />
+<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" />
@@ -8997,9 +8997,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3267" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3270" index="21" uid="217cdf16-b63b-420a-b673-199b3259bc16" >
+<SUBCOMPONENT type="630" id="3270" index="21" uid="aac36350-d89f-41fc-aa9a-98e879686e03" >
<father id="3319" num="5" />
-<cdparam x="589" y="469" />
+<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" />
@@ -9007,9 +9007,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3269" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3272" index="22" uid="23a1ac16-644a-4bab-ac9a-7b370aef3363" >
+<SUBCOMPONENT type="630" id="3272" index="22" uid="7ad1b371-e86e-4d8b-bea6-b5d4c1ab3a83" >
<father id="3319" num="6" />
-<cdparam x="589" y="469" />
+<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" />
@@ -9017,9 +9017,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3271" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3274" index="23" uid="969a41fe-3326-42c0-b0ce-fa76292386f9" >
+<SUBCOMPONENT type="630" id="3274" index="23" uid="0c3a27e9-3820-472f-abd6-1536f6fac16b" >
<father id="3319" num="7" />
-<cdparam x="589" y="469" />
+<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" />
@@ -9027,9 +9027,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3273" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3276" index="24" uid="c2852c85-bc31-432c-a140-06ffbfbea089" >
+<SUBCOMPONENT type="630" id="3276" index="24" uid="942ab9f4-cc8d-4d44-b880-e786c6cee0df" >
<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" />
@@ -9037,9 +9037,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3275" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3278" index="25" uid="b8316db2-79a4-41f8-815f-b76ca251c4b6" >
+<SUBCOMPONENT type="630" id="3278" index="25" uid="2c5b2c65-f710-4fef-9526-2f290b936d71" >
<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" />
@@ -9047,9 +9047,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3277" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3280" index="26" uid="2fe645e9-3789-4ef9-a0d3-5ea76efe494b" >
+<SUBCOMPONENT type="630" id="3280" index="26" uid="92234822-6d16-4e4f-90d5-c04c7e7aead3" >
<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" />
@@ -9057,9 +9057,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3279" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3282" index="27" uid="649ef49b-01b1-4413-89d8-a3c785339188" >
+<SUBCOMPONENT type="630" id="3282" index="27" uid="94d60d0f-d529-4e49-8997-36ee5ca144cc" >
<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" />
@@ -9067,9 +9067,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3281" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3284" index="28" uid="c339c9a9-f07f-4b37-984f-f5c7644f7f35" >
+<SUBCOMPONENT type="630" id="3284" index="28" uid="24c23b7c-abdf-4c22-9f4f-d039e4cf456c" >
<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" />
@@ -9077,9 +9077,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3283" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3286" index="29" uid="44b85c2d-c416-4ca1-b058-51ffe583a902" >
+<SUBCOMPONENT type="630" id="3286" index="29" uid="923eccb7-97ec-4fa4-b0f0-bbe936dbd08b" >
<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" />
@@ -9087,9 +9087,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3285" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3288" index="30" uid="296cb065-8004-453b-a960-d816953b7b7d" >
+<SUBCOMPONENT type="630" id="3288" index="30" uid="1846dc68-72af-46a9-9873-82d1ac1e90b8" >
<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" />
@@ -9097,9 +9097,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3287" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3290" index="31" uid="1846dc68-72af-46a9-9873-82d1ac1e90b8" >
+<SUBCOMPONENT type="630" id="3290" index="31" uid="296cb065-8004-453b-a960-d816953b7b7d" >
<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" />
@@ -9107,9 +9107,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3289" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3292" index="32" uid="923eccb7-97ec-4fa4-b0f0-bbe936dbd08b" >
+<SUBCOMPONENT type="630" id="3292" index="32" uid="44b85c2d-c416-4ca1-b058-51ffe583a902" >
<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" />
@@ -9117,9 +9117,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3291" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3294" index="33" uid="24c23b7c-abdf-4c22-9f4f-d039e4cf456c" >
+<SUBCOMPONENT type="630" id="3294" index="33" uid="c339c9a9-f07f-4b37-984f-f5c7644f7f35" >
<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" />
@@ -9127,9 +9127,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3293" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3296" index="34" uid="94d60d0f-d529-4e49-8997-36ee5ca144cc" >
+<SUBCOMPONENT type="630" id="3296" index="34" uid="649ef49b-01b1-4413-89d8-a3c785339188" >
<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" />
@@ -9137,9 +9137,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3295" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3298" index="35" uid="92234822-6d16-4e4f-90d5-c04c7e7aead3" >
+<SUBCOMPONENT type="630" id="3298" index="35" uid="2fe645e9-3789-4ef9-a0d3-5ea76efe494b" >
<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" />
@@ -9147,9 +9147,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3297" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3300" index="36" uid="2c5b2c65-f710-4fef-9526-2f290b936d71" >
+<SUBCOMPONENT type="630" id="3300" index="36" uid="b8316db2-79a4-41f8-815f-b76ca251c4b6" >
<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" />
@@ -9157,9 +9157,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3299" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3302" index="37" uid="942ab9f4-cc8d-4d44-b880-e786c6cee0df" >
+<SUBCOMPONENT type="630" id="3302" index="37" uid="c2852c85-bc31-432c-a140-06ffbfbea089" >
<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" />
@@ -9167,9 +9167,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3301" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3304" index="38" uid="0c3a27e9-3820-472f-abd6-1536f6fac16b" >
+<SUBCOMPONENT type="630" id="3304" index="38" uid="969a41fe-3326-42c0-b0ce-fa76292386f9" >
<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" />
@@ -9177,9 +9177,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3303" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3306" index="39" uid="7ad1b371-e86e-4d8b-bea6-b5d4c1ab3a83" >
+<SUBCOMPONENT type="630" id="3306" index="39" uid="23a1ac16-644a-4bab-ac9a-7b370aef3363" >
<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" />
@@ -9187,9 +9187,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3305" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3308" index="40" uid="aac36350-d89f-41fc-aa9a-98e879686e03" >
+<SUBCOMPONENT type="630" id="3308" index="40" uid="217cdf16-b63b-420a-b673-199b3259bc16" >
<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" />
@@ -9197,9 +9197,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3307" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3310" index="41" uid="7ff1fa0f-c473-476e-b30f-4deef0d3c542" >
+<SUBCOMPONENT type="630" id="3310" index="41" uid="9d3e47ca-d87c-4dfc-aa4c-b87ac99dd78e" >
<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" />
@@ -9207,9 +9207,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3309" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3312" index="42" uid="554f64eb-a6ba-42be-97da-a4e1301f694f" >
+<SUBCOMPONENT type="630" id="3312" index="42" uid="5ecf3ace-1b6c-45e3-97dc-f1363b8bc7df" >
<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" />
@@ -9217,9 +9217,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3311" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3314" index="43" uid="28cc664c-3fbf-494d-be62-6253d38ed9ee" >
+<SUBCOMPONENT type="630" id="3314" index="43" uid="e580e34f-7e33-4b5e-8eb5-72086f14bb36" >
<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" />
@@ -9227,9 +9227,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3313" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3316" index="44" uid="2d880f87-7737-4d17-b91b-0241cfadcacb" >
+<SUBCOMPONENT type="630" id="3316" index="44" uid="9b79640f-06b5-42d4-a802-cc1f24e2772c" >
<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" />
@@ -9237,9 +9237,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3315" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3318" index="45" uid="a9b0be35-6648-462e-a37d-2430379b009c" >
+<SUBCOMPONENT type="630" id="3318" index="45" uid="31e29017-c39e-40b4-962b-94c51e1ec7cd" >
<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" />
@@ -9259,9 +9259,9 @@
<Actor data="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="3321" index="46" uid="5317138a-8be0-4a37-b28b-f085af9a3fcd" >
+<SUBCOMPONENT type="630" id="3321" index="46" uid="ddbb1bc4-1442-46ce-bd30-1857e60831de" >
<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" />
@@ -9269,9 +9269,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3320" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3323" index="47" uid="41304217-f4a5-47ae-a756-90f7ab02c01f" >
+<SUBCOMPONENT type="630" id="3323" index="47" uid="ace21520-ad40-496e-aa27-31a79e757320" >
<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" />
@@ -9279,9 +9279,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3322" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3325" index="48" uid="4482b1df-12ba-403b-97a3-82dfd074d16b" >
+<SUBCOMPONENT type="630" id="3325" index="48" uid="658f308f-0c2e-4221-a75b-07a8086408ff" >
<father id="3380" num="2" />
-<cdparam x="439" y="469" />
+<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" />
@@ -9289,9 +9289,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3324" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3327" index="49" uid="fd2f36ce-b48c-41cb-a364-6537e1454786" >
+<SUBCOMPONENT type="630" id="3327" index="49" uid="a2c65eb4-1f87-45ac-aad7-981a7cfe79d5" >
<father id="3380" num="3" />
-<cdparam x="439" y="469" />
+<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" />
@@ -9299,9 +9299,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3326" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3329" index="50" uid="5d33a54c-23da-4477-be1c-20cdc37e8a9e" >
+<SUBCOMPONENT type="630" id="3329" index="50" uid="bdacdc9a-f08c-42ec-8a96-afcf69c189ec" >
<father id="3380" num="4" />
-<cdparam x="439" y="469" />
+<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" />
@@ -9309,9 +9309,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3328" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3331" index="51" uid="1b070f40-a626-4dea-9709-1dd56d8738fa" >
+<SUBCOMPONENT type="630" id="3331" index="51" uid="21d773f5-9651-4810-9d65-5ea7d276151e" >
<father id="3380" num="5" />
-<cdparam x="439" y="469" />
+<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" />
@@ -9319,9 +9319,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3330" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3333" index="52" uid="7530d48c-0b40-4620-b7e8-85792001f531" >
+<SUBCOMPONENT type="630" id="3333" index="52" uid="96cbfaf1-26f2-4956-a3fb-14ca027bd7a4" >
<father id="3380" num="6" />
-<cdparam x="439" y="469" />
+<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" />
@@ -9329,9 +9329,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3332" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3335" index="53" uid="38f6af33-7511-44e5-a0b7-cf5a450f2760" >
+<SUBCOMPONENT type="630" id="3335" index="53" uid="35872acf-6493-43d6-9b4e-f01216338d82" >
<father id="3380" num="7" />
-<cdparam x="439" y="469" />
+<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" />
@@ -9339,9 +9339,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3334" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3337" index="54" uid="2c1039c0-f441-46fe-983e-8d30d44d32ef" >
+<SUBCOMPONENT type="630" id="3337" index="54" uid="4fc655e3-2d6e-4436-ade8-7064f3680546" >
<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" />
@@ -9349,9 +9349,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3336" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3339" index="55" uid="278d8b81-167f-4a08-b4ee-fd9287036d4e" >
+<SUBCOMPONENT type="630" id="3339" index="55" uid="40d38d16-2b72-4b84-9aeb-5f517ee1f3cb" >
<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" />
@@ -9359,9 +9359,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3338" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3341" index="56" uid="9cc5a7ff-9748-47f2-b66c-25c1746a5750" >
+<SUBCOMPONENT type="630" id="3341" index="56" uid="394c4bc2-5127-4cac-8c4b-d72be0cfd40e" >
<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" />
@@ -9369,9 +9369,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3340" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3343" index="57" uid="7f487b59-8830-4cba-8e4b-52e9164c4f56" >
+<SUBCOMPONENT type="630" id="3343" index="57" uid="4b23a8b9-a491-4da8-967e-bbe7220f53fd" >
<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" />
@@ -9379,9 +9379,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3342" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3345" index="58" uid="5d767af7-ba82-4bdb-a9d9-ec710614262f" >
+<SUBCOMPONENT type="630" id="3345" index="58" uid="8b712e03-ee8e-4d50-a023-9b64e0a8df3f" >
<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" />
@@ -9389,9 +9389,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3344" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3347" index="59" uid="c5337686-1c20-4520-a0bd-974833fe2012" >
+<SUBCOMPONENT type="630" id="3347" index="59" uid="597fa900-4d70-45c4-acaf-c36918a9ebcf" >
<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" />
@@ -9399,9 +9399,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3346" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3349" index="60" uid="955afa79-49fd-4c75-8efe-a5b68181e327" >
+<SUBCOMPONENT type="630" id="3349" index="60" uid="99744135-6e8d-4744-af09-151cd5cf429f" >
<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" />
@@ -9409,9 +9409,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3348" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3351" index="61" uid="99744135-6e8d-4744-af09-151cd5cf429f" >
+<SUBCOMPONENT type="630" id="3351" index="61" uid="955afa79-49fd-4c75-8efe-a5b68181e327" >
<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" />
@@ -9419,9 +9419,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3350" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3353" index="62" uid="597fa900-4d70-45c4-acaf-c36918a9ebcf" >
+<SUBCOMPONENT type="630" id="3353" index="62" uid="c5337686-1c20-4520-a0bd-974833fe2012" >
<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" />
@@ -9429,9 +9429,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3352" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3355" index="63" uid="8b712e03-ee8e-4d50-a023-9b64e0a8df3f" >
+<SUBCOMPONENT type="630" id="3355" index="63" uid="5d767af7-ba82-4bdb-a9d9-ec710614262f" >
<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" />
@@ -9439,9 +9439,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3354" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3357" index="64" uid="4b23a8b9-a491-4da8-967e-bbe7220f53fd" >
+<SUBCOMPONENT type="630" id="3357" index="64" uid="7f487b59-8830-4cba-8e4b-52e9164c4f56" >
<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" />
@@ -9449,9 +9449,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3356" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3359" index="65" uid="394c4bc2-5127-4cac-8c4b-d72be0cfd40e" >
+<SUBCOMPONENT type="630" id="3359" index="65" uid="9cc5a7ff-9748-47f2-b66c-25c1746a5750" >
<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" />
@@ -9459,9 +9459,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3358" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3361" index="66" uid="40d38d16-2b72-4b84-9aeb-5f517ee1f3cb" >
+<SUBCOMPONENT type="630" id="3361" index="66" uid="278d8b81-167f-4a08-b4ee-fd9287036d4e" >
<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" />
@@ -9469,9 +9469,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3360" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3363" index="67" uid="4fc655e3-2d6e-4436-ade8-7064f3680546" >
+<SUBCOMPONENT type="630" id="3363" index="67" uid="2c1039c0-f441-46fe-983e-8d30d44d32ef" >
<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" />
@@ -9479,9 +9479,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3362" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3365" index="68" uid="35872acf-6493-43d6-9b4e-f01216338d82" >
+<SUBCOMPONENT type="630" id="3365" index="68" uid="38f6af33-7511-44e5-a0b7-cf5a450f2760" >
<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" />
@@ -9489,9 +9489,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3364" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3367" index="69" uid="96cbfaf1-26f2-4956-a3fb-14ca027bd7a4" >
+<SUBCOMPONENT type="630" id="3367" index="69" uid="7530d48c-0b40-4620-b7e8-85792001f531" >
<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" />
@@ -9499,9 +9499,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3366" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3369" index="70" uid="21d773f5-9651-4810-9d65-5ea7d276151e" >
+<SUBCOMPONENT type="630" id="3369" index="70" uid="1b070f40-a626-4dea-9709-1dd56d8738fa" >
<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" />
@@ -9509,9 +9509,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3368" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3371" index="71" uid="bdacdc9a-f08c-42ec-8a96-afcf69c189ec" >
+<SUBCOMPONENT type="630" id="3371" index="71" uid="5d33a54c-23da-4477-be1c-20cdc37e8a9e" >
<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" />
@@ -9519,9 +9519,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3370" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3373" index="72" uid="a2c65eb4-1f87-45ac-aad7-981a7cfe79d5" >
+<SUBCOMPONENT type="630" id="3373" index="72" uid="fd2f36ce-b48c-41cb-a364-6537e1454786" >
<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" />
@@ -9529,9 +9529,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3372" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3375" index="73" uid="658f308f-0c2e-4221-a75b-07a8086408ff" >
+<SUBCOMPONENT type="630" id="3375" index="73" uid="4482b1df-12ba-403b-97a3-82dfd074d16b" >
<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" />
@@ -9539,9 +9539,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3374" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3377" index="74" uid="ace21520-ad40-496e-aa27-31a79e757320" >
+<SUBCOMPONENT type="630" id="3377" index="74" uid="41304217-f4a5-47ae-a756-90f7ab02c01f" >
<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" />
@@ -9549,9 +9549,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3376" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3379" index="75" uid="ddbb1bc4-1442-46ce-bd30-1857e60831de" >
+<SUBCOMPONENT type="630" id="3379" index="75" uid="5317138a-8be0-4a37-b28b-f085af9a3fcd" >
<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" />
@@ -9571,9 +9571,9 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="3382" index="76" uid="5d454c75-35ce-4149-8a8e-84996c0c87cc" >
+<SUBCOMPONENT type="630" id="3382" index="76" uid="72cfdf1e-47e3-4ced-82de-c1b8f4fe4833" >
<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" />
@@ -9581,9 +9581,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3381" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3384" index="77" uid="b8d370bc-4e44-4b69-a01c-bfeebe77db0f" >
+<SUBCOMPONENT type="630" id="3384" index="77" uid="5ba60fb1-a20a-474d-915b-a948073cb1e4" >
<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" />
@@ -9591,309 +9591,309 @@
<new d="false" />
<TGConnectingPoint num="0" id="3383" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="3393" index="78" uid="abd7d9aa-240f-49dd-a02b-a8de13eb9b86" >
+<SUBCOMPONENT type="630" id="3386" index="78" uid="b5118827-c1f4-414a-9df9-b17d56367f1b" >
<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" />
<new d="false" />
<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" index="79" uid="68deb6f1-c563-4fa0-8e84-49faf26e643e" >
+<SUBCOMPONENT type="630" id="3388" index="79" uid="d352dfe1-5144-4ab2-99c8-d64213419850" >
<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}" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
+<infoparam name="port" value="port" />
<new d="false" />
-<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>
+<TGConnectingPoint num="0" id="3387" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3404" index="80" uid="0fe2ab0a-6dd1-4a35-a3b0-d0a17806040a" >
+<SUBCOMPONENT type="630" id="3390" index="80" uid="d81f48bf-d022-48cc-82bb-7606affe325c" >
<father id="3459" num="4" />
-<cdparam x="289" y="469" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3403" />
+<TGConnectingPoint num="0" id="3389" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3406" index="81" uid="10a6cd8f-abf0-4076-a727-e3eeb98e12f1" >
+<SUBCOMPONENT type="630" id="3392" index="81" uid="7e79fa2c-8e21-4c01-a04d-5284d6874bc8" >
<father id="3459" num="5" />
-<cdparam x="289" y="469" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3405" />
+<TGConnectingPoint num="0" id="3391" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3408" index="82" uid="3c576b4e-801a-45ca-ac93-2bd2a7b3dfe7" >
+<SUBCOMPONENT type="630" id="3394" index="82" uid="01559831-5918-45f7-b125-972ce877c46d" >
<father id="3459" num="6" />
-<cdparam x="289" y="469" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3407" />
+<TGConnectingPoint num="0" id="3393" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3410" index="83" uid="9d0b3071-caf4-4289-9bfc-9816ee6fc8d2" >
+<SUBCOMPONENT type="630" id="3396" index="83" uid="42cc57d8-b11c-43e0-9ede-505df43958a3" >
<father id="3459" num="7" />
-<cdparam x="289" y="469" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3409" />
+<TGConnectingPoint num="0" id="3395" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3412" index="84" uid="57fca7bc-d096-477b-846e-8b7823040db0" >
+<SUBCOMPONENT type="630" id="3398" index="84" uid="c1c9665b-3c9c-46d9-8360-a2636e9fe0e1" >
<father id="3459" num="8" />
-<cdparam x="289" y="469" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3411" />
+<TGConnectingPoint num="0" id="3397" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3414" index="85" uid="7e119068-cde1-42ed-ab4e-ee6cfb79ddc6" >
+<SUBCOMPONENT type="630" id="3400" index="85" uid="ba085b14-0558-4568-a530-6ee01c82b3d3" >
<father id="3459" num="9" />
-<cdparam x="289" y="469" />
+<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3413" />
+<TGConnectingPoint num="0" id="3399" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3416" index="86" uid="3569b2b6-b97c-4ca1-a39f-77972c646428" >
+<SUBCOMPONENT type="630" id="3402" index="86" uid="51f29894-1838-4ee8-9d4f-6cf9f8dd3829" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3415" />
+<TGConnectingPoint num="0" id="3401" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3418" index="87" uid="0f01c5fd-8ef1-455c-87a6-adbaac320377" >
+<SUBCOMPONENT type="630" id="3404" index="87" uid="ca4ad771-1190-4218-8273-c6510de6cfb6" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3417" />
+<TGConnectingPoint num="0" id="3403" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3420" index="88" uid="fbf4fb93-ffcd-433b-a03c-668936df9abf" >
+<SUBCOMPONENT type="630" id="3406" index="88" uid="8cb08a5b-9ca3-4003-9a2c-5d6f12496ea0" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3419" />
+<TGConnectingPoint num="0" id="3405" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3422" index="89" uid="2e0f2fef-e3ab-4f72-b654-b3d41850ec0e" >
+<SUBCOMPONENT type="630" id="3408" index="89" uid="f0ad7e50-0cbb-4efb-99aa-e8e1ab9224c6" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3421" />
+<TGConnectingPoint num="0" id="3407" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3424" index="90" uid="5b348b67-e3e8-4543-a6e6-9763c4e579fb" >
+<SUBCOMPONENT type="630" id="3410" index="90" uid="ef03b069-30da-4471-8295-3cda3ae095c1" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3423" />
+<TGConnectingPoint num="0" id="3409" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3426" index="91" uid="b866822e-ea1b-4015-add1-daf62f511861" >
+<SUBCOMPONENT type="630" id="3412" index="91" uid="41397662-3a28-43d5-a05b-1a72452aafe9" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3425" />
+<TGConnectingPoint num="0" id="3411" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3428" index="92" uid="41397662-3a28-43d5-a05b-1a72452aafe9" >
+<SUBCOMPONENT type="630" id="3414" index="92" uid="b866822e-ea1b-4015-add1-daf62f511861" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3427" />
+<TGConnectingPoint num="0" id="3413" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3430" index="93" uid="ef03b069-30da-4471-8295-3cda3ae095c1" >
+<SUBCOMPONENT type="630" id="3416" index="93" uid="5b348b67-e3e8-4543-a6e6-9763c4e579fb" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3429" />
+<TGConnectingPoint num="0" id="3415" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3432" index="94" uid="f0ad7e50-0cbb-4efb-99aa-e8e1ab9224c6" >
+<SUBCOMPONENT type="630" id="3418" index="94" uid="2e0f2fef-e3ab-4f72-b654-b3d41850ec0e" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3431" />
+<TGConnectingPoint num="0" id="3417" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3434" index="95" uid="8cb08a5b-9ca3-4003-9a2c-5d6f12496ea0" >
+<SUBCOMPONENT type="630" id="3420" index="95" uid="fbf4fb93-ffcd-433b-a03c-668936df9abf" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3433" />
+<TGConnectingPoint num="0" id="3419" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3436" index="96" uid="ca4ad771-1190-4218-8273-c6510de6cfb6" >
+<SUBCOMPONENT type="630" id="3422" index="96" uid="0f01c5fd-8ef1-455c-87a6-adbaac320377" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3435" />
+<TGConnectingPoint num="0" id="3421" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3438" index="97" uid="51f29894-1838-4ee8-9d4f-6cf9f8dd3829" >
+<SUBCOMPONENT type="630" id="3424" index="97" uid="3569b2b6-b97c-4ca1-a39f-77972c646428" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3437" />
+<TGConnectingPoint num="0" id="3423" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3440" index="98" uid="ba085b14-0558-4568-a530-6ee01c82b3d3" >
+<SUBCOMPONENT type="630" id="3426" index="98" uid="7e119068-cde1-42ed-ab4e-ee6cfb79ddc6" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3439" />
+<TGConnectingPoint num="0" id="3425" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3442" index="99" uid="c1c9665b-3c9c-46d9-8360-a2636e9fe0e1" >
+<SUBCOMPONENT type="630" id="3428" index="99" uid="57fca7bc-d096-477b-846e-8b7823040db0" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3441" />
+<TGConnectingPoint num="0" id="3427" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3444" index="100" uid="42cc57d8-b11c-43e0-9ede-505df43958a3" >
+<SUBCOMPONENT type="630" id="3430" index="100" uid="9d0b3071-caf4-4289-9bfc-9816ee6fc8d2" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3443" />
+<TGConnectingPoint num="0" id="3429" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3446" index="101" uid="01559831-5918-45f7-b125-972ce877c46d" >
+<SUBCOMPONENT type="630" id="3432" index="101" uid="3c576b4e-801a-45ca-ac93-2bd2a7b3dfe7" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3445" />
+<TGConnectingPoint num="0" id="3431" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3448" index="102" uid="7e79fa2c-8e21-4c01-a04d-5284d6874bc8" >
+<SUBCOMPONENT type="630" id="3434" index="102" uid="10a6cd8f-abf0-4076-a727-e3eeb98e12f1" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3447" />
+<TGConnectingPoint num="0" id="3433" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3450" index="103" uid="d81f48bf-d022-48cc-82bb-7606affe325c" >
+<SUBCOMPONENT type="630" id="3436" index="103" uid="0fe2ab0a-6dd1-4a35-a3b0-d0a17806040a" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3449" />
+<TGConnectingPoint num="0" id="3435" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3452" index="104" uid="d352dfe1-5144-4ab2-99c8-d64213419850" >
+<SUBCOMPONENT type="625" id="3445" index="104" uid="68deb6f1-c563-4fa0-8e84-49faf26e643e" >
<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" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="391" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
<new d="false" />
-<TGConnectingPoint num="0" id="3451" />
+<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" index="105" uid="b5118827-c1f4-414a-9df9-b17d56367f1b" >
+<SUBCOMPONENT type="627" id="3454" index="105" uid="abd7d9aa-240f-49dd-a02b-a8de13eb9b86" >
<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" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="391" />
+<infoparam name="timer expiration" value="{timer=timerAlarm}" />
<new d="false" />
-<TGConnectingPoint num="0" id="3453" />
+<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" index="106" uid="5ba60fb1-a20a-474d-915b-a948073cb1e4" >
+<SUBCOMPONENT type="630" id="3456" index="106" uid="b8d370bc-4e44-4b69-a01c-bfeebe77db0f" >
<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" />
@@ -9901,9 +9901,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3455" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3458" index="107" uid="72cfdf1e-47e3-4ced-82de-c1b8f4fe4833" >
+<SUBCOMPONENT type="630" id="3458" index="107" uid="5d454c75-35ce-4149-8a8e-84996c0c87cc" >
<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" />
@@ -9923,9 +9923,9 @@
<Actor data="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="3461" index="108" uid="2e3e6fae-37be-4ccd-87bd-4dda35d0035f" >
+<SUBCOMPONENT type="630" id="3461" index="108" uid="345646ae-90e7-4ecf-b182-ed983b066afc" >
<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" />
@@ -9933,9 +9933,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3460" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3463" index="109" uid="8022ba15-df82-467c-a04b-ef150ca63442" >
+<SUBCOMPONENT type="630" id="3463" index="109" uid="c66bc78c-23e9-4de4-8ec6-2f20884111df" >
<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" />
@@ -9943,9 +9943,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3462" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3465" index="110" uid="8bf7a253-ce7f-4f18-b301-aefbfb439ddc" >
+<SUBCOMPONENT type="630" id="3465" index="110" uid="ec35cc1c-715b-4068-aec7-93f6de4e97f8" >
<father id="3520" num="2" />
-<cdparam x="139" y="469" />
+<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" />
@@ -9953,9 +9953,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3464" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3467" index="111" uid="b6946993-1186-4435-9755-a5f6f81245a6" >
+<SUBCOMPONENT type="630" id="3467" index="111" uid="94b9459e-a5c3-4b92-b9d0-b14465e19993" >
<father id="3520" num="3" />
-<cdparam x="139" y="469" />
+<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" />
@@ -9963,9 +9963,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3466" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3469" index="112" uid="26c98f60-d4c7-4987-8953-180e1aacf02f" >
+<SUBCOMPONENT type="630" id="3469" index="112" uid="793f7fc5-5f34-4dac-8ca7-ce69e608d565" >
<father id="3520" num="4" />
-<cdparam x="139" y="469" />
+<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" />
@@ -9973,9 +9973,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3468" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3471" index="113" uid="1d7b7b20-8937-4ab6-b1bb-58647337fa86" >
+<SUBCOMPONENT type="630" id="3471" index="113" uid="d7b19e7b-91f4-438c-b782-0324ee0b9a02" >
<father id="3520" num="5" />
-<cdparam x="139" y="469" />
+<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" />
@@ -9983,9 +9983,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3470" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3473" index="114" uid="5cdf08b2-a825-4548-937d-611124b99776" >
+<SUBCOMPONENT type="630" id="3473" index="114" uid="0ccf3e1b-cc20-445d-8744-549c0ac615c3" >
<father id="3520" num="6" />
-<cdparam x="139" y="469" />
+<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" />
@@ -9993,9 +9993,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3472" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3475" index="115" uid="27727f86-2ec9-4dda-be18-387962b37a13" >
+<SUBCOMPONENT type="630" id="3475" index="115" uid="48af4f54-1f0d-4b27-809a-6d342489210b" >
<father id="3520" num="7" />
-<cdparam x="139" y="469" />
+<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" />
@@ -10003,9 +10003,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3474" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3477" index="116" uid="02e7524d-d014-4dc6-a18b-559616b04be9" >
+<SUBCOMPONENT type="630" id="3477" index="116" uid="f8edaa78-909a-48ef-b8b0-455e773130a0" >
<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" />
@@ -10013,9 +10013,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3476" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3479" index="117" uid="1c1f42ec-13d5-4da5-b9d3-3f65cb0e0605" >
+<SUBCOMPONENT type="630" id="3479" index="117" uid="8587d997-2097-498c-b885-ae1d9e1f297e" >
<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" />
@@ -10023,9 +10023,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3478" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3481" index="118" uid="f7023ab4-1f10-4628-958b-08d2d850f2fe" >
+<SUBCOMPONENT type="630" id="3481" index="118" uid="269883ad-78c0-4c5e-92f1-fa0945532cb9" >
<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" />
@@ -10033,9 +10033,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3480" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3483" index="119" uid="7591da14-b65e-4a1c-b5da-0ab9c0a0c2aa" >
+<SUBCOMPONENT type="630" id="3483" index="119" uid="8a6a473f-edfa-4322-a83b-6828724f1b80" >
<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" />
@@ -10043,9 +10043,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3482" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3485" index="120" uid="a7304876-c115-48df-b0ee-590649be7d3c" >
+<SUBCOMPONENT type="630" id="3485" index="120" uid="332c51e9-7f82-406f-a2fb-d99ba078f4bc" >
<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" />
@@ -10053,9 +10053,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3484" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3487" index="121" uid="59125c0d-b1a8-4947-93d4-6dbc1beed6bf" >
+<SUBCOMPONENT type="630" id="3487" index="121" uid="40444a88-a9a8-4942-92b8-b5429fccb21a" >
<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" />
@@ -10063,9 +10063,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3486" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3489" index="122" uid="e99b2ef6-0159-4f56-83d8-2c5fa7fc7e60" >
+<SUBCOMPONENT type="630" id="3489" index="122" uid="a108f559-1add-4863-9585-b990c63c0fa9" >
<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" />
@@ -10073,9 +10073,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3488" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3491" index="123" uid="a108f559-1add-4863-9585-b990c63c0fa9" >
+<SUBCOMPONENT type="630" id="3491" index="123" uid="e99b2ef6-0159-4f56-83d8-2c5fa7fc7e60" >
<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" />
@@ -10083,9 +10083,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3490" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3493" index="124" uid="40444a88-a9a8-4942-92b8-b5429fccb21a" >
+<SUBCOMPONENT type="630" id="3493" index="124" uid="59125c0d-b1a8-4947-93d4-6dbc1beed6bf" >
<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" />
@@ -10093,9 +10093,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3492" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3495" index="125" uid="332c51e9-7f82-406f-a2fb-d99ba078f4bc" >
+<SUBCOMPONENT type="630" id="3495" index="125" uid="a7304876-c115-48df-b0ee-590649be7d3c" >
<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" />
@@ -10103,9 +10103,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3494" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3497" index="126" uid="8a6a473f-edfa-4322-a83b-6828724f1b80" >
+<SUBCOMPONENT type="630" id="3497" index="126" uid="7591da14-b65e-4a1c-b5da-0ab9c0a0c2aa" >
<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" />
@@ -10113,9 +10113,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3496" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3499" index="127" uid="269883ad-78c0-4c5e-92f1-fa0945532cb9" >
+<SUBCOMPONENT type="630" id="3499" index="127" uid="f7023ab4-1f10-4628-958b-08d2d850f2fe" >
<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" />
@@ -10123,9 +10123,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3498" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3501" index="128" uid="8587d997-2097-498c-b885-ae1d9e1f297e" >
+<SUBCOMPONENT type="630" id="3501" index="128" uid="1c1f42ec-13d5-4da5-b9d3-3f65cb0e0605" >
<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" />
@@ -10133,9 +10133,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3500" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3503" index="129" uid="f8edaa78-909a-48ef-b8b0-455e773130a0" >
+<SUBCOMPONENT type="630" id="3503" index="129" uid="02e7524d-d014-4dc6-a18b-559616b04be9" >
<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" />
@@ -10143,9 +10143,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3502" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3505" index="130" uid="48af4f54-1f0d-4b27-809a-6d342489210b" >
+<SUBCOMPONENT type="630" id="3505" index="130" uid="27727f86-2ec9-4dda-be18-387962b37a13" >
<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" />
@@ -10153,9 +10153,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3504" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3507" index="131" uid="0ccf3e1b-cc20-445d-8744-549c0ac615c3" >
+<SUBCOMPONENT type="630" id="3507" index="131" uid="5cdf08b2-a825-4548-937d-611124b99776" >
<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" />
@@ -10163,9 +10163,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3506" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3509" index="132" uid="d7b19e7b-91f4-438c-b782-0324ee0b9a02" >
+<SUBCOMPONENT type="630" id="3509" index="132" uid="1d7b7b20-8937-4ab6-b1bb-58647337fa86" >
<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" />
@@ -10173,9 +10173,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3508" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3511" index="133" uid="793f7fc5-5f34-4dac-8ca7-ce69e608d565" >
+<SUBCOMPONENT type="630" id="3511" index="133" uid="26c98f60-d4c7-4987-8953-180e1aacf02f" >
<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" />
@@ -10183,9 +10183,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3510" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3513" index="134" uid="94b9459e-a5c3-4b92-b9d0-b14465e19993" >
+<SUBCOMPONENT type="630" id="3513" index="134" uid="b6946993-1186-4435-9755-a5f6f81245a6" >
<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" />
@@ -10193,9 +10193,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3512" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3515" index="135" uid="ec35cc1c-715b-4068-aec7-93f6de4e97f8" >
+<SUBCOMPONENT type="630" id="3515" index="135" uid="8bf7a253-ce7f-4f18-b301-aefbfb439ddc" >
<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" />
@@ -10203,9 +10203,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3514" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3517" index="136" uid="c66bc78c-23e9-4de4-8ec6-2f20884111df" >
+<SUBCOMPONENT type="630" id="3517" index="136" uid="8022ba15-df82-467c-a04b-ef150ca63442" >
<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" />
@@ -10213,9 +10213,9 @@
<new d="false" />
<TGConnectingPoint num="0" id="3516" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3519" index="137" uid="345646ae-90e7-4ecf-b182-ed983b066afc" >
+<SUBCOMPONENT type="630" id="3519" index="137" uid="2e3e6fae-37be-4ccd-87bd-4dda35d0035f" >
<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" />
@@ -10228,8 +10228,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10237,8 +10237,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10246,8 +10246,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10255,8 +10255,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10264,8 +10264,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10273,8 +10273,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10282,8 +10282,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10291,8 +10291,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10300,8 +10300,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10309,8 +10309,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10318,8 +10318,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10327,8 +10327,8 @@
<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" />
<new d="false" />
</CONNECTOR>
@@ -10441,7 +10441,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="206" id="3683" />
+<P1 x="964" y="206" id="3642" />
<P2 x="1077" y="206" id="3559" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -10458,8 +10458,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="676" y="207" id="3642" />
-<P2 x="714" y="206" id="3682" />
+<P1 x="676" y="207" id="3683" />
+<P2 x="714" y="206" id="3641" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -10474,7 +10474,7 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3537" />
<P1 x="331" y="206" id="3601" />
-<P2 x="426" y="207" id="3641" />
+<P2 x="426" y="207" id="3682" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -10730,13 +10730,13 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<CryptoBlock value="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="3678" index="7" uid="fb7ec182-3f1c-496b-a045-ba55e55810ca" >
+<SUBCOMPONENT type="5000" id="3678" index="7" uid="43f1c193-a308-4940-a124-29a76a580675" >
<father id="3760" num="0" />
-<cdparam x="426" y="140" />
-<sizeparam width="250" height="134" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="714" y="140" />
+<sizeparam width="250" height="132" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="82" />
-<infoparam name="Block0" value="MainController" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="84" />
+<infoparam name="Block0" value="AlarmManager" />
<new d="false" />
<TGConnectingPoint num="0" id="3638" />
<TGConnectingPoint num="1" id="3639" />
@@ -10781,19 +10781,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="3719" index="8" uid="43f1c193-a308-4940-a124-29a76a580675" >
+<SUBCOMPONENT type="5000" id="3719" index="8" uid="fb7ec182-3f1c-496b-a045-ba55e55810ca" >
<father id="3760" num="1" />
-<cdparam x="714" y="140" />
-<sizeparam width="250" height="132" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="426" y="140" />
+<sizeparam width="250" height="134" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="84" />
-<infoparam name="Block0" value="AlarmManager" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="82" />
+<infoparam name="Block0" value="MainController" />
<new d="false" />
<TGConnectingPoint num="0" id="3679" />
<TGConnectingPoint num="1" id="3680" />
@@ -10838,11 +10839,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>
@@ -13820,7 +13820,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="5055" />
-<P1 x="964" y="213" id="5164" />
+<P1 x="964" y="213" id="5205" />
<P2 x="1077" y="214" id="5081" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -13837,8 +13837,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="5057" />
-<P1 x="676" y="212" id="5205" />
-<P2 x="714" y="213" id="5163" />
+<P1 x="676" y="212" id="5164" />
+<P2 x="714" y="213" id="5204" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -13853,7 +13853,7 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="5059" />
<P1 x="331" y="212" id="5123" />
-<P2 x="426" y="212" id="5204" />
+<P2 x="426" y="212" id="5163" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -14109,13 +14109,13 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<CryptoBlock value="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="5200" index="7" uid="1fe651c8-cc33-4b1d-97fc-e2c41002b04f" >
+<SUBCOMPONENT type="5000" id="5200" index="7" uid="226aef6b-2b5e-4cd2-8353-9da45869dd94" >
<father id="5282" num="0" />
-<cdparam x="714" y="140" />
-<sizeparam width="250" height="147" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="426" y="140" />
+<sizeparam width="250" height="145" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="140" />
-<infoparam name="Block0" value="AlarmManager" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="142" />
+<infoparam name="Block0" value="MainController" />
<new d="false" />
<TGConnectingPoint num="0" id="5160" />
<TGConnectingPoint num="1" id="5161" />
@@ -14160,20 +14160,19 @@ F 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="5241" index="8" uid="226aef6b-2b5e-4cd2-8353-9da45869dd94" >
+<SUBCOMPONENT type="5000" id="5241" index="8" uid="1fe651c8-cc33-4b1d-97fc-e2c41002b04f" >
<father id="5282" num="1" />
-<cdparam x="426" y="140" />
-<sizeparam width="250" height="145" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="714" y="140" />
+<sizeparam width="250" height="147" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="142" />
-<infoparam name="Block0" value="MainController" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="140" />
+<infoparam name="Block0" value="AlarmManager" />
<new d="false" />
<TGConnectingPoint num="0" id="5201" />
<TGConnectingPoint num="1" id="5202" />
@@ -14218,10 +14217,11 @@ F 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>
@@ -17214,7 +17214,7 @@ F 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="6579" />
-<P1 x="551" y="274" id="6757" />
+<P1 x="551" y="274" id="6716" />
<P2 x="550" y="333" id="6595" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -17229,7 +17229,7 @@ F 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="6581" />
-<P1 x="964" y="206" id="6714" />
+<P1 x="964" y="206" id="6755" />
<P2 x="1077" y="206" id="6631" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -17246,8 +17246,8 @@ F 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="6583" />
-<P1 x="676" y="207" id="6755" />
-<P2 x="714" y="206" id="6713" />
+<P1 x="676" y="207" id="6714" />
+<P2 x="714" y="206" id="6754" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -17262,7 +17262,7 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="6585" />
<P1 x="331" y="206" id="6673" />
-<P2 x="426" y="207" id="6754" />
+<P2 x="426" y="207" id="6713" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -17513,13 +17513,13 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<CryptoBlock value="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="6750" index="9" uid="8ff1283a-ae2a-49d7-ab09-74d0cfd68651" >
+<SUBCOMPONENT type="5000" id="6750" index="9" uid="f4fab781-93a5-4108-b39d-a47f4b3189f8" >
<father id="6832" num="0" />
-<cdparam x="714" y="140" />
-<sizeparam width="250" height="132" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="426" y="140" />
+<sizeparam width="250" height="134" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="84" />
-<infoparam name="Block0" value="AlarmManager" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="82" />
+<infoparam name="Block0" value="MainController" />
<new d="false" />
<TGConnectingPoint num="0" id="6710" />
<TGConnectingPoint num="1" id="6711" />
@@ -17564,20 +17564,20 @@ F 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" />
+<Signal value="out highPressureObs()" attached="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="6791" index="10" uid="f4fab781-93a5-4108-b39d-a47f4b3189f8" >
+<SUBCOMPONENT type="5000" id="6791" index="10" uid="8ff1283a-ae2a-49d7-ab09-74d0cfd68651" >
<father id="6832" num="1" />
-<cdparam x="426" y="140" />
-<sizeparam width="250" height="134" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="714" y="140" />
+<sizeparam width="250" height="132" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="82" />
-<infoparam name="Block0" value="MainController" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="84" />
+<infoparam name="Block0" value="AlarmManager" />
<new d="false" />
<TGConnectingPoint num="0" id="6751" />
<TGConnectingPoint num="1" id="6752" />
@@ -17622,11 +17622,11 @@ F 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" />
-<Signal value="out highPressureObs()" 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>
@@ -21275,7 +21275,7 @@ F 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="8456" />
-<P1 x="964" y="240" id="8548" />
+<P1 x="964" y="240" id="8589" />
<P2 x="1088" y="240" id="8465" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -21292,8 +21292,8 @@ F 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="8458" />
-<P1 x="659" y="240" id="8589" />
-<P2 x="714" y="240" id="8547" />
+<P1 x="659" y="240" id="8548" />
+<P2 x="714" y="240" id="8588" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -21308,7 +21308,7 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="8460" />
<P1 x="325" y="241" id="8507" />
-<P2 x="409" y="240" id="8588" />
+<P2 x="409" y="240" id="8547" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -21502,13 +21502,13 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<CryptoBlock value="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="8584" index="6" uid="e02a7fdc-2e98-4aae-9786-9f688ab5c9d1" >
+<SUBCOMPONENT type="5000" id="8584" index="6" uid="55160b27-2538-469d-8f54-8bae02f3b6d9" >
<father id="8666" 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" />
<new d="false" />
<TGConnectingPoint num="0" id="8544" />
<TGConnectingPoint num="1" id="8545" />
@@ -21553,20 +21553,19 @@ F 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="8625" index="7" uid="55160b27-2538-469d-8f54-8bae02f3b6d9" >
+<SUBCOMPONENT type="5000" id="8625" index="7" uid="e02a7fdc-2e98-4aae-9786-9f688ab5c9d1" >
<father id="8666" 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" />
<new d="false" />
<TGConnectingPoint num="0" id="8585" />
<TGConnectingPoint num="1" id="8586" />
@@ -21611,10 +21610,11 @@ F 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>
@@ -24417,7 +24417,7 @@ F 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="9775" />
-<P1 x="964" y="240" id="9901" />
+<P1 x="964" y="240" id="9942" />
<P2 x="1088" y="240" id="9818" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -24434,8 +24434,8 @@ F 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="9777" />
-<P1 x="659" y="240" id="9942" />
-<P2 x="714" y="240" id="9900" />
+<P1 x="659" y="240" id="9901" />
+<P2 x="714" y="240" id="9941" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -24450,7 +24450,7 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="9779" />
<P1 x="325" y="241" id="9860" />
-<P2 x="409" y="240" id="9941" />
+<P2 x="409" y="240" id="9900" />
<AutomaticDrawing data="true" />
<new d="false" />
<extraparam>
@@ -24737,13 +24737,13 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<CryptoBlock value="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="9937" index="8" uid="a49e8b9f-0f1e-4fa2-80ef-c9b175c76725" >
+<SUBCOMPONENT type="5000" id="9937" index="8" uid="6e13c7f3-2f10-4ac3-b8ed-56efef82132f" >
<father id="10019" 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" />
<new d="false" />
<TGConnectingPoint num="0" id="9897" />
<TGConnectingPoint num="1" id="9898" />
@@ -24788,20 +24788,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="9978" index="9" uid="6e13c7f3-2f10-4ac3-b8ed-56efef82132f" >
+<SUBCOMPONENT type="5000" id="9978" index="9" uid="a49e8b9f-0f1e-4fa2-80ef-c9b175c76725" >
<father id="10019" 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" />
<new d="false" />
<TGConnectingPoint num="0" id="9938" />
<TGConnectingPoint num="1" id="9939" />
@@ -24846,10 +24845,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/SysMLSec/at_chuli.xml b/modeling/SysMLSec/at_chuli.xml
index 32f0fc3af1..59de6ad98f 100644
--- a/modeling/SysMLSec/at_chuli.xml
+++ b/modeling/SysMLSec/at_chuli.xml
@@ -4,7 +4,7 @@
<Modeling type="AttackTree" nameTab="Chuly" >
<AttackTreeDiagramPanel name="Attack Tree" minX="13" maxX="2973" minY="13" maxY="2973" zoom="1.0000000000000007" >
-<CONNECTOR type="133" id="6" >
+<CONNECTOR type="133" id="6" index="0" uid="4f6101b6-145b-4d2e-82fe-f7584af4d760" >
<cdparam x="476" y="635" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -16,24 +16,27 @@
<Point x="594" y="664" />
<Point x="812" y="664" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1" >
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1" index="43" uid="4d2d1969-a865-436c-8956-c6a16d967c96" >
<father id="6" num="0" />
<cdparam x="594" y="664" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2" >
+<SUBCOMPONENT type="-1" id="2" index="44" uid="1c5aa1b9-788a-48d5-833d-d3a61e45531b" >
<father id="6" num="1" />
<cdparam x="812" y="664" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="133" id="8" >
+<CONNECTOR type="133" id="8" index="1" uid="e3873dff-609a-4425-9949-ad39474e3b17" >
<cdparam x="467" y="841" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -41,8 +44,9 @@
<P1 x="446" y="860" id="291" />
<P2 x="482" y="861" id="692" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="10" >
+<CONNECTOR type="133" id="10" index="2" uid="af8715be-3510-48e0-81f5-317aa58c11ab" >
<cdparam x="408" y="644" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
@@ -50,8 +54,9 @@
<P1 x="424" y="644" id="769" />
<P2 x="371" y="836" id="289" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="12" >
+<CONNECTOR type="133" id="12" index="3" uid="a50c47d1-b624-4381-be99-9760e49e4d64" >
<cdparam x="395" y="887" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
@@ -59,8 +64,9 @@
<P1 x="369" y="919" id="302" />
<P2 x="371" y="885" id="292" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="14" >
+<CONNECTOR type="133" id="14" index="4" uid="c2d0da72-dee8-4055-9b51-fbb350e4f49d" >
<cdparam x="441" y="644" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -68,8 +74,9 @@
<P1 x="466" y="644" id="777" />
<P2 x="467" y="718" id="720" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="22" >
+<CONNECTOR type="133" id="22" index="5" uid="08e027bb-8c21-4583-b01d-c7606fe3bc64" >
<cdparam x="304" y="847" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -83,32 +90,36 @@
<Point x="173" y="1323" />
<Point x="516" y="1323" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="15" >
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="15" index="45" uid="a8f03caa-849f-4080-943a-a8abc7bfc788" >
<father id="22" num="0" />
<cdparam x="172" y="1020" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="16" >
+<SUBCOMPONENT type="-1" id="16" index="46" uid="d01be85c-188f-44b1-9812-339aaf060ed7" >
<father id="22" num="1" />
<cdparam x="173" y="1323" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="17" >
+<SUBCOMPONENT type="-1" id="17" index="47" uid="af6c3a61-085c-487f-807d-1e599154ea4f" >
<father id="22" num="2" />
<cdparam x="516" y="1323" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="133" id="28" >
+<CONNECTOR type="133" id="28" index="6" uid="9ec60a35-c496-4759-a96a-98e7027bd184" >
<cdparam x="428" y="1283" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -120,24 +131,27 @@
<Point x="386" y="1197" />
<Point x="255" y="1197" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="23" >
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="23" index="48" uid="f994add1-8ca6-47c8-a195-259f0723e4e2" >
<father id="28" num="0" />
<cdparam x="386" y="1197" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="24" >
+<SUBCOMPONENT type="-1" id="24" index="49" uid="06625524-0504-42e1-a2c8-91a14dac0978" >
<father id="28" num="1" />
<cdparam x="255" y="1197" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="133" id="30" >
+<CONNECTOR type="133" id="30" index="7" uid="925b4b3f-49d2-49cd-b4c2-1a161806c520" >
<cdparam x="428" y="1293" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -145,8 +159,9 @@
<P1 x="428" y="1288" id="541" />
<P2 x="306" y="1248" id="355" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="34" >
+<CONNECTOR type="133" id="34" index="8" uid="69802c22-0f2f-49bc-8b40-2150f9205356" >
<cdparam x="428" y="1303" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -156,16 +171,18 @@
<P2 x="188" y="1062" id="510" />
<Point x="188" y="1303" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="31" >
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="31" index="50" uid="93b23c40-c912-489b-93f0-3e865c1900c2" >
<father id="34" num="0" />
<cdparam x="188" y="1303" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="133" id="38" >
+<CONNECTOR type="133" id="38" index="9" uid="726e7839-5b62-4e5a-b43b-14a92ea0ba5c" >
<cdparam x="740" y="1224" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -175,16 +192,18 @@
<P2 x="589" y="1022" id="536" />
<Point x="740" y="1112" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="35" >
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="35" index="51" uid="4a0c53fd-32d0-4c8c-88e3-8e12cf9c7a93" >
<father id="38" num="0" />
<cdparam x="740" y="1112" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="133" id="42" >
+<CONNECTOR type="133" id="42" index="10" uid="973868fb-41bc-4f8f-8e1a-7eeaf4acf069" >
<cdparam x="603" y="1303" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -194,16 +213,18 @@
<P2 x="893" y="1172" id="413" />
<Point x="851" y="1303" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="39" >
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="39" index="52" uid="48380ac0-4457-4201-98ab-a1fa0857c6c4" >
<father id="42" num="0" />
<cdparam x="851" y="1303" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="133" id="44" >
+<CONNECTOR type="133" id="44" index="11" uid="de6cc2cd-bce9-4843-876f-ccaed07cbfa1" >
<cdparam x="559" y="1273" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -211,8 +232,9 @@
<P1 x="591" y="1268" id="545" />
<P2 x="635" y="1170" id="437" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="46" >
+<CONNECTOR type="133" id="46" index="12" uid="b5f50815-204b-415a-9c04-bfcc84947158" >
<cdparam x="472" y="1273" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -220,8 +242,9 @@
<P1 x="482" y="1268" id="544" />
<P2 x="438" y="1168" id="488" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="48" >
+<CONNECTOR type="133" id="48" index="13" uid="143cf90b-eb5c-463b-9814-ac5ecca787af" >
<cdparam x="496" y="1276" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -229,8 +252,9 @@
<P1 x="537" y="1268" id="540" />
<P2 x="529" y="1169" id="455" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="50" >
+<CONNECTOR type="133" id="50" index="14" uid="ba9cbd71-a642-4b71-b6ba-326e64c5bb1c" >
<cdparam x="514" y="986" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -238,8 +262,9 @@
<P1 x="514" y="986" id="527" />
<P2 x="532" y="968" id="807" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="54" >
+<CONNECTOR type="133" id="54" index="15" uid="26bd7cba-7aa2-4d52-bfee-0824e0d2d271" >
<cdparam x="286" y="1195" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -249,16 +274,18 @@
<P2 x="440" y="1022" id="535" />
<Point x="332" y="1118" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="51" >
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="51" index="53" uid="e1632fd8-0c34-4991-92d4-2bb546d5c270" >
<father id="54" num="0" />
<cdparam x="332" y="1118" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1518" minY="10" maxY="1518" />
<infoparam name="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="133" id="56" >
+<CONNECTOR type="133" id="56" index="16" uid="2214c59d-eab1-4c49-8f2b-4e2226135000" >
<cdparam x="303" y="1112" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -266,8 +293,9 @@
<P1 x="320" y="1108" id="384" />
<P2 x="440" y="1010" id="528" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="58" >
+<CONNECTOR type="133" id="58" index="17" uid="69eedef9-fdbe-46b4-a440-03ffac7c214e" >
<cdparam x="827" y="1136" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -275,8 +303,9 @@
<P1 x="846" y="1132" id="402" />
<P2 x="589" y="998" id="534" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="60" >
+<CONNECTOR type="133" id="60" index="18" uid="7e5069bb-6908-41a6-878f-8b422089f63b" >
<cdparam x="660" y="1135" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -284,8 +313,9 @@
<P1 x="676" y="1130" id="427" />
<P2 x="551" y="1035" id="538" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="62" >
+<CONNECTOR type="133" id="62" index="19" uid="54c5df47-2af0-48ea-9678-166d7ec66bb4" >
<cdparam x="545" y="1134" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -293,8 +323,9 @@
<P1 x="529" y="1129" id="452" />
<P2 x="514" y="1035" id="530" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="64" >
+<CONNECTOR type="133" id="64" index="20" uid="3f98c9b0-6f12-49b6-9355-64552bbbb5f7" >
<cdparam x="429" y="1132" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -302,8 +333,9 @@
<P1 x="405" y="1128" id="477" />
<P2 x="477" y="1035" id="537" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="66" >
+<CONNECTOR type="133" id="66" index="21" uid="e05f1798-b418-4874-8695-317e4a2bc358" >
<cdparam x="260" y="1092" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -311,8 +343,9 @@
<P1 x="262" y="1032" id="502" />
<P2 x="440" y="998" id="533" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="68" >
+<CONNECTOR type="133" id="68" index="22" uid="2972a086-9a5f-42e7-adb1-dc89bef5cbf4" >
<cdparam x="688" y="622" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -320,8 +353,9 @@
<P1 x="690" y="634" id="565" />
<P2 x="713" y="617" id="581" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="70" >
+<CONNECTOR type="133" id="70" index="23" uid="47b5cef2-3aff-4a87-a1aa-cd66f3215915" >
<cdparam x="771" y="688" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -329,8 +363,9 @@
<P1 x="796" y="712" id="603" />
<P2 x="727" y="683" id="576" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="72" >
+<CONNECTOR type="133" id="72" index="24" uid="7467aac4-5477-479b-a823-d5bfd7d2ccfb" >
<cdparam x="608" y="685" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -338,8 +373,9 @@
<P1 x="619" y="708" id="628" />
<P2 x="653" y="683" id="575" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="74" >
+<CONNECTOR type="133" id="74" index="25" uid="789b7516-590b-4302-8fa2-77152c5d870b" >
<cdparam x="602" y="628" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
@@ -347,8 +383,9 @@
<P1 x="713" y="577" id="578" />
<P2 x="703" y="551" id="865" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="76" >
+<CONNECTOR type="133" id="76" index="26" uid="b6d82810-305c-4f47-87f2-aacade19a296" >
<cdparam x="608" y="712" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -356,8 +393,9 @@
<P1 x="620" y="775" id="653" />
<P2 x="619" y="748" id="631" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="78" >
+<CONNECTOR type="133" id="78" index="27" uid="2b12a391-8aac-4313-a4df-5117b1ec5cb8" >
<cdparam x="658" y="793" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
@@ -365,8 +403,9 @@
<P1 x="740" y="842" id="666" />
<P2 x="657" y="824" id="664" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="80" >
+<CONNECTOR type="133" id="80" index="28" uid="5f8de5b7-8643-4119-b9f9-7cfac28c820c" >
<cdparam x="514" y="790" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
@@ -374,8 +413,9 @@
<P1 x="529" y="841" id="691" />
<P2 x="583" y="824" id="663" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="82" >
+<CONNECTOR type="133" id="82" index="29" uid="61ac17ff-a417-4c67-9204-6e518724704c" >
<cdparam x="620" y="490" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -383,8 +423,9 @@
<P1 x="629" y="502" id="858" />
<P2 x="599" y="416" id="129" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="84" >
+<CONNECTOR type="133" id="84" index="30" uid="7a5770d9-732f-43da-a41f-6b0ad4c09d9f" >
<cdparam x="460" y="616" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
@@ -392,8 +433,9 @@
<P1 x="424" y="606" id="766" />
<P2 x="458" y="330" id="154" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="86" >
+<CONNECTOR type="133" id="86" index="31" uid="1fafb1df-7dce-40f9-81c9-6b5744911084" >
<cdparam x="345" y="634" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -401,8 +443,9 @@
<P1 x="304" y="625" id="793" />
<P2 x="340" y="625" id="767" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="88" >
+<CONNECTOR type="133" id="88" index="32" uid="3290af03-354a-4762-93b4-3b07f859051f" >
<cdparam x="207" y="748" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="2" />
@@ -410,8 +453,9 @@
<P1 x="263" y="676" id="741" />
<P2 x="242" y="644" id="794" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="90" >
+<CONNECTOR type="133" id="90" index="33" uid="46688481-ecd7-4c57-a3a8-8e15420d0f59" >
<cdparam x="352" y="437" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
@@ -419,8 +463,9 @@
<P1 x="372" y="437" id="192" />
<P2 x="211" y="606" id="795" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="92" >
+<CONNECTOR type="133" id="92" index="34" uid="020da0ea-d575-4734-b1de-0fe37f265df5" >
<cdparam x="411" y="379" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
@@ -428,8 +473,9 @@
<P1 x="367" y="379" id="217" />
<P2 x="372" y="397" id="189" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="94" >
+<CONNECTOR type="133" id="94" index="35" uid="4fda7c94-aeb4-427f-8e5c-4fb79d4e144f" >
<cdparam x="432" y="308" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1600" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="1" />
@@ -437,8 +483,9 @@
<P1 x="379" y="311" id="166" />
<P2 x="396" y="311" id="152" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="96" >
+<CONNECTOR type="133" id="96" index="36" uid="6c7e92cb-1837-4bc0-abb7-3ad77685124d" >
<cdparam x="598" y="434" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="3" />
@@ -446,8 +493,9 @@
<P1 x="599" y="378" id="126" />
<P2 x="489" y="330" id="162" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="98" >
+<CONNECTOR type="133" id="98" index="37" uid="b92ec7a8-1a61-4c80-a53a-70d3e3ed6ae8" >
<cdparam x="518" y="367" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
@@ -455,8 +503,9 @@
<P1 x="458" y="292" id="151" />
<P2 x="472" y="278" id="104" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="133" id="100" >
+<CONNECTOR type="133" id="100" index="38" uid="1361fe84-dfc8-4118-a82c-c0b816a99073" >
<cdparam x="783" y="703" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="1" />
@@ -464,13 +513,15 @@
<P1 x="529" y="718" id="721" />
<P2 x="629" y="551" id="864" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<COMPONENT type="1400" id="263" >
+<COMPONENT type="1400" id="263" index="39" uid="740802e7-f84b-4fde-b461-9312a74b0ad4" >
<cdparam x="266" y="204" />
<sizeparam width="434" height="236" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2972" minY="12" maxY="2972" />
<infoparam name="Block5" value="AttackerPC" />
+<new d="false" />
<TGConnectingPoint num="0" id="239" />
<TGConnectingPoint num="1" id="240" />
<TGConnectingPoint num="2" id="241" />
@@ -496,7 +547,7 @@
<TGConnectingPoint num="22" id="261" />
<TGConnectingPoint num="23" id="262" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="125" >
+<SUBCOMPONENT type="1401" id="125" index="54" uid="11970566-f3a4-4dac-93ca-96ced7fd2fbb" >
<father id="263" num="0" />
<cdparam x="366" y="240" />
<sizeparam width="213" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -504,6 +555,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="221" minY="0" maxY="198" />
<infoparam name="TGComponent" value="GatherInformationOnMobilePhone" />
+<new d="false" />
<TGConnectingPoint num="0" id="101" />
<TGConnectingPoint num="1" id="102" />
<TGConnectingPoint num="2" id="103" />
@@ -530,10 +582,10 @@
<TGConnectingPoint num="23" id="124" />
<accessibility />
<extraparam>
-<info description="blah blah blah" root="true" />
+<info description="blah blah blah" root="true" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="150" >
+<SUBCOMPONENT type="1401" id="150" index="55" uid="c9addd75-e311-40e3-9546-b51f496f0169" >
<father id="263" num="1" />
<cdparam x="513" y="378" />
<sizeparam width="173" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -541,6 +593,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="261" minY="0" maxY="198" />
<infoparam name="TGComponent" value="ReceiveRemoteInformation" />
+<new d="false" />
<TGConnectingPoint num="0" id="126" />
<TGConnectingPoint num="1" id="127" />
<TGConnectingPoint num="2" id="128" />
@@ -566,16 +619,17 @@
<TGConnectingPoint num="22" id="148" />
<TGConnectingPoint num="23" id="149" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="163" >
+<SUBCOMPONENT type="1402" id="163" index="56" uid="f0a139c2-7323-49a5-a505-afd9360fb172" >
<father id="263" num="2" />
<cdparam x="396" y="292" />
<sizeparam width="124" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="310" minY="0" maxY="198" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<new d="false" />
<TGConnectingPoint num="0" id="151" />
<TGConnectingPoint num="1" id="152" />
<TGConnectingPoint num="2" id="153" />
@@ -592,7 +646,7 @@
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="188" >
+<SUBCOMPONENT type="1401" id="188" index="57" uid="a6f7afa4-2e2e-4626-9ff6-cb61d990dc61" >
<father id="263" num="3" />
<cdparam x="272" y="291" />
<sizeparam width="107" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -600,6 +654,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="327" minY="0" maxY="196" />
<infoparam name="TGComponent" value="StartWebServer" />
+<new d="false" />
<TGConnectingPoint num="0" id="164" />
<TGConnectingPoint num="1" id="165" />
<TGConnectingPoint num="2" id="166" />
@@ -625,10 +680,10 @@
<TGConnectingPoint num="22" id="186" />
<TGConnectingPoint num="23" id="187" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="213" >
+<SUBCOMPONENT type="1401" id="213" index="58" uid="23a2c074-2e36-41f5-a988-845038db1329" >
<father id="263" num="4" />
<cdparam x="270" y="397" />
<sizeparam width="204" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -636,6 +691,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="230" minY="0" maxY="196" />
<infoparam name="TGComponent" value="SendSpamWithMaliciousPackage" />
+<new d="false" />
<TGConnectingPoint num="0" id="189" />
<TGConnectingPoint num="1" id="190" />
<TGConnectingPoint num="2" id="191" />
@@ -661,10 +717,10 @@
<TGConnectingPoint num="22" id="211" />
<TGConnectingPoint num="23" id="212" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="238" >
+<SUBCOMPONENT type="1401" id="238" index="59" uid="a24f67a8-d2c8-4da2-afbb-9f764bcdc932" >
<father id="263" num="5" />
<cdparam x="305" y="341" />
<sizeparam width="124" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -672,6 +728,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="310" minY="0" maxY="198" />
<infoparam name="TGComponent" value="InfectMobilePhone" />
+<new d="false" />
<TGConnectingPoint num="0" id="214" />
<TGConnectingPoint num="1" id="215" />
<TGConnectingPoint num="2" id="216" />
@@ -697,16 +754,17 @@
<TGConnectingPoint num="22" id="236" />
<TGConnectingPoint num="23" id="237" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="288" >
+<COMPONENT type="1400" id="288" index="40" uid="d8b56ee7-1163-4c32-b474-43de92c1d559" >
<cdparam x="175" y="177" />
<sizeparam width="684" height="272" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2972" minY="12" maxY="2972" />
<infoparam name="Block8" value="AttackerSystem" />
+<new d="false" />
<TGConnectingPoint num="0" id="264" />
<TGConnectingPoint num="1" id="265" />
<TGConnectingPoint num="2" id="266" />
@@ -733,12 +791,13 @@
<TGConnectingPoint num="23" id="287" />
</COMPONENT>
-<COMPONENT type="1400" id="853" >
+<COMPONENT type="1400" id="853" index="41" uid="b7096d21-9537-4f3d-bfb6-851362658dd5" >
<cdparam x="157" y="562" />
<sizeparam width="805" height="791" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2972" minY="12" maxY="2972" />
<infoparam name="Block2" value="UserMobilePhone_Android" />
+<new d="false" />
<TGConnectingPoint num="0" id="829" />
<TGConnectingPoint num="1" id="830" />
<TGConnectingPoint num="2" id="831" />
@@ -764,13 +823,14 @@
<TGConnectingPoint num="22" id="851" />
<TGConnectingPoint num="23" id="852" />
</COMPONENT>
-<SUBCOMPONENT type="1402" id="301" >
+<SUBCOMPONENT type="1402" id="301" index="60" uid="2de17e85-d208-45aa-9e40-20773fce6c47" >
<father id="853" num="0" />
<cdparam x="297" y="836" />
<sizeparam width="149" height="49" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<new d="false" />
<TGConnectingPoint num="0" id="289" />
<TGConnectingPoint num="1" id="290" />
<TGConnectingPoint num="2" id="291" />
@@ -787,7 +847,7 @@
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="326" >
+<SUBCOMPONENT type="1401" id="326" index="61" uid="c5e66b46-baf2-4181-8dd6-e2bb026662b7" >
<father id="853" num="1" />
<cdparam x="322" y="919" />
<sizeparam width="95" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -795,6 +855,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="710" minY="0" maxY="751" />
<infoparam name="TGComponent" value="MonitorIntent" />
+<new d="false" />
<TGConnectingPoint num="0" id="302" />
<TGConnectingPoint num="1" id="303" />
<TGConnectingPoint num="2" id="304" />
@@ -820,10 +881,10 @@
<TGConnectingPoint num="22" id="324" />
<TGConnectingPoint num="23" id="325" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="351" >
+<SUBCOMPONENT type="1401" id="351" index="62" uid="48ee36a5-c867-4190-9547-6231adc687d6" >
<father id="853" num="2" />
<cdparam x="620" y="1220" />
<sizeparam width="201" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -831,6 +892,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="604" minY="0" maxY="751" />
<infoparam name="TGComponent" value="MonitorFailureInDataConnection" />
+<new d="false" />
<TGConnectingPoint num="0" id="327" />
<TGConnectingPoint num="1" id="328" />
<TGConnectingPoint num="2" id="329" />
@@ -856,10 +918,10 @@
<TGConnectingPoint num="22" id="349" />
<TGConnectingPoint num="23" id="350" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="376" >
+<SUBCOMPONENT type="1401" id="376" index="63" uid="d0a3f0ec-af1c-4446-a51f-128783dfbb4d" >
<father id="853" num="3" />
<cdparam x="198" y="1208" />
<sizeparam width="217" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -867,6 +929,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="588" minY="0" maxY="751" />
<infoparam name="TGComponent" value="MonitorNetworkConnectionChange" />
+<new d="false" />
<TGConnectingPoint num="0" id="352" />
<TGConnectingPoint num="1" id="353" />
<TGConnectingPoint num="2" id="354" />
@@ -892,10 +955,10 @@
<TGConnectingPoint num="22" id="374" />
<TGConnectingPoint num="23" id="375" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="401" >
+<SUBCOMPONENT type="1401" id="401" index="64" uid="68a4c510-cb02-4e4a-81ce-d1888c504f02" >
<father id="853" num="4" />
<cdparam x="203" y="1098" />
<sizeparam width="117" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -903,6 +966,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="688" minY="0" maxY="751" />
<infoparam name="TGComponent" value="MonitorScreenOn" />
+<new d="false" />
<TGConnectingPoint num="0" id="377" />
<TGConnectingPoint num="1" id="378" />
<TGConnectingPoint num="2" id="379" />
@@ -928,10 +992,10 @@
<TGConnectingPoint num="22" id="399" />
<TGConnectingPoint num="23" id="400" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="426" >
+<SUBCOMPONENT type="1401" id="426" index="65" uid="6d3e99a0-022a-4ce4-8386-0c94e93f872d" >
<father id="853" num="5" />
<cdparam x="752" y="1132" />
<sizeparam width="188" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -939,6 +1003,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="617" minY="0" maxY="751" />
<infoparam name="TGComponent" value="MonitorApplicationInstallation" />
+<new d="false" />
<TGConnectingPoint num="0" id="402" />
<TGConnectingPoint num="1" id="403" />
<TGConnectingPoint num="2" id="404" />
@@ -964,10 +1029,10 @@
<TGConnectingPoint num="22" id="424" />
<TGConnectingPoint num="23" id="425" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="451" >
+<SUBCOMPONENT type="1401" id="451" index="66" uid="49c5fbb0-e169-4203-99f5-340f1509bb18" >
<father id="853" num="6" />
<cdparam x="595" y="1130" />
<sizeparam width="163" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -975,6 +1040,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="642" minY="0" maxY="751" />
<infoparam name="TGComponent" value="MonitorWallPaperChange" />
+<new d="false" />
<TGConnectingPoint num="0" id="427" />
<TGConnectingPoint num="1" id="428" />
<TGConnectingPoint num="2" id="429" />
@@ -1000,10 +1066,10 @@
<TGConnectingPoint num="22" id="449" />
<TGConnectingPoint num="23" id="450" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="476" >
+<SUBCOMPONENT type="1401" id="476" index="67" uid="42b4b23c-94a5-4085-a8eb-9fb7f27c0ae1" >
<father id="853" num="7" />
<cdparam x="462" y="1129" />
<sizeparam width="135" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1011,6 +1077,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="670" minY="0" maxY="751" />
<infoparam name="TGComponent" value="MonitorTimeChange" />
+<new d="false" />
<TGConnectingPoint num="0" id="452" />
<TGConnectingPoint num="1" id="453" />
<TGConnectingPoint num="2" id="454" />
@@ -1036,10 +1103,10 @@
<TGConnectingPoint num="22" id="474" />
<TGConnectingPoint num="23" id="475" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="501" >
+<SUBCOMPONENT type="1401" id="501" index="68" uid="c9256678-e5f0-4efb-8fc8-866bda65617a" >
<father id="853" num="8" />
<cdparam x="339" y="1128" />
<sizeparam width="132" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1047,6 +1114,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="673" minY="0" maxY="751" />
<infoparam name="TGComponent" value="MonitorBatteryLevel" />
+<new d="false" />
<TGConnectingPoint num="0" id="477" />
<TGConnectingPoint num="1" id="478" />
<TGConnectingPoint num="2" id="479" />
@@ -1072,10 +1140,10 @@
<TGConnectingPoint num="22" id="499" />
<TGConnectingPoint num="23" id="500" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="526" >
+<SUBCOMPONENT type="1401" id="526" index="69" uid="e07202be-e030-4162-a9c5-eb2942662951" >
<father id="853" num="9" />
<cdparam x="188" y="1032" />
<sizeparam width="148" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1083,6 +1151,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="657" minY="0" maxY="751" />
<infoparam name="TGComponent" value="MonitorDeviceWakeUp" />
+<new d="false" />
<TGConnectingPoint num="0" id="502" />
<TGConnectingPoint num="1" id="503" />
<TGConnectingPoint num="2" id="504" />
@@ -1108,16 +1177,17 @@
<TGConnectingPoint num="22" id="524" />
<TGConnectingPoint num="23" id="525" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="539" >
+<SUBCOMPONENT type="1402" id="539" index="70" uid="160c9f79-dc8b-4e23-9e93-4905948e3bd1" >
<father id="853" num="10" />
<cdparam x="440" y="986" />
<sizeparam width="149" height="49" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
<infoparam name="TGComponent" value="<<OR>>" />
+<new d="false" />
<TGConnectingPoint num="0" id="527" />
<TGConnectingPoint num="1" id="528" />
<TGConnectingPoint num="2" id="529" />
@@ -1134,7 +1204,7 @@
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="564" >
+<SUBCOMPONENT type="1401" id="564" index="71" uid="2a1f1cc0-349c-493d-8e7d-a348674533e8" >
<father id="853" num="11" />
<cdparam x="428" y="1268" />
<sizeparam width="218" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1142,6 +1212,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="587" minY="0" maxY="751" />
<infoparam name="TGComponent" value="MonitorMaliciousPackageIsRunning" />
+<new d="false" />
<TGConnectingPoint num="0" id="540" />
<TGConnectingPoint num="1" id="541" />
<TGConnectingPoint num="2" id="542" />
@@ -1167,16 +1238,17 @@
<TGConnectingPoint num="22" id="562" />
<TGConnectingPoint num="23" id="563" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="577" >
+<SUBCOMPONENT type="1402" id="577" index="72" uid="9b236dbd-30b3-43ff-b8d5-7e04f21917c5" >
<father id="853" num="12" />
<cdparam x="616" y="634" />
<sizeparam width="149" height="49" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
<infoparam name="TGComponent" value="<<OR>>" />
+<new d="false" />
<TGConnectingPoint num="0" id="565" />
<TGConnectingPoint num="1" id="566" />
<TGConnectingPoint num="2" id="567" />
@@ -1193,7 +1265,7 @@
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="602" >
+<SUBCOMPONENT type="1401" id="602" index="73" uid="b1b9c136-bfd9-44bc-82ef-6673a4207050" >
<father id="853" num="13" />
<cdparam x="637" y="577" />
<sizeparam width="152" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1201,6 +1273,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="653" minY="0" maxY="751" />
<infoparam name="TGComponent" value="SendPrivateInformation" />
+<new d="false" />
<TGConnectingPoint num="0" id="578" />
<TGConnectingPoint num="1" id="579" />
<TGConnectingPoint num="2" id="580" />
@@ -1226,10 +1299,10 @@
<TGConnectingPoint num="22" id="600" />
<TGConnectingPoint num="23" id="601" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="627" >
+<SUBCOMPONENT type="1401" id="627" index="74" uid="51714da1-a5df-4e16-9f98-6f816449c793" >
<father id="853" num="14" />
<cdparam x="718" y="712" />
<sizeparam width="157" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1237,6 +1310,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="648" minY="0" maxY="751" />
<infoparam name="TGComponent" value="SpiesIncomingMessages" />
+<new d="false" />
<TGConnectingPoint num="0" id="603" />
<TGConnectingPoint num="1" id="604" />
<TGConnectingPoint num="2" id="605" />
@@ -1262,10 +1336,10 @@
<TGConnectingPoint num="22" id="625" />
<TGConnectingPoint num="23" id="626" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="652" >
+<SUBCOMPONENT type="1401" id="652" index="75" uid="b6ca63e8-8a4e-454f-9b42-0cd52cbdbe7f" >
<father id="853" num="15" />
<cdparam x="571" y="708" />
<sizeparam width="97" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1273,6 +1347,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="708" minY="0" maxY="751" />
<infoparam name="TGComponent" value="ManageIntent" />
+<new d="false" />
<TGConnectingPoint num="0" id="628" />
<TGConnectingPoint num="1" id="629" />
<TGConnectingPoint num="2" id="630" />
@@ -1298,16 +1373,17 @@
<TGConnectingPoint num="22" id="650" />
<TGConnectingPoint num="23" id="651" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="665" >
+<SUBCOMPONENT type="1402" id="665" index="76" uid="b0c93707-388b-450a-9406-e87dcc9930af" >
<father id="853" num="16" />
<cdparam x="546" y="775" />
<sizeparam width="149" height="49" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="656" minY="0" maxY="742" />
<infoparam name="TGComponent" value="<<AFTER>>" />
+<new d="false" />
<TGConnectingPoint num="0" id="653" />
<TGConnectingPoint num="1" id="654" />
<TGConnectingPoint num="2" id="655" />
@@ -1324,7 +1400,7 @@
<info equation="1" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="690" >
+<SUBCOMPONENT type="1401" id="690" index="77" uid="d2213247-7f2e-452e-b1c5-eb1238496dc9" >
<father id="853" num="17" />
<cdparam x="686" y="842" />
<sizeparam width="109" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1332,6 +1408,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="696" minY="0" maxY="751" />
<infoparam name="TGComponent" value="BroadcastIntent" />
+<new d="false" />
<TGConnectingPoint num="0" id="666" />
<TGConnectingPoint num="1" id="667" />
<TGConnectingPoint num="2" id="668" />
@@ -1357,10 +1434,10 @@
<TGConnectingPoint num="22" id="688" />
<TGConnectingPoint num="23" id="689" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="715" >
+<SUBCOMPONENT type="1401" id="715" index="78" uid="0af8b9f1-2084-4dfd-9e6d-6ffa63a2531d" >
<father id="853" num="18" />
<cdparam x="482" y="841" />
<sizeparam width="95" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1368,6 +1445,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="710" minY="0" maxY="751" />
<infoparam name="TGComponent" value="GatherIntent" />
+<new d="false" />
<TGConnectingPoint num="0" id="691" />
<TGConnectingPoint num="1" id="692" />
<TGConnectingPoint num="2" id="693" />
@@ -1393,10 +1471,10 @@
<TGConnectingPoint num="22" id="713" />
<TGConnectingPoint num="23" id="714" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="740" >
+<SUBCOMPONENT type="1401" id="740" index="79" uid="a8830924-c257-4eee-abbe-7f0a82804f26" >
<father id="853" num="19" />
<cdparam x="436" y="718" />
<sizeparam width="124" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1404,6 +1482,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="681" minY="0" maxY="753" />
<infoparam name="TGComponent" value="RegisterThePhone" />
+<new d="false" />
<TGConnectingPoint num="0" id="716" />
<TGConnectingPoint num="1" id="717" />
<TGConnectingPoint num="2" id="718" />
@@ -1429,10 +1508,10 @@
<TGConnectingPoint num="22" id="738" />
<TGConnectingPoint num="23" id="739" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="765" >
+<SUBCOMPONENT type="1401" id="765" index="80" uid="c4e977d9-af06-47d5-8cb7-abb3a4fa0922" >
<father id="853" num="20" />
<cdparam x="160" y="676" />
<sizeparam width="207" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1440,6 +1519,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="598" minY="0" maxY="753" />
<infoparam name="TGComponent" value="OpenSpamWithMaliciousPackage" />
+<new d="false" />
<TGConnectingPoint num="0" id="741" />
<TGConnectingPoint num="1" id="742" />
<TGConnectingPoint num="2" id="743" />
@@ -1465,10 +1545,10 @@
<TGConnectingPoint num="22" id="763" />
<TGConnectingPoint num="23" id="764" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="790" >
+<SUBCOMPONENT type="1401" id="790" index="81" uid="3bfec9a2-bdc2-4e66-8568-88f25ec85f71" >
<father id="853" num="21" />
<cdparam x="340" y="606" />
<sizeparam width="169" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1476,6 +1556,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="636" minY="0" maxY="753" />
<infoparam name="TGComponent" value="InstallMaliciousApplication" />
+<new d="false" />
<TGConnectingPoint num="0" id="766" />
<TGConnectingPoint num="1" id="767" />
<TGConnectingPoint num="2" id="768" />
@@ -1501,16 +1582,17 @@
<TGConnectingPoint num="22" id="788" />
<TGConnectingPoint num="23" id="789" />
<extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="803" >
+<SUBCOMPONENT type="1402" id="803" index="82" uid="6f564af1-1fef-41d7-a9e3-415d590ebc92" >
<father id="853" num="22" />
<cdparam x="180" y="606" />
<sizeparam width="124" height="38" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="681" minY="0" maxY="753" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<new d="false" />
<TGConnectingPoint num="0" id="791" />
<TGConnectingPoint num="1" id="792" />
<TGConnectingPoint num="2" id="793" />
@@ -1527,7 +1609,7 @@
<info equation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="828" >
+<SUBCOMPONENT type="1401" id="828" index="83" uid="536c67d5-a9bd-47b6-8e5e-78345d27fad5" >
<father id="853" num="23" />
<cdparam x="444" y="928" />
<sizeparam width="177" height="40" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -1535,6 +1617,7 @@
<enabled value="true" />
<cdrectangleparam minX="0" maxX="628" minY="0" maxY="751" />
<infoparam name="TGComponent" value="RestartMaliciousApplication" />
+<new d="false" />
<TGConnectingPoint num="0" id="804" />
<TGConnectingPoint num="1" id="805" />
<TGConnectingPoint num="2" id="806" />
@@ -1560,16 +1643,17 @@
<TGConnectingPoint num="22" id="826" />
<TGConnectingPoint num="23" id="827" />
<extraparam>
-<info description="blah blah blah" root="true" />
+<info description="blah blah blah" root="true" cost="0" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="891" >
+<COMPONENT type="1400" id="891" index="42" uid="6676def2-783c-4b20-b238-4a46d4c4b4a1" >
<cdparam x="118" y="489" />
<sizeparam width="863" height="873" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="12" maxX="2972" minY="12" maxY="2972" />
<infoparam name="Block9" value="AttackedSystem" />
+<new d="false" />
<TGConnectingPoint num="0" id="867" />
<TGConnectingPoint num="1" id="868" />
<TGConnectingPoint num="2" id="869" />
@@ -1595,13 +1679,14 @@
<TGConnectingPoint num="22" id="889" />
<TGConnectingPoint num="23" id="890" />
</COMPONENT>
-<SUBCOMPONENT type="1402" id="866" >
+<SUBCOMPONENT type="1402" id="866" index="84" uid="40563ce6-3629-4702-9db4-2e9d4b218b0d" >
<father id="891" num="0" />
<cdparam x="592" y="502" />
<sizeparam width="149" height="49" minWidth="80" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="714" minY="0" maxY="824" />
<infoparam name="TGComponent" value="<<SEQUENCE>>" />
+<new d="false" />
<TGConnectingPoint num="0" id="854" />
<TGConnectingPoint num="1" id="855" />
<TGConnectingPoint num="2" id="856" />
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index df96a0f634..e7838aa38e 100644
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -9854,16 +9854,20 @@ public class GTURTLEModeling {
warnings = new LinkedList<>();
} else if (clearWarnings) {
warnings.clear();
+ TraceManager.addDev("Clearing warnings");
}
for(NameChecker.NamedElement ne: nes) {
checkName(ne, warnings, _tdp);
- for(NameChecker.NamedElement sub: ne.getSubNamedElements()){
- checkName(sub, warnings, _tdp);
+ if (ne.getSubNamedElements() != null) {
+ for (NameChecker.NamedElement sub : ne.getSubNamedElements()) {
+ checkName(sub, warnings, _tdp);
+ }
}
}
}
private void checkName(NameChecker.NamedElement _ne, List<CheckingError> _warnings, TDiagramPanel _tdp) {
+ //TraceManager.addDev("Checking " + _ne.getName());
if (_ne instanceof NameChecker.NameStartWithUpperCase) {
if (!NameChecker.checkName(_ne)) {
UICheckingError ce = new UICheckingError(CheckingError.STRUCTURE_ERROR,
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index f6a0a4ddcb..df65af80e5 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -3926,9 +3926,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
} else if (tp instanceof FaultTreePanel) {
FaultTreePanel atp = (FaultTreePanel) tp;
b = gtm.translateFaultTreePanel(atp);
+ identifyNamingWarnings(false);
expandToWarnings();
expandToErrors();
- if (b) {
+ if (b || gtm.getCheckingWarnings().size() > 0) {
setMode(MainGUI.FAULTTREE_SYNTAXCHECKING_OK);
ret = true;
if (!automatic) {
@@ -3945,9 +3946,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
} else if (tp instanceof AttackTreePanel) {
AttackTreePanel atp = (AttackTreePanel) tp;
b = gtm.translateAttackTreePanel(atp, getTDiagramPanelIndex());
+ identifyNamingWarnings(false);
expandToWarnings();
expandToErrors();
- if (b) {
+ if (b || gtm.getCheckingWarnings().size() > 0) {
setMode(MainGUI.ATTACKTREE_SYNTAXCHECKING_OK);
ret = true;
if (!automatic) {
@@ -4435,12 +4437,13 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
}
}
} else {
- // Identify active diagram panel
- TDiagramPanel tdp = getCurrentTDiagramPanel();
- if (tdp instanceof NameChecker.SystemWithNamedElements) {
- TraceManager.addDev("Contains named elements");
- gtm.addWarningForNames(tdp, true);
- expandToWarnings();
+ identifyNamingWarnings(true);
+ expandToWarnings();
+ if (!automatic && gtm.getCheckingWarnings().size() > 0) {
+ JOptionPane.showMessageDialog(frame,
+ "0 error, " + getCheckingWarnings().size()
+ + " warning(s).",
+ "Syntax analysis", JOptionPane.INFORMATION_MESSAGE);
}
}
// dtree.toBeUpdated();
@@ -4448,6 +4451,16 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
return ret;
}
+ private void identifyNamingWarnings(boolean clearWarnings) {
+ // Identify active diagram panel
+ TDiagramPanel tdp = getCurrentTDiagramPanel();
+ if (tdp instanceof NameChecker.SystemWithNamedElements) {
+ TraceManager.addDev("Contains named elements");
+ gtm.addWarningForNames(tdp, clearWarnings);
+
+ }
+ }
+
public AttackTree runAttackTreeAnalysis() {
AttackTreePanel atp = (AttackTreePanel) getCurrentTURTLEPanel();
return gtm.getAttackTree(atp, getTDiagramPanelIndex());
diff --git a/src/main/java/ui/atd/ATDBlock.java b/src/main/java/ui/atd/ATDBlock.java
index a16a13c842..e378761e0d 100644
--- a/src/main/java/ui/atd/ATDBlock.java
+++ b/src/main/java/ui/atd/ATDBlock.java
@@ -42,6 +42,7 @@
package ui.atd;
import myutil.GraphicLib;
+import myutil.NameChecker;
import ui.*;
import ui.util.IconManager;
@@ -57,7 +58,8 @@ import java.util.Vector;
* @version 1.1 09/12/2009
* @author Ludovic APVRILLE
*/
-public class ATDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent {
+public class ATDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent,
+ NameChecker.NameStartWithUpperCase, NameChecker.NameTakenFromValue {
// private int textY1 = 3;
private String stereotype = "block";
diff --git a/src/main/java/ui/atd/AttackTreeDiagramPanel.java b/src/main/java/ui/atd/AttackTreeDiagramPanel.java
index ff97768698..1565cad543 100644
--- a/src/main/java/ui/atd/AttackTreeDiagramPanel.java
+++ b/src/main/java/ui/atd/AttackTreeDiagramPanel.java
@@ -43,6 +43,7 @@ package ui.atd;
//import java.awt.*;
+import myutil.NameChecker;
import ui.*;
import java.util.ArrayList;
@@ -61,7 +62,7 @@ import java.util.ListIterator;
* @version 1.0 03/11/2009
* @author Ludovic APVRILLE
*/
-public class AttackTreeDiagramPanel extends TDiagramPanel implements TDPWithAttributes{
+public class AttackTreeDiagramPanel extends TDiagramPanel implements TDPWithAttributes, NameChecker.SystemWithNamedElements {
public AttackTreeDiagramPanel(MainGUI mgui, TToolBar _ttb) {
super(mgui, _ttb);
diff --git a/src/main/java/ui/avatarrd/AvatarRDPanel.java b/src/main/java/ui/avatarrd/AvatarRDPanel.java
index 2f8dcad4a3..0821539668 100755
--- a/src/main/java/ui/avatarrd/AvatarRDPanel.java
+++ b/src/main/java/ui/avatarrd/AvatarRDPanel.java
@@ -41,6 +41,7 @@ package ui.avatarrd;
//import java.awt.*;
+import myutil.NameChecker;
import myutil.TraceManager;
import ui.*;
@@ -54,7 +55,7 @@ import java.util.*;
* @author Ludovic APVRILLE
* @version 1.0 20/04/2010
*/
-public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
+public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes, NameChecker.SystemWithNamedElements {
public Vector validated, ignored;
public AvatarRDPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/main/java/ui/avatarrd/AvatarRDProperty.java b/src/main/java/ui/avatarrd/AvatarRDProperty.java
index 97c7ea2893..b9fe0655bd 100755
--- a/src/main/java/ui/avatarrd/AvatarRDProperty.java
+++ b/src/main/java/ui/avatarrd/AvatarRDProperty.java
@@ -41,6 +41,7 @@ package ui.avatarrd;
import myutil.GraphicLib;
+import myutil.NameChecker;
import ui.*;
import ui.util.IconManager;
@@ -57,7 +58,8 @@ import java.awt.*;
* @author Ludovic APVRILLE
* @version 1.0 20/04/2010
*/
-public class AvatarRDProperty extends TGCScalableWithInternalComponent implements TGAutoAdjust {
+public class AvatarRDProperty extends TGCScalableWithInternalComponent implements TGAutoAdjust, NameChecker.NameStartWithUpperCase,
+ NameChecker.NameTakenFromValue{
public String oldValue;
// protected int textX = 5;
// protected int textY = 22;
diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirement.java b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
index c7d57c73e8..9ae63000ef 100755
--- a/src/main/java/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
@@ -42,6 +42,7 @@ package ui.avatarrd;
import myutil.Conversion;
import myutil.GraphicLib;
+import myutil.NameChecker;
import myutil.TraceManager;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -67,7 +68,8 @@ import java.util.LinkedList;
* @author Ludovic APVRILLE
* @version 1.0 20/04/2010
*/
-public class AvatarRDRequirement extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust, ColorCustomizable {
+public class AvatarRDRequirement extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust, ColorCustomizable,
+ NameChecker.NameStartWithUpperCase, NameChecker.NameTakenFromValue {
public static int SIZE_LIMIT = 35;
public String oldValue;
diff --git a/src/main/java/ui/avatarrd/AvatarRDToolBar.java b/src/main/java/ui/avatarrd/AvatarRDToolBar.java
index d5f06223b7..b77825d449 100755
--- a/src/main/java/ui/avatarrd/AvatarRDToolBar.java
+++ b/src/main/java/ui/avatarrd/AvatarRDToolBar.java
@@ -90,7 +90,7 @@ public class AvatarRDToolBar extends TToolBar {
mgui.actions[TGUIAction.ACT_ENHANCE].setEnabled(b);
- mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(!b);
+ mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(b);
}
diff --git a/src/main/java/ui/ucd/UCDActorBox.java b/src/main/java/ui/ucd/UCDActorBox.java
index 0a5706d053..33a126891d 100755
--- a/src/main/java/ui/ucd/UCDActorBox.java
+++ b/src/main/java/ui/ucd/UCDActorBox.java
@@ -42,6 +42,7 @@
package ui.ucd;
import myutil.GraphicLib;
+import myutil.NameChecker;
import ui.*;
import ui.util.IconManager;
@@ -54,7 +55,8 @@ import java.awt.*;
* @version 1.0 04/01/2011
* @author Ludovic APVRILLE
*/
-public class UCDActorBox extends TGCScalableWithoutInternalComponentOneLineText {
+public class UCDActorBox extends TGCScalableWithoutInternalComponentOneLineText implements NameChecker.NameStartWithUpperCase,
+ NameChecker.NameTakenFromValue {
/*protected int lineLength = 5;
protected int textX = 5;
protected int textY = 15;
--
GitLab