diff --git a/modeling/AVATAR/PressureController.xml b/modeling/AVATAR/PressureController.xml
index 60d55ff96c1b205cfa23367c3ca2a7c3581749d6..714b179f5090e1759d31c6af8cf648cdd98d4892 100644
--- a/modeling/AVATAR/PressureController.xml
+++ b/modeling/AVATAR/PressureController.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="6" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="6" LAST_SELECTED_SUB_TAB="5">
<Modeling type="Avatar Requirement" nameTab="Requirements" >
<AvatarRDPanel name="RequirementsSystemView" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
@@ -3002,7 +3002,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="1644" >
<father id="1703" num="0" />
-<cdparam x="555" y="110" />
+<cdparam x="555" y="575" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3011,7 +3011,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1646" >
<father id="1703" num="1" />
-<cdparam x="555" y="116" />
+<cdparam x="555" y="566" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3020,7 +3020,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1648" >
<father id="1703" num="2" />
-<cdparam x="555" y="133" />
+<cdparam x="555" y="550" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3029,7 +3029,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1650" >
<father id="1703" num="3" />
-<cdparam x="555" y="150" />
+<cdparam x="555" y="533" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3038,7 +3038,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1652" >
<father id="1703" num="4" />
-<cdparam x="555" y="166" />
+<cdparam x="555" y="516" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3047,7 +3047,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1654" >
<father id="1703" num="5" />
-<cdparam x="555" y="183" />
+<cdparam x="555" y="500" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3056,7 +3056,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1656" >
<father id="1703" num="6" />
-<cdparam x="555" y="200" />
+<cdparam x="555" y="483" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3065,7 +3065,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1658" >
<father id="1703" num="7" />
-<cdparam x="555" y="216" />
+<cdparam x="555" y="466" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3074,7 +3074,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1660" >
<father id="1703" num="8" />
-<cdparam x="555" y="233" />
+<cdparam x="555" y="450" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3083,7 +3083,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1662" >
<father id="1703" num="9" />
-<cdparam x="555" y="250" />
+<cdparam x="555" y="433" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3092,7 +3092,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1664" >
<father id="1703" num="10" />
-<cdparam x="555" y="266" />
+<cdparam x="555" y="416" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3101,7 +3101,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1666" >
<father id="1703" num="11" />
-<cdparam x="555" y="283" />
+<cdparam x="555" y="400" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3110,7 +3110,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1668" >
<father id="1703" num="12" />
-<cdparam x="555" y="300" />
+<cdparam x="555" y="383" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3119,7 +3119,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1670" >
<father id="1703" num="13" />
-<cdparam x="555" y="316" />
+<cdparam x="555" y="366" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3128,7 +3128,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1672" >
<father id="1703" num="14" />
-<cdparam x="555" y="333" />
+<cdparam x="555" y="350" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3137,7 +3137,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1674" >
<father id="1703" num="15" />
-<cdparam x="555" y="350" />
+<cdparam x="555" y="333" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3146,7 +3146,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1676" >
<father id="1703" num="16" />
-<cdparam x="555" y="366" />
+<cdparam x="555" y="316" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3155,7 +3155,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1678" >
<father id="1703" num="17" />
-<cdparam x="555" y="383" />
+<cdparam x="555" y="300" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3164,7 +3164,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1680" >
<father id="1703" num="18" />
-<cdparam x="555" y="400" />
+<cdparam x="555" y="283" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3173,7 +3173,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1682" >
<father id="1703" num="19" />
-<cdparam x="555" y="416" />
+<cdparam x="555" y="266" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3182,7 +3182,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1684" >
<father id="1703" num="20" />
-<cdparam x="555" y="433" />
+<cdparam x="555" y="250" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3191,7 +3191,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1686" >
<father id="1703" num="21" />
-<cdparam x="555" y="450" />
+<cdparam x="555" y="233" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3200,7 +3200,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1688" >
<father id="1703" num="22" />
-<cdparam x="555" y="466" />
+<cdparam x="555" y="216" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3209,7 +3209,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1690" >
<father id="1703" num="23" />
-<cdparam x="555" y="483" />
+<cdparam x="555" y="200" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3218,7 +3218,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1692" >
<father id="1703" num="24" />
-<cdparam x="555" y="500" />
+<cdparam x="555" y="183" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3227,7 +3227,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1694" >
<father id="1703" num="25" />
-<cdparam x="555" y="516" />
+<cdparam x="555" y="166" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3236,7 +3236,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1696" >
<father id="1703" num="26" />
-<cdparam x="555" y="533" />
+<cdparam x="555" y="150" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3245,7 +3245,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1698" >
<father id="1703" num="27" />
-<cdparam x="555" y="550" />
+<cdparam x="555" y="133" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3254,7 +3254,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1700" >
<father id="1703" num="28" />
-<cdparam x="555" y="566" />
+<cdparam x="555" y="116" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3263,7 +3263,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1702" >
<father id="1703" num="29" />
-<cdparam x="555" y="575" />
+<cdparam x="555" 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="475" />
@@ -3281,13 +3281,13 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="625" id="1712" >
+<SUBCOMPONENT type="627" id="1712" >
<father id="1782" num="0" />
-<cdparam x="268" y="300" />
+<cdparam x="268" y="395" />
<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="478" />
-<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
+<infoparam name="timer expiration" value="{timer=timerAlarm}" />
<TGConnectingPoint num="0" id="1704" />
<TGConnectingPoint num="1" id="1705" />
<TGConnectingPoint num="2" id="1706" />
@@ -3297,12 +3297,12 @@
<TGConnectingPoint num="6" id="1710" />
<TGConnectingPoint num="7" id="1711" />
<extraparam>
-<Interval timer="timerAlarm" duration="60" />
+<Interval timer="timerAlarm" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1714" >
<father id="1782" num="1" />
-<cdparam x="255" y="116" />
+<cdparam x="255" 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="475" />
@@ -3311,7 +3311,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1716" >
<father id="1782" num="2" />
-<cdparam x="255" y="133" />
+<cdparam x="255" y="575" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3320,7 +3320,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1718" >
<father id="1782" num="3" />
-<cdparam x="255" y="150" />
+<cdparam x="255" y="566" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3329,7 +3329,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1720" >
<father id="1782" num="4" />
-<cdparam x="255" y="166" />
+<cdparam x="255" y="550" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3338,7 +3338,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1722" >
<father id="1782" num="5" />
-<cdparam x="255" y="183" />
+<cdparam x="255" y="533" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3347,7 +3347,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1724" >
<father id="1782" num="6" />
-<cdparam x="255" y="200" />
+<cdparam x="255" y="516" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3356,7 +3356,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1726" >
<father id="1782" num="7" />
-<cdparam x="255" y="216" />
+<cdparam x="255" y="500" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3365,7 +3365,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1728" >
<father id="1782" num="8" />
-<cdparam x="255" y="233" />
+<cdparam x="255" y="483" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3374,7 +3374,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1730" >
<father id="1782" num="9" />
-<cdparam x="255" y="250" />
+<cdparam x="255" y="466" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3383,7 +3383,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1732" >
<father id="1782" num="10" />
-<cdparam x="255" y="266" />
+<cdparam x="255" y="450" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3392,7 +3392,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1734" >
<father id="1782" num="11" />
-<cdparam x="255" y="283" />
+<cdparam x="255" y="433" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3401,7 +3401,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1736" >
<father id="1782" num="12" />
-<cdparam x="255" y="300" />
+<cdparam x="255" y="416" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3410,7 +3410,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1738" >
<father id="1782" num="13" />
-<cdparam x="255" y="316" />
+<cdparam x="255" y="400" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3419,7 +3419,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1740" >
<father id="1782" num="14" />
-<cdparam x="255" y="333" />
+<cdparam x="255" y="383" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3428,7 +3428,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1742" >
<father id="1782" num="15" />
-<cdparam x="255" y="350" />
+<cdparam x="255" y="366" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3437,7 +3437,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1744" >
<father id="1782" num="16" />
-<cdparam x="255" y="366" />
+<cdparam x="255" y="350" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3446,7 +3446,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1746" >
<father id="1782" num="17" />
-<cdparam x="255" y="383" />
+<cdparam x="255" y="333" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3455,7 +3455,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1748" >
<father id="1782" num="18" />
-<cdparam x="255" y="400" />
+<cdparam x="255" y="316" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3464,7 +3464,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1750" >
<father id="1782" num="19" />
-<cdparam x="255" y="416" />
+<cdparam x="255" y="300" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3473,7 +3473,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1752" >
<father id="1782" num="20" />
-<cdparam x="255" y="433" />
+<cdparam x="255" y="283" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3482,7 +3482,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1754" >
<father id="1782" num="21" />
-<cdparam x="255" y="450" />
+<cdparam x="255" y="266" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3491,7 +3491,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1756" >
<father id="1782" num="22" />
-<cdparam x="255" y="466" />
+<cdparam x="255" y="250" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3500,7 +3500,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1758" >
<father id="1782" num="23" />
-<cdparam x="255" y="483" />
+<cdparam x="255" y="233" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3509,7 +3509,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1760" >
<father id="1782" num="24" />
-<cdparam x="255" y="500" />
+<cdparam x="255" y="216" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3518,7 +3518,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1762" >
<father id="1782" num="25" />
-<cdparam x="255" y="516" />
+<cdparam x="255" y="200" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3527,7 +3527,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1764" >
<father id="1782" num="26" />
-<cdparam x="255" y="533" />
+<cdparam x="255" y="183" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3536,7 +3536,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1766" >
<father id="1782" num="27" />
-<cdparam x="255" y="550" />
+<cdparam x="255" y="166" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3545,7 +3545,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1768" >
<father id="1782" num="28" />
-<cdparam x="255" y="566" />
+<cdparam x="255" y="150" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3554,7 +3554,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1770" >
<father id="1782" num="29" />
-<cdparam x="255" y="575" />
+<cdparam x="255" y="133" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3563,20 +3563,20 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1772" >
<father id="1782" num="30" />
-<cdparam x="255" y="110" />
+<cdparam x="255" y="116" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="1771" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="1781" >
+<SUBCOMPONENT type="625" id="1781" >
<father id="1782" num="31" />
-<cdparam x="268" y="395" />
+<cdparam x="268" y="300" />
<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="478" />
-<infoparam name="timer expiration" value="{timer=timerAlarm}" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
<TGConnectingPoint num="0" id="1773" />
<TGConnectingPoint num="1" id="1774" />
<TGConnectingPoint num="2" id="1775" />
@@ -3586,7 +3586,7 @@
<TGConnectingPoint num="6" id="1779" />
<TGConnectingPoint num="7" id="1780" />
<extraparam>
-<Interval timer="timerAlarm" />
+<Interval timer="timerAlarm" duration="60" />
</extraparam>
</SUBCOMPONENT>
@@ -3602,7 +3602,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="1784" >
<father id="1843" num="0" />
-<cdparam x="105" y="110" />
+<cdparam x="105" y="575" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3611,7 +3611,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1786" >
<father id="1843" num="1" />
-<cdparam x="105" y="116" />
+<cdparam x="105" y="566" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3620,7 +3620,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1788" >
<father id="1843" num="2" />
-<cdparam x="105" y="133" />
+<cdparam x="105" y="550" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3629,7 +3629,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1790" >
<father id="1843" num="3" />
-<cdparam x="105" y="150" />
+<cdparam x="105" y="533" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3638,7 +3638,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1792" >
<father id="1843" num="4" />
-<cdparam x="105" y="166" />
+<cdparam x="105" y="516" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3647,7 +3647,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1794" >
<father id="1843" num="5" />
-<cdparam x="105" y="183" />
+<cdparam x="105" y="500" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3656,7 +3656,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1796" >
<father id="1843" num="6" />
-<cdparam x="105" y="200" />
+<cdparam x="105" y="483" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3665,7 +3665,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1798" >
<father id="1843" num="7" />
-<cdparam x="105" y="216" />
+<cdparam x="105" y="466" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3674,7 +3674,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1800" >
<father id="1843" num="8" />
-<cdparam x="105" y="233" />
+<cdparam x="105" y="450" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3683,7 +3683,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1802" >
<father id="1843" num="9" />
-<cdparam x="105" y="250" />
+<cdparam x="105" y="433" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3692,7 +3692,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1804" >
<father id="1843" num="10" />
-<cdparam x="105" y="266" />
+<cdparam x="105" y="416" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3701,7 +3701,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1806" >
<father id="1843" num="11" />
-<cdparam x="105" y="283" />
+<cdparam x="105" y="400" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3710,7 +3710,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1808" >
<father id="1843" num="12" />
-<cdparam x="105" y="300" />
+<cdparam x="105" y="383" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3719,7 +3719,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1810" >
<father id="1843" num="13" />
-<cdparam x="105" y="316" />
+<cdparam x="105" y="366" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3728,7 +3728,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1812" >
<father id="1843" num="14" />
-<cdparam x="105" y="333" />
+<cdparam x="105" y="350" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3737,7 +3737,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1814" >
<father id="1843" num="15" />
-<cdparam x="105" y="350" />
+<cdparam x="105" y="333" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3746,7 +3746,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1816" >
<father id="1843" num="16" />
-<cdparam x="105" y="366" />
+<cdparam x="105" y="316" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3755,7 +3755,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1818" >
<father id="1843" num="17" />
-<cdparam x="105" y="383" />
+<cdparam x="105" y="300" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3764,7 +3764,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1820" >
<father id="1843" num="18" />
-<cdparam x="105" y="400" />
+<cdparam x="105" y="283" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3773,7 +3773,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1822" >
<father id="1843" num="19" />
-<cdparam x="105" y="416" />
+<cdparam x="105" y="266" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3782,7 +3782,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1824" >
<father id="1843" num="20" />
-<cdparam x="105" y="433" />
+<cdparam x="105" y="250" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3791,7 +3791,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1826" >
<father id="1843" num="21" />
-<cdparam x="105" y="450" />
+<cdparam x="105" y="233" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3800,7 +3800,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1828" >
<father id="1843" num="22" />
-<cdparam x="105" y="466" />
+<cdparam x="105" y="216" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3809,7 +3809,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1830" >
<father id="1843" num="23" />
-<cdparam x="105" y="483" />
+<cdparam x="105" y="200" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3818,7 +3818,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1832" >
<father id="1843" num="24" />
-<cdparam x="105" y="500" />
+<cdparam x="105" y="183" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3827,7 +3827,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1834" >
<father id="1843" num="25" />
-<cdparam x="105" y="516" />
+<cdparam x="105" y="166" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3836,7 +3836,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1836" >
<father id="1843" num="26" />
-<cdparam x="105" y="533" />
+<cdparam x="105" y="150" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3845,7 +3845,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1838" >
<father id="1843" num="27" />
-<cdparam x="105" y="550" />
+<cdparam x="105" y="133" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3854,7 +3854,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1840" >
<father id="1843" num="28" />
-<cdparam x="105" y="566" />
+<cdparam x="105" y="116" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -3863,7 +3863,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1842" >
<father id="1843" num="29" />
-<cdparam x="105" y="575" />
+<cdparam x="105" 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="475" />
@@ -3875,56 +3875,56 @@
<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="473" id="1827" />
-<P2 x="255" y="473" id="1755" />
+<P1 x="105" y="473" id="1797" />
+<P2 x="255" y="473" id="1729" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1845" >
<cdparam x="255" y="440" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="stopAlarm" />
-<P1 x="255" y="440" id="1751" />
-<P2 x="555" y="440" id="1683" />
+<P1 x="255" y="440" id="1733" />
+<P2 x="555" y="440" id="1661" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1846" >
<cdparam x="255" y="273" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="startAlarm" />
-<P1 x="255" y="273" id="1731" />
-<P2 x="555" y="273" id="1663" />
+<P1 x="255" y="273" id="1753" />
+<P2 x="555" y="273" id="1681" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1847" >
<cdparam x="105" y="240" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="105" y="240" id="1799" />
-<P2 x="255" y="240" id="1727" />
+<P1 x="105" y="240" id="1825" />
+<P2 x="255" y="240" id="1757" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1848" >
<cdparam x="105" y="207" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(18)" />
-<P1 x="105" y="207" id="1795" />
-<P2 x="255" y="207" id="1723" />
+<P1 x="105" y="207" id="1829" />
+<P2 x="255" y="207" id="1761" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1849" >
<cdparam x="105" y="173" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure19" />
-<P1 x="105" y="173" id="1791" />
-<P2 x="255" y="173" id="1719" />
+<P1 x="105" y="173" id="1833" />
+<P2 x="255" y="173" id="1765" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1850" >
<cdparam x="105" y="140" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(19)" />
-<P1 x="105" y="140" id="1787" />
-<P2 x="255" y="140" id="1715" />
+<P1 x="105" y="140" id="1837" />
+<P2 x="255" y="140" id="1769" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -3941,357 +3941,357 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="1852" >
+<SUBCOMPONENT type="623" id="1859" >
<father id="1958" num="0" />
-<cdparam x="516" y="111" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="437" />
+<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="468" />
-<infoparam name="port" value="port" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="463" />
+<infoparam name="action state" value="timerValue = 60" />
<TGConnectingPoint num="0" id="1851" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1854" >
+<TGConnectingPoint num="1" id="1852" />
+<TGConnectingPoint num="2" id="1853" />
+<TGConnectingPoint num="3" id="1854" />
+<TGConnectingPoint num="4" id="1855" />
+<TGConnectingPoint num="5" id="1856" />
+<TGConnectingPoint num="6" id="1857" />
+<TGConnectingPoint num="7" id="1858" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="622" id="1869" >
<father id="1958" num="1" />
-<cdparam x="516" y="127" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="476" y="342" />
+<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1853" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1856" >
+<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="483" />
+<infoparam name="Line of relative time constraint" value="rtc" />
+<TGConnectingPoint num="0" id="1860" />
+<TGConnectingPoint num="1" id="1861" />
+<TGConnectingPoint num="2" id="1862" />
+<TGConnectingPoint num="3" id="1863" />
+<TGConnectingPoint num="4" id="1864" />
+<TGConnectingPoint num="5" id="1865" />
+<TGConnectingPoint num="6" id="1866" />
+<TGConnectingPoint num="7" id="1867" />
+<TGConnectingPoint num="8" id="1868" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="622" id="1879" >
<father id="1958" num="2" />
-<cdparam x="516" y="144" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="476" y="292" />
+<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1855" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1858" >
+<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="483" />
+<infoparam name="Line of relative time constraint" value="rtc" />
+<TGConnectingPoint num="0" id="1870" />
+<TGConnectingPoint num="1" id="1871" />
+<TGConnectingPoint num="2" id="1872" />
+<TGConnectingPoint num="3" id="1873" />
+<TGConnectingPoint num="4" id="1874" />
+<TGConnectingPoint num="5" id="1875" />
+<TGConnectingPoint num="6" id="1876" />
+<TGConnectingPoint num="7" id="1877" />
+<TGConnectingPoint num="8" id="1878" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="623" id="1888" >
<father id="1958" num="3" />
-<cdparam x="516" y="161" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="341" />
+<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1857" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1860" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="463" />
+<infoparam name="action state" value="timerValue = 59" />
+<TGConnectingPoint num="0" id="1880" />
+<TGConnectingPoint num="1" id="1881" />
+<TGConnectingPoint num="2" id="1882" />
+<TGConnectingPoint num="3" id="1883" />
+<TGConnectingPoint num="4" id="1884" />
+<TGConnectingPoint num="5" id="1885" />
+<TGConnectingPoint num="6" id="1886" />
+<TGConnectingPoint num="7" id="1887" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="623" id="1897" >
<father id="1958" num="4" />
-<cdparam x="516" y="177" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="292" />
+<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1859" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1862" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="463" />
+<infoparam name="action state" value="timerValue = 60" />
+<TGConnectingPoint num="0" id="1889" />
+<TGConnectingPoint num="1" id="1890" />
+<TGConnectingPoint num="2" id="1891" />
+<TGConnectingPoint num="3" id="1892" />
+<TGConnectingPoint num="4" id="1893" />
+<TGConnectingPoint num="5" id="1894" />
+<TGConnectingPoint num="6" id="1895" />
+<TGConnectingPoint num="7" id="1896" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1899" >
<father id="1958" num="5" />
-<cdparam x="516" y="194" />
+<cdparam x="516" y="564" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1861" />
+<TGConnectingPoint num="0" id="1898" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1864" >
+<SUBCOMPONENT type="630" id="1901" >
<father id="1958" num="6" />
-<cdparam x="516" y="211" />
+<cdparam x="516" y="564" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1863" />
+<TGConnectingPoint num="0" id="1900" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1866" >
+<SUBCOMPONENT type="630" id="1903" >
<father id="1958" num="7" />
-<cdparam x="516" y="227" />
+<cdparam x="516" y="561" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1865" />
+<TGConnectingPoint num="0" id="1902" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1868" >
+<SUBCOMPONENT type="630" id="1905" >
<father id="1958" num="8" />
-<cdparam x="516" y="244" />
+<cdparam x="516" y="544" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1867" />
+<TGConnectingPoint num="0" id="1904" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1870" >
+<SUBCOMPONENT type="630" id="1907" >
<father id="1958" num="9" />
-<cdparam x="516" y="261" />
+<cdparam x="516" y="527" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1869" />
+<TGConnectingPoint num="0" id="1906" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1872" >
+<SUBCOMPONENT type="630" id="1909" >
<father id="1958" num="10" />
-<cdparam x="516" y="277" />
+<cdparam x="516" y="511" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1871" />
+<TGConnectingPoint num="0" id="1908" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1874" >
+<SUBCOMPONENT type="630" id="1911" >
<father id="1958" num="11" />
-<cdparam x="516" y="294" />
+<cdparam x="516" y="494" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1873" />
+<TGConnectingPoint num="0" id="1910" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1876" >
+<SUBCOMPONENT type="630" id="1913" >
<father id="1958" num="12" />
-<cdparam x="516" y="311" />
+<cdparam x="516" y="477" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1875" />
+<TGConnectingPoint num="0" id="1912" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1878" >
+<SUBCOMPONENT type="630" id="1915" >
<father id="1958" num="13" />
-<cdparam x="516" y="327" />
+<cdparam x="516" y="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="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1877" />
+<TGConnectingPoint num="0" id="1914" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1880" >
+<SUBCOMPONENT type="630" id="1917" >
<father id="1958" num="14" />
-<cdparam x="516" y="344" />
+<cdparam x="516" y="444" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1879" />
+<TGConnectingPoint num="0" id="1916" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1882" >
+<SUBCOMPONENT type="630" id="1919" >
<father id="1958" num="15" />
-<cdparam x="516" y="361" />
+<cdparam x="516" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1881" />
+<TGConnectingPoint num="0" id="1918" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1884" >
+<SUBCOMPONENT type="630" id="1921" >
<father id="1958" num="16" />
-<cdparam x="516" y="377" />
+<cdparam x="516" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1883" />
+<TGConnectingPoint num="0" id="1920" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1886" >
+<SUBCOMPONENT type="630" id="1923" >
<father id="1958" num="17" />
<cdparam x="516" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1885" />
+<TGConnectingPoint num="0" id="1922" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1888" >
+<SUBCOMPONENT type="630" id="1925" >
<father id="1958" num="18" />
-<cdparam x="516" y="410" />
+<cdparam x="516" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1887" />
+<TGConnectingPoint num="0" id="1924" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1890" >
+<SUBCOMPONENT type="630" id="1927" >
<father id="1958" num="19" />
-<cdparam x="516" y="427" />
+<cdparam x="516" y="361" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1889" />
+<TGConnectingPoint num="0" id="1926" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1892" >
+<SUBCOMPONENT type="630" id="1929" >
<father id="1958" num="20" />
-<cdparam x="516" y="444" />
+<cdparam x="516" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1891" />
+<TGConnectingPoint num="0" id="1928" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1894" >
+<SUBCOMPONENT type="630" id="1931" >
<father id="1958" num="21" />
-<cdparam x="516" y="461" />
+<cdparam x="516" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1893" />
+<TGConnectingPoint num="0" id="1930" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1896" >
+<SUBCOMPONENT type="630" id="1933" >
<father id="1958" num="22" />
-<cdparam x="516" y="477" />
+<cdparam x="516" y="311" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1895" />
+<TGConnectingPoint num="0" id="1932" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1898" >
+<SUBCOMPONENT type="630" id="1935" >
<father id="1958" num="23" />
-<cdparam x="516" y="494" />
+<cdparam x="516" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1897" />
+<TGConnectingPoint num="0" id="1934" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1900" >
+<SUBCOMPONENT type="630" id="1937" >
<father id="1958" num="24" />
-<cdparam x="516" y="511" />
+<cdparam x="516" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1899" />
+<TGConnectingPoint num="0" id="1936" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1902" >
+<SUBCOMPONENT type="630" id="1939" >
<father id="1958" num="25" />
-<cdparam x="516" y="527" />
+<cdparam x="516" y="261" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1901" />
+<TGConnectingPoint num="0" id="1938" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1904" >
+<SUBCOMPONENT type="630" id="1941" >
<father id="1958" num="26" />
-<cdparam x="516" y="544" />
+<cdparam x="516" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1903" />
+<TGConnectingPoint num="0" id="1940" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1906" >
+<SUBCOMPONENT type="630" id="1943" >
<father id="1958" num="27" />
-<cdparam x="516" y="561" />
+<cdparam x="516" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1905" />
+<TGConnectingPoint num="0" id="1942" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1908" >
+<SUBCOMPONENT type="630" id="1945" >
<father id="1958" num="28" />
-<cdparam x="516" y="564" />
+<cdparam x="516" y="211" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1907" />
+<TGConnectingPoint num="0" id="1944" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1910" >
+<SUBCOMPONENT type="630" id="1947" >
<father id="1958" num="29" />
-<cdparam x="516" y="564" />
+<cdparam x="516" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1909" />
+<TGConnectingPoint num="0" id="1946" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1919" >
+<SUBCOMPONENT type="630" id="1949" >
<father id="1958" num="30" />
-<cdparam x="516" y="292" />
-<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="177" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="463" />
-<infoparam name="action state" value="timerValue = 60" />
-<TGConnectingPoint num="0" id="1911" />
-<TGConnectingPoint num="1" id="1912" />
-<TGConnectingPoint num="2" id="1913" />
-<TGConnectingPoint num="3" id="1914" />
-<TGConnectingPoint num="4" id="1915" />
-<TGConnectingPoint num="5" id="1916" />
-<TGConnectingPoint num="6" id="1917" />
-<TGConnectingPoint num="7" id="1918" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1928" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1948" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1951" >
<father id="1958" num="31" />
-<cdparam x="516" y="341" />
-<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="161" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="463" />
-<infoparam name="action state" value="timerValue = 59" />
-<TGConnectingPoint num="0" id="1920" />
-<TGConnectingPoint num="1" id="1921" />
-<TGConnectingPoint num="2" id="1922" />
-<TGConnectingPoint num="3" id="1923" />
-<TGConnectingPoint num="4" id="1924" />
-<TGConnectingPoint num="5" id="1925" />
-<TGConnectingPoint num="6" id="1926" />
-<TGConnectingPoint num="7" id="1927" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="622" id="1938" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1950" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1953" >
<father id="1958" num="32" />
-<cdparam x="476" y="292" />
-<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="144" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="483" />
-<infoparam name="Line of relative time constraint" value="rtc" />
-<TGConnectingPoint num="0" id="1929" />
-<TGConnectingPoint num="1" id="1930" />
-<TGConnectingPoint num="2" id="1931" />
-<TGConnectingPoint num="3" id="1932" />
-<TGConnectingPoint num="4" id="1933" />
-<TGConnectingPoint num="5" id="1934" />
-<TGConnectingPoint num="6" id="1935" />
-<TGConnectingPoint num="7" id="1936" />
-<TGConnectingPoint num="8" id="1937" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="622" id="1948" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1952" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1955" >
<father id="1958" num="33" />
-<cdparam x="476" y="342" />
-<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="127" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="483" />
-<infoparam name="Line of relative time constraint" value="rtc" />
-<TGConnectingPoint num="0" id="1939" />
-<TGConnectingPoint num="1" id="1940" />
-<TGConnectingPoint num="2" id="1941" />
-<TGConnectingPoint num="3" id="1942" />
-<TGConnectingPoint num="4" id="1943" />
-<TGConnectingPoint num="5" id="1944" />
-<TGConnectingPoint num="6" id="1945" />
-<TGConnectingPoint num="7" id="1946" />
-<TGConnectingPoint num="8" id="1947" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1957" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1954" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1957" >
<father id="1958" num="34" />
-<cdparam x="516" y="437" />
-<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="111" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="463" />
-<infoparam name="action state" value="timerValue = 60" />
-<TGConnectingPoint num="0" id="1949" />
-<TGConnectingPoint num="1" id="1950" />
-<TGConnectingPoint num="2" id="1951" />
-<TGConnectingPoint num="3" id="1952" />
-<TGConnectingPoint num="4" id="1953" />
-<TGConnectingPoint num="5" id="1954" />
-<TGConnectingPoint num="6" id="1955" />
-<TGConnectingPoint num="7" id="1956" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1956" />
</SUBCOMPONENT>
<COMPONENT type="620" id="2019" >
@@ -4306,7 +4306,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="1960" >
<father id="2019" num="0" />
-<cdparam x="842" y="104" />
+<cdparam x="842" 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="468" />
@@ -4315,7 +4315,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1962" >
<father id="2019" num="1" />
-<cdparam x="842" y="562" />
+<cdparam x="842" 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="468" />
@@ -4324,7 +4324,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1964" >
<father id="2019" num="2" />
-<cdparam x="842" y="560" />
+<cdparam x="842" 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="468" />
@@ -4333,7 +4333,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1966" >
<father id="2019" num="3" />
-<cdparam x="842" y="544" />
+<cdparam x="842" 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="468" />
@@ -4342,7 +4342,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1968" >
<father id="2019" num="4" />
-<cdparam x="842" y="527" />
+<cdparam x="842" 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="468" />
@@ -4351,7 +4351,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1970" >
<father id="2019" num="5" />
-<cdparam x="842" y="510" />
+<cdparam x="842" 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="468" />
@@ -4360,7 +4360,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1972" >
<father id="2019" num="6" />
-<cdparam x="842" y="494" />
+<cdparam x="842" 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="468" />
@@ -4369,7 +4369,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1974" >
<father id="2019" num="7" />
-<cdparam x="842" y="477" />
+<cdparam x="842" 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="468" />
@@ -4378,7 +4378,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1976" >
<father id="2019" num="8" />
-<cdparam x="842" y="460" />
+<cdparam x="842" 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="468" />
@@ -4387,7 +4387,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1978" >
<father id="2019" num="9" />
-<cdparam x="842" y="444" />
+<cdparam x="842" 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="468" />
@@ -4396,7 +4396,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1980" >
<father id="2019" num="10" />
-<cdparam x="842" y="427" />
+<cdparam x="842" 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="468" />
@@ -4405,7 +4405,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1982" >
<father id="2019" num="11" />
-<cdparam x="842" y="410" />
+<cdparam x="842" 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="468" />
@@ -4414,7 +4414,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1984" >
<father id="2019" num="12" />
-<cdparam x="842" y="394" />
+<cdparam x="842" 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="468" />
@@ -4423,7 +4423,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1986" >
<father id="2019" num="13" />
-<cdparam x="842" y="377" />
+<cdparam x="842" 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="468" />
@@ -4432,7 +4432,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1988" >
<father id="2019" num="14" />
-<cdparam x="842" y="360" />
+<cdparam x="842" 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="468" />
@@ -4441,7 +4441,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1990" >
<father id="2019" num="15" />
-<cdparam x="842" y="344" />
+<cdparam x="842" 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="468" />
@@ -4450,7 +4450,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1992" >
<father id="2019" num="16" />
-<cdparam x="842" y="327" />
+<cdparam x="842" 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="468" />
@@ -4459,7 +4459,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1994" >
<father id="2019" num="17" />
-<cdparam x="842" y="310" />
+<cdparam x="842" 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="468" />
@@ -4468,7 +4468,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1996" >
<father id="2019" num="18" />
-<cdparam x="842" y="294" />
+<cdparam x="842" 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="468" />
@@ -4477,7 +4477,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1998" >
<father id="2019" num="19" />
-<cdparam x="842" y="277" />
+<cdparam x="842" 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="468" />
@@ -4486,7 +4486,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2000" >
<father id="2019" num="20" />
-<cdparam x="842" y="261" />
+<cdparam x="842" y="444" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4495,7 +4495,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2002" >
<father id="2019" num="21" />
-<cdparam x="842" y="244" />
+<cdparam x="842" y="460" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4504,7 +4504,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2004" >
<father id="2019" num="22" />
-<cdparam x="842" y="227" />
+<cdparam x="842" y="477" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4513,7 +4513,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2006" >
<father id="2019" num="23" />
-<cdparam x="842" y="210" />
+<cdparam x="842" y="494" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4522,7 +4522,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2008" >
<father id="2019" num="24" />
-<cdparam x="842" y="194" />
+<cdparam x="842" y="510" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4531,7 +4531,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2010" >
<father id="2019" num="25" />
-<cdparam x="842" y="177" />
+<cdparam x="842" y="527" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4540,7 +4540,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2012" >
<father id="2019" num="26" />
-<cdparam x="842" y="160" />
+<cdparam x="842" y="544" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4549,7 +4549,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2014" >
<father id="2019" num="27" />
-<cdparam x="842" y="144" />
+<cdparam x="842" y="560" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4558,7 +4558,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2016" >
<father id="2019" num="28" />
-<cdparam x="842" y="127" />
+<cdparam x="842" y="562" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4567,7 +4567,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2018" >
<father id="2019" num="29" />
-<cdparam x="842" y="110" />
+<cdparam x="842" 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="468" />
@@ -4587,7 +4587,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="2021" >
<father id="2080" num="0" />
-<cdparam x="309" y="104" />
+<cdparam x="309" y="110" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4596,7 +4596,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2023" >
<father id="2080" num="1" />
-<cdparam x="309" y="562" />
+<cdparam x="309" y="127" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4605,7 +4605,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2025" >
<father id="2080" num="2" />
-<cdparam x="309" y="560" />
+<cdparam x="309" y="144" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4614,7 +4614,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2027" >
<father id="2080" num="3" />
-<cdparam x="309" y="544" />
+<cdparam x="309" y="160" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4623,7 +4623,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2029" >
<father id="2080" num="4" />
-<cdparam x="309" y="527" />
+<cdparam x="309" y="177" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4632,7 +4632,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2031" >
<father id="2080" num="5" />
-<cdparam x="309" y="510" />
+<cdparam x="309" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4641,7 +4641,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2033" >
<father id="2080" num="6" />
-<cdparam x="309" y="494" />
+<cdparam x="309" y="210" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4650,7 +4650,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2035" >
<father id="2080" num="7" />
-<cdparam x="309" y="477" />
+<cdparam x="309" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4659,7 +4659,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2037" >
<father id="2080" num="8" />
-<cdparam x="309" y="460" />
+<cdparam x="309" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4668,7 +4668,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2039" >
<father id="2080" num="9" />
-<cdparam x="309" y="444" />
+<cdparam x="309" y="256" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4677,7 +4677,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2041" >
<father id="2080" num="10" />
-<cdparam x="309" y="427" />
+<cdparam x="309" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4686,7 +4686,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2043" >
<father id="2080" num="11" />
-<cdparam x="309" y="410" />
+<cdparam x="309" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4695,7 +4695,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2045" >
<father id="2080" num="12" />
-<cdparam x="309" y="394" />
+<cdparam x="309" y="310" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4704,7 +4704,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2047" >
<father id="2080" num="13" />
-<cdparam x="309" y="377" />
+<cdparam x="309" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4713,7 +4713,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2049" >
<father id="2080" num="14" />
-<cdparam x="309" y="360" />
+<cdparam x="309" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4722,7 +4722,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2051" >
<father id="2080" num="15" />
-<cdparam x="309" y="344" />
+<cdparam x="309" y="360" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4731,7 +4731,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2053" >
<father id="2080" num="16" />
-<cdparam x="309" y="327" />
+<cdparam x="309" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4740,7 +4740,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2055" >
<father id="2080" num="17" />
-<cdparam x="309" y="310" />
+<cdparam x="309" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4749,7 +4749,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2057" >
<father id="2080" num="18" />
-<cdparam x="309" y="294" />
+<cdparam x="309" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4758,7 +4758,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2059" >
<father id="2080" num="19" />
-<cdparam x="309" y="277" />
+<cdparam x="309" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4767,7 +4767,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2061" >
<father id="2080" num="20" />
-<cdparam x="309" y="256" />
+<cdparam x="309" y="444" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4776,7 +4776,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2063" >
<father id="2080" num="21" />
-<cdparam x="309" y="244" />
+<cdparam x="309" y="460" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4785,7 +4785,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2065" >
<father id="2080" num="22" />
-<cdparam x="309" y="227" />
+<cdparam x="309" y="477" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4794,7 +4794,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2067" >
<father id="2080" num="23" />
-<cdparam x="309" y="210" />
+<cdparam x="309" y="494" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4803,7 +4803,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2069" >
<father id="2080" num="24" />
-<cdparam x="309" y="194" />
+<cdparam x="309" y="510" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4812,7 +4812,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2071" >
<father id="2080" num="25" />
-<cdparam x="309" y="177" />
+<cdparam x="309" y="527" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4821,7 +4821,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2073" >
<father id="2080" num="26" />
-<cdparam x="309" y="160" />
+<cdparam x="309" y="544" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4830,7 +4830,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2075" >
<father id="2080" num="27" />
-<cdparam x="309" y="144" />
+<cdparam x="309" y="560" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4839,7 +4839,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2077" >
<father id="2080" num="28" />
-<cdparam x="309" y="127" />
+<cdparam x="309" y="562" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4848,7 +4848,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2079" >
<father id="2080" num="29" />
-<cdparam x="309" y="110" />
+<cdparam x="309" y="104" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4868,7 +4868,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="2082" >
<father id="2141" num="0" />
-<cdparam x="131" y="104" />
+<cdparam x="131" y="110" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4877,7 +4877,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2084" >
<father id="2141" num="1" />
-<cdparam x="131" y="562" />
+<cdparam x="131" y="127" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4886,7 +4886,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2086" >
<father id="2141" num="2" />
-<cdparam x="131" y="560" />
+<cdparam x="131" y="144" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4895,7 +4895,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2088" >
<father id="2141" num="3" />
-<cdparam x="131" y="544" />
+<cdparam x="131" y="160" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4904,7 +4904,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2090" >
<father id="2141" num="4" />
-<cdparam x="131" y="527" />
+<cdparam x="131" y="177" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4913,7 +4913,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2092" >
<father id="2141" num="5" />
-<cdparam x="131" y="510" />
+<cdparam x="131" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4922,7 +4922,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2094" >
<father id="2141" num="6" />
-<cdparam x="131" y="494" />
+<cdparam x="131" y="210" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4931,7 +4931,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2096" >
<father id="2141" num="7" />
-<cdparam x="131" y="477" />
+<cdparam x="131" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4940,7 +4940,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2098" >
<father id="2141" num="8" />
-<cdparam x="131" y="460" />
+<cdparam x="131" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4949,7 +4949,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2100" >
<father id="2141" num="9" />
-<cdparam x="131" y="444" />
+<cdparam x="131" y="260" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4958,7 +4958,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2102" >
<father id="2141" num="10" />
-<cdparam x="131" y="427" />
+<cdparam x="131" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4967,7 +4967,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2104" >
<father id="2141" num="11" />
-<cdparam x="131" y="410" />
+<cdparam x="131" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4976,7 +4976,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2106" >
<father id="2141" num="12" />
-<cdparam x="131" y="394" />
+<cdparam x="131" y="310" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4985,7 +4985,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2108" >
<father id="2141" num="13" />
-<cdparam x="131" y="377" />
+<cdparam x="131" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -4994,7 +4994,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2110" >
<father id="2141" num="14" />
-<cdparam x="131" y="360" />
+<cdparam x="131" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5003,7 +5003,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2112" >
<father id="2141" num="15" />
-<cdparam x="131" y="344" />
+<cdparam x="131" y="360" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5012,7 +5012,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2114" >
<father id="2141" num="16" />
-<cdparam x="131" y="327" />
+<cdparam x="131" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5021,7 +5021,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2116" >
<father id="2141" num="17" />
-<cdparam x="131" y="310" />
+<cdparam x="131" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5030,7 +5030,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2118" >
<father id="2141" num="18" />
-<cdparam x="131" y="294" />
+<cdparam x="131" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5039,7 +5039,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2120" >
<father id="2141" num="19" />
-<cdparam x="131" y="277" />
+<cdparam x="131" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5048,7 +5048,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2122" >
<father id="2141" num="20" />
-<cdparam x="131" y="260" />
+<cdparam x="131" y="444" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5057,7 +5057,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2124" >
<father id="2141" num="21" />
-<cdparam x="131" y="244" />
+<cdparam x="131" y="460" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5066,7 +5066,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2126" >
<father id="2141" num="22" />
-<cdparam x="131" y="227" />
+<cdparam x="131" y="477" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5075,7 +5075,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2128" >
<father id="2141" num="23" />
-<cdparam x="131" y="210" />
+<cdparam x="131" y="494" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5084,7 +5084,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2130" >
<father id="2141" num="24" />
-<cdparam x="131" y="194" />
+<cdparam x="131" y="510" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5093,7 +5093,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2132" >
<father id="2141" num="25" />
-<cdparam x="131" y="177" />
+<cdparam x="131" y="527" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5102,7 +5102,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2134" >
<father id="2141" num="26" />
-<cdparam x="131" y="160" />
+<cdparam x="131" y="544" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5111,7 +5111,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2136" >
<father id="2141" num="27" />
-<cdparam x="131" y="144" />
+<cdparam x="131" y="560" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5120,7 +5120,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2138" >
<father id="2141" num="28" />
-<cdparam x="131" y="127" />
+<cdparam x="131" y="562" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5129,7 +5129,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2140" >
<father id="2141" num="29" />
-<cdparam x="131" y="110" />
+<cdparam x="131" y="104" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="468" />
@@ -5141,24 +5141,24 @@
<cdparam x="309" y="417" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="start" />
-<P1 x="309" y="417" id="2042" />
-<P2 x="516" y="417" id="1887" />
+<P1 x="309" y="417" id="2056" />
+<P2 x="516" y="417" id="1920" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2143" >
<cdparam x="131" y="401" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="131" y="401" id="2105" />
-<P2 x="309" y="401" id="2044" />
+<P1 x="131" y="401" id="2115" />
+<P2 x="309" y="401" id="2054" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="136" id="2144" >
<cdparam x="486" y="342" />
<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="342" id="1939" />
-<P2 x="486" y="292" id="1929" />
+<P1 x="486" y="342" id="1860" />
+<P2 x="486" y="292" id="1870" />
<AutomaticDrawing data="true" />
<extraparam>
<Interval minConstraint="1" maxConstraint="1" />
@@ -5168,48 +5168,48 @@
<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="842" y="268" id="1999" />
+<P1 x="516" y="268" id="1938" />
+<P2 x="842" y="268" id="1977" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2146" >
<cdparam x="309" y="251" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="start" />
-<P1 x="309" y="251" id="2062" />
-<P2 x="516" y="251" id="1867" />
+<P1 x="309" y="251" id="2036" />
+<P2 x="516" y="251" id="1940" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2147" >
<cdparam x="131" y="234" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="131" y="234" id="2125" />
-<P2 x="309" y="234" id="2064" />
+<P1 x="131" y="234" id="2095" />
+<P2 x="309" y="234" id="2034" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2148" >
<cdparam x="131" y="201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(18)" />
-<P1 x="131" y="201" id="2129" />
-<P2 x="309" y="201" id="2068" />
+<P1 x="131" y="201" id="2091" />
+<P2 x="309" y="201" id="2030" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2149" >
<cdparam x="131" y="167" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure19" />
-<P1 x="131" y="167" id="2133" />
-<P2 x="309" y="167" id="2072" />
+<P1 x="131" y="167" id="2087" />
+<P2 x="309" y="167" id="2026" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2150" >
<cdparam x="131" y="134" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(19)" />
-<P1 x="131" y="134" id="2137" />
-<P2 x="309" y="134" id="2076" />
+<P1 x="131" y="134" id="2083" />
+<P2 x="309" y="134" id="2022" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -7035,7 +7035,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="2986" >
<father id="3045" num="0" />
-<cdparam x="606" y="112" />
+<cdparam x="606" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7044,7 +7044,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2988" >
<father id="3045" num="1" />
-<cdparam x="606" y="129" />
+<cdparam x="606" y="571" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7053,7 +7053,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2990" >
<father id="3045" num="2" />
-<cdparam x="606" y="146" />
+<cdparam x="606" y="562" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7062,7 +7062,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2992" >
<father id="3045" num="3" />
-<cdparam x="606" y="162" />
+<cdparam x="606" y="546" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7071,7 +7071,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2994" >
<father id="3045" num="4" />
-<cdparam x="606" y="179" />
+<cdparam x="606" y="529" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7080,7 +7080,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2996" >
<father id="3045" num="5" />
-<cdparam x="606" y="196" />
+<cdparam x="606" y="512" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7089,7 +7089,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2998" >
<father id="3045" num="6" />
-<cdparam x="606" y="212" />
+<cdparam x="606" y="496" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7098,7 +7098,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3000" >
<father id="3045" num="7" />
-<cdparam x="606" y="229" />
+<cdparam x="606" y="479" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7107,7 +7107,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3002" >
<father id="3045" num="8" />
-<cdparam x="606" y="246" />
+<cdparam x="606" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7116,7 +7116,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3004" >
<father id="3045" num="9" />
-<cdparam x="606" y="262" />
+<cdparam x="606" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7125,7 +7125,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3006" >
<father id="3045" num="10" />
-<cdparam x="606" y="279" />
+<cdparam x="606" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7134,7 +7134,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3008" >
<father id="3045" num="11" />
-<cdparam x="606" y="296" />
+<cdparam x="606" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7143,7 +7143,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3010" >
<father id="3045" num="12" />
-<cdparam x="606" y="312" />
+<cdparam x="606" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7152,7 +7152,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3012" >
<father id="3045" num="13" />
-<cdparam x="606" y="329" />
+<cdparam x="606" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7161,7 +7161,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3014" >
<father id="3045" num="14" />
-<cdparam x="606" y="346" />
+<cdparam x="606" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7170,7 +7170,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3016" >
<father id="3045" num="15" />
-<cdparam x="606" y="362" />
+<cdparam x="606" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7179,7 +7179,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3018" >
<father id="3045" num="16" />
-<cdparam x="606" y="379" />
+<cdparam x="606" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7188,7 +7188,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3020" >
<father id="3045" num="17" />
-<cdparam x="606" y="396" />
+<cdparam x="606" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7197,7 +7197,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3022" >
<father id="3045" num="18" />
-<cdparam x="606" y="412" />
+<cdparam x="606" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7206,7 +7206,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3024" >
<father id="3045" num="19" />
-<cdparam x="606" y="429" />
+<cdparam x="606" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7215,7 +7215,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3026" >
<father id="3045" num="20" />
-<cdparam x="606" y="446" />
+<cdparam x="606" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7224,7 +7224,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3028" >
<father id="3045" num="21" />
-<cdparam x="606" y="462" />
+<cdparam x="606" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7233,7 +7233,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3030" >
<father id="3045" num="22" />
-<cdparam x="606" y="479" />
+<cdparam x="606" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7242,7 +7242,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3032" >
<father id="3045" num="23" />
-<cdparam x="606" y="496" />
+<cdparam x="606" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7251,7 +7251,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3034" >
<father id="3045" num="24" />
-<cdparam x="606" y="512" />
+<cdparam x="606" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7260,7 +7260,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3036" >
<father id="3045" num="25" />
-<cdparam x="606" y="529" />
+<cdparam x="606" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7269,7 +7269,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3038" >
<father id="3045" num="26" />
-<cdparam x="606" y="546" />
+<cdparam x="606" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7278,7 +7278,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3040" >
<father id="3045" num="27" />
-<cdparam x="606" y="562" />
+<cdparam x="606" y="146" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7287,7 +7287,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3042" >
<father id="3045" num="28" />
-<cdparam x="606" y="571" />
+<cdparam x="606" y="129" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7296,7 +7296,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3044" >
<father id="3045" num="29" />
-<cdparam x="606" y="106" />
+<cdparam x="606" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7316,7 +7316,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3047" >
<father id="3106" num="0" />
-<cdparam x="456" y="112" />
+<cdparam x="456" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7325,7 +7325,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3049" >
<father id="3106" num="1" />
-<cdparam x="456" y="129" />
+<cdparam x="456" y="571" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7334,7 +7334,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3051" >
<father id="3106" num="2" />
-<cdparam x="456" y="146" />
+<cdparam x="456" y="562" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7343,7 +7343,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3053" >
<father id="3106" num="3" />
-<cdparam x="456" y="162" />
+<cdparam x="456" y="546" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7352,7 +7352,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3055" >
<father id="3106" num="4" />
-<cdparam x="456" y="179" />
+<cdparam x="456" y="529" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7361,7 +7361,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3057" >
<father id="3106" num="5" />
-<cdparam x="456" y="196" />
+<cdparam x="456" y="512" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7370,7 +7370,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3059" >
<father id="3106" num="6" />
-<cdparam x="456" y="212" />
+<cdparam x="456" y="496" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7379,7 +7379,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3061" >
<father id="3106" num="7" />
-<cdparam x="456" y="229" />
+<cdparam x="456" y="479" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7388,7 +7388,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3063" >
<father id="3106" num="8" />
-<cdparam x="456" y="246" />
+<cdparam x="456" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7397,7 +7397,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3065" >
<father id="3106" num="9" />
-<cdparam x="456" y="262" />
+<cdparam x="456" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7406,7 +7406,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3067" >
<father id="3106" num="10" />
-<cdparam x="456" y="279" />
+<cdparam x="456" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7415,7 +7415,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3069" >
<father id="3106" num="11" />
-<cdparam x="456" y="296" />
+<cdparam x="456" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7424,7 +7424,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3071" >
<father id="3106" num="12" />
-<cdparam x="456" y="312" />
+<cdparam x="456" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7433,7 +7433,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3073" >
<father id="3106" num="13" />
-<cdparam x="456" y="329" />
+<cdparam x="456" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7442,7 +7442,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3075" >
<father id="3106" num="14" />
-<cdparam x="456" y="346" />
+<cdparam x="456" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7451,7 +7451,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3077" >
<father id="3106" num="15" />
-<cdparam x="456" y="362" />
+<cdparam x="456" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7460,7 +7460,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3079" >
<father id="3106" num="16" />
-<cdparam x="456" y="379" />
+<cdparam x="456" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7469,7 +7469,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3081" >
<father id="3106" num="17" />
-<cdparam x="456" y="396" />
+<cdparam x="456" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7478,7 +7478,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3083" >
<father id="3106" num="18" />
-<cdparam x="456" y="412" />
+<cdparam x="456" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7487,7 +7487,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3085" >
<father id="3106" num="19" />
-<cdparam x="456" y="429" />
+<cdparam x="456" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7496,7 +7496,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3087" >
<father id="3106" num="20" />
-<cdparam x="456" y="446" />
+<cdparam x="456" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7505,7 +7505,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3089" >
<father id="3106" num="21" />
-<cdparam x="456" y="462" />
+<cdparam x="456" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7514,7 +7514,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3091" >
<father id="3106" num="22" />
-<cdparam x="456" y="479" />
+<cdparam x="456" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7523,7 +7523,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3093" >
<father id="3106" num="23" />
-<cdparam x="456" y="496" />
+<cdparam x="456" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7532,7 +7532,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3095" >
<father id="3106" num="24" />
-<cdparam x="456" y="512" />
+<cdparam x="456" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7541,7 +7541,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3097" >
<father id="3106" num="25" />
-<cdparam x="456" y="529" />
+<cdparam x="456" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7550,7 +7550,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3099" >
<father id="3106" num="26" />
-<cdparam x="456" y="546" />
+<cdparam x="456" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7559,7 +7559,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3101" >
<father id="3106" num="27" />
-<cdparam x="456" y="562" />
+<cdparam x="456" y="146" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7568,7 +7568,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3103" >
<father id="3106" num="28" />
-<cdparam x="456" y="571" />
+<cdparam x="456" y="129" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7577,7 +7577,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3105" >
<father id="3106" num="29" />
-<cdparam x="456" y="106" />
+<cdparam x="456" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7597,306 +7597,306 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3108" >
<father id="3185" num="0" />
-<cdparam x="306" y="112" />
+<cdparam x="306" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="3107" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3110" >
+<SUBCOMPONENT type="627" id="3117" >
<father id="3185" num="1" />
-<cdparam x="306" y="129" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="319" y="391" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
-<infoparam name="port" value="port" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
+<infoparam name="timer expiration" value="{timer=timerAlarm}" />
<TGConnectingPoint num="0" id="3109" />
+<TGConnectingPoint num="1" id="3110" />
+<TGConnectingPoint num="2" id="3111" />
+<TGConnectingPoint num="3" id="3112" />
+<TGConnectingPoint num="4" id="3113" />
+<TGConnectingPoint num="5" id="3114" />
+<TGConnectingPoint num="6" id="3115" />
+<TGConnectingPoint num="7" id="3116" />
+<extraparam>
+<Interval timer="timerAlarm" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3112" >
+<SUBCOMPONENT type="625" id="3126" >
<father id="3185" num="2" />
-<cdparam x="306" y="146" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="319" y="296" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3111" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
+<TGConnectingPoint num="0" id="3118" />
+<TGConnectingPoint num="1" id="3119" />
+<TGConnectingPoint num="2" id="3120" />
+<TGConnectingPoint num="3" id="3121" />
+<TGConnectingPoint num="4" id="3122" />
+<TGConnectingPoint num="5" id="3123" />
+<TGConnectingPoint num="6" id="3124" />
+<TGConnectingPoint num="7" id="3125" />
+<extraparam>
+<Interval timer="timerAlarm" duration="60" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3114" >
+<SUBCOMPONENT type="630" id="3128" >
<father id="3185" num="3" />
-<cdparam x="306" y="162" />
+<cdparam x="306" y="571" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3113" />
+<TGConnectingPoint num="0" id="3127" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3116" >
+<SUBCOMPONENT type="630" id="3130" >
<father id="3185" num="4" />
-<cdparam x="306" y="179" />
+<cdparam x="306" y="562" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3115" />
+<TGConnectingPoint num="0" id="3129" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3118" >
+<SUBCOMPONENT type="630" id="3132" >
<father id="3185" num="5" />
-<cdparam x="306" y="196" />
+<cdparam x="306" y="546" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3117" />
+<TGConnectingPoint num="0" id="3131" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3120" >
+<SUBCOMPONENT type="630" id="3134" >
<father id="3185" num="6" />
-<cdparam x="306" y="212" />
+<cdparam x="306" y="529" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3119" />
+<TGConnectingPoint num="0" id="3133" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3122" >
+<SUBCOMPONENT type="630" id="3136" >
<father id="3185" num="7" />
-<cdparam x="306" y="229" />
+<cdparam x="306" y="512" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3121" />
+<TGConnectingPoint num="0" id="3135" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3124" >
+<SUBCOMPONENT type="630" id="3138" >
<father id="3185" num="8" />
-<cdparam x="306" y="246" />
+<cdparam x="306" y="496" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3123" />
+<TGConnectingPoint num="0" id="3137" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3126" >
+<SUBCOMPONENT type="630" id="3140" >
<father id="3185" num="9" />
-<cdparam x="306" y="262" />
+<cdparam x="306" y="479" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3125" />
+<TGConnectingPoint num="0" id="3139" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3128" >
+<SUBCOMPONENT type="630" id="3142" >
<father id="3185" num="10" />
-<cdparam x="306" y="279" />
+<cdparam x="306" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3127" />
+<TGConnectingPoint num="0" id="3141" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3130" >
+<SUBCOMPONENT type="630" id="3144" >
<father id="3185" num="11" />
-<cdparam x="306" y="296" />
+<cdparam x="306" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3129" />
+<TGConnectingPoint num="0" id="3143" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3132" >
+<SUBCOMPONENT type="630" id="3146" >
<father id="3185" num="12" />
-<cdparam x="306" y="312" />
+<cdparam x="306" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3131" />
+<TGConnectingPoint num="0" id="3145" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3134" >
+<SUBCOMPONENT type="630" id="3148" >
<father id="3185" num="13" />
-<cdparam x="306" y="329" />
+<cdparam x="306" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3133" />
+<TGConnectingPoint num="0" id="3147" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3136" >
+<SUBCOMPONENT type="630" id="3150" >
<father id="3185" num="14" />
-<cdparam x="306" y="346" />
+<cdparam x="306" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3135" />
+<TGConnectingPoint num="0" id="3149" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3138" >
+<SUBCOMPONENT type="630" id="3152" >
<father id="3185" num="15" />
-<cdparam x="306" y="362" />
+<cdparam x="306" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3137" />
+<TGConnectingPoint num="0" id="3151" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3140" >
+<SUBCOMPONENT type="630" id="3154" >
<father id="3185" num="16" />
-<cdparam x="306" y="379" />
+<cdparam x="306" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3139" />
+<TGConnectingPoint num="0" id="3153" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3142" >
+<SUBCOMPONENT type="630" id="3156" >
<father id="3185" num="17" />
-<cdparam x="306" y="396" />
+<cdparam x="306" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3141" />
+<TGConnectingPoint num="0" id="3155" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3144" >
+<SUBCOMPONENT type="630" id="3158" >
<father id="3185" num="18" />
-<cdparam x="306" y="412" />
+<cdparam x="306" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3143" />
+<TGConnectingPoint num="0" id="3157" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3146" >
+<SUBCOMPONENT type="630" id="3160" >
<father id="3185" num="19" />
-<cdparam x="306" y="429" />
+<cdparam x="306" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3145" />
+<TGConnectingPoint num="0" id="3159" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3148" >
+<SUBCOMPONENT type="630" id="3162" >
<father id="3185" num="20" />
-<cdparam x="306" y="446" />
+<cdparam x="306" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3147" />
+<TGConnectingPoint num="0" id="3161" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3150" >
+<SUBCOMPONENT type="630" id="3164" >
<father id="3185" num="21" />
-<cdparam x="306" y="462" />
+<cdparam x="306" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3149" />
+<TGConnectingPoint num="0" id="3163" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3152" >
+<SUBCOMPONENT type="630" id="3166" >
<father id="3185" num="22" />
-<cdparam x="306" y="479" />
+<cdparam x="306" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3151" />
+<TGConnectingPoint num="0" id="3165" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3154" >
+<SUBCOMPONENT type="630" id="3168" >
<father id="3185" num="23" />
-<cdparam x="306" y="496" />
+<cdparam x="306" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3153" />
+<TGConnectingPoint num="0" id="3167" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3156" >
+<SUBCOMPONENT type="630" id="3170" >
<father id="3185" num="24" />
-<cdparam x="306" y="512" />
+<cdparam x="306" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3155" />
+<TGConnectingPoint num="0" id="3169" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3158" >
+<SUBCOMPONENT type="630" id="3172" >
<father id="3185" num="25" />
-<cdparam x="306" y="529" />
+<cdparam x="306" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3157" />
+<TGConnectingPoint num="0" id="3171" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3160" >
+<SUBCOMPONENT type="630" id="3174" >
<father id="3185" num="26" />
-<cdparam x="306" y="546" />
+<cdparam x="306" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3159" />
+<TGConnectingPoint num="0" id="3173" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3162" >
+<SUBCOMPONENT type="630" id="3176" >
<father id="3185" num="27" />
-<cdparam x="306" y="562" />
+<cdparam x="306" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3161" />
+<TGConnectingPoint num="0" id="3175" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3164" >
+<SUBCOMPONENT type="630" id="3178" >
<father id="3185" num="28" />
-<cdparam x="306" y="571" />
+<cdparam x="306" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3163" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="625" id="3173" >
-<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" />
-<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
-<TGConnectingPoint num="0" id="3165" />
-<TGConnectingPoint num="1" id="3166" />
-<TGConnectingPoint num="2" id="3167" />
-<TGConnectingPoint num="3" id="3168" />
-<TGConnectingPoint num="4" id="3169" />
-<TGConnectingPoint num="5" id="3170" />
-<TGConnectingPoint num="6" id="3171" />
-<TGConnectingPoint num="7" id="3172" />
-<extraparam>
-<Interval timer="timerAlarm" duration="60" />
-</extraparam>
+<TGConnectingPoint num="0" id="3177" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="3182" >
+<SUBCOMPONENT type="630" id="3180" >
+<father id="3185" num="29" />
+<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="5" maxX="5" minY="10" maxY="475" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="3179" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="3182" >
<father id="3185" num="30" />
-<cdparam x="319" y="391" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="306" y="129" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="timer expiration" value="{timer=timerAlarm}" />
-<TGConnectingPoint num="0" id="3174" />
-<TGConnectingPoint num="1" id="3175" />
-<TGConnectingPoint num="2" id="3176" />
-<TGConnectingPoint num="3" id="3177" />
-<TGConnectingPoint num="4" id="3178" />
-<TGConnectingPoint num="5" id="3179" />
-<TGConnectingPoint num="6" id="3180" />
-<TGConnectingPoint num="7" id="3181" />
-<extraparam>
-<Interval timer="timerAlarm" />
-</extraparam>
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="3181" />
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3184" >
<father id="3185" num="31" />
-<cdparam x="306" y="106" />
+<cdparam x="306" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7916,7 +7916,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3187" >
<father id="3246" num="0" />
-<cdparam x="156" y="112" />
+<cdparam x="156" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7925,7 +7925,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3189" >
<father id="3246" num="1" />
-<cdparam x="156" y="129" />
+<cdparam x="156" y="571" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7934,7 +7934,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3191" >
<father id="3246" num="2" />
-<cdparam x="156" y="146" />
+<cdparam x="156" y="562" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7943,7 +7943,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3193" >
<father id="3246" num="3" />
-<cdparam x="156" y="162" />
+<cdparam x="156" y="546" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7952,7 +7952,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3195" >
<father id="3246" num="4" />
-<cdparam x="156" y="179" />
+<cdparam x="156" y="529" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7961,7 +7961,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3197" >
<father id="3246" num="5" />
-<cdparam x="156" y="196" />
+<cdparam x="156" y="512" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7970,7 +7970,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3199" >
<father id="3246" num="6" />
-<cdparam x="156" y="212" />
+<cdparam x="156" y="496" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7979,7 +7979,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3201" >
<father id="3246" num="7" />
-<cdparam x="156" y="229" />
+<cdparam x="156" y="479" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7988,7 +7988,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3203" >
<father id="3246" num="8" />
-<cdparam x="156" y="246" />
+<cdparam x="156" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -7997,7 +7997,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3205" >
<father id="3246" num="9" />
-<cdparam x="156" y="262" />
+<cdparam x="156" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8006,7 +8006,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3207" >
<father id="3246" num="10" />
-<cdparam x="156" y="279" />
+<cdparam x="156" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8015,7 +8015,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3209" >
<father id="3246" num="11" />
-<cdparam x="156" y="296" />
+<cdparam x="156" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8024,7 +8024,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3211" >
<father id="3246" num="12" />
-<cdparam x="156" y="312" />
+<cdparam x="156" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8033,7 +8033,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3213" >
<father id="3246" num="13" />
-<cdparam x="156" y="329" />
+<cdparam x="156" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8042,7 +8042,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3215" >
<father id="3246" num="14" />
-<cdparam x="156" y="346" />
+<cdparam x="156" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8051,7 +8051,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3217" >
<father id="3246" num="15" />
-<cdparam x="156" y="362" />
+<cdparam x="156" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8060,7 +8060,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3219" >
<father id="3246" num="16" />
-<cdparam x="156" y="379" />
+<cdparam x="156" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8069,7 +8069,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3221" >
<father id="3246" num="17" />
-<cdparam x="156" y="396" />
+<cdparam x="156" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8078,7 +8078,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3223" >
<father id="3246" num="18" />
-<cdparam x="156" y="412" />
+<cdparam x="156" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8087,7 +8087,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3225" >
<father id="3246" num="19" />
-<cdparam x="156" y="429" />
+<cdparam x="156" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8096,7 +8096,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3227" >
<father id="3246" num="20" />
-<cdparam x="156" y="446" />
+<cdparam x="156" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8105,7 +8105,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3229" >
<father id="3246" num="21" />
-<cdparam x="156" y="462" />
+<cdparam x="156" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8114,7 +8114,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3231" >
<father id="3246" num="22" />
-<cdparam x="156" y="479" />
+<cdparam x="156" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8123,7 +8123,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3233" >
<father id="3246" num="23" />
-<cdparam x="156" y="496" />
+<cdparam x="156" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8132,7 +8132,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3235" >
<father id="3246" num="24" />
-<cdparam x="156" y="512" />
+<cdparam x="156" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8141,7 +8141,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3237" >
<father id="3246" num="25" />
-<cdparam x="156" y="529" />
+<cdparam x="156" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8150,7 +8150,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3239" >
<father id="3246" num="26" />
-<cdparam x="156" y="546" />
+<cdparam x="156" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8159,7 +8159,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3241" >
<father id="3246" num="27" />
-<cdparam x="156" y="562" />
+<cdparam x="156" y="146" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8168,7 +8168,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3243" >
<father id="3246" num="28" />
-<cdparam x="156" y="571" />
+<cdparam x="156" y="129" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8177,7 +8177,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3245" >
<father id="3246" num="29" />
-<cdparam x="156" y="106" />
+<cdparam x="156" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8189,48 +8189,48 @@
<cdparam x="306" y="486" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(16)" />
-<P1 x="306" y="486" id="3151" />
-<P2 x="456" y="486" id="3090" />
+<P1 x="306" y="486" id="3139" />
+<P2 x="456" y="486" id="3060" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3248" >
<cdparam x="306" y="253" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(21)" />
-<P1 x="306" y="253" id="3123" />
-<P2 x="456" y="253" id="3062" />
+<P1 x="306" y="253" id="3167" />
+<P2 x="456" y="253" id="3088" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3249" >
<cdparam x="306" y="219" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(18)" />
-<P1 x="306" y="219" id="3119" />
-<P2 x="456" y="219" id="3058" />
+<P1 x="306" y="219" id="3171" />
+<P2 x="456" y="219" id="3092" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3250" >
<cdparam x="306" y="186" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(19)" />
-<P1 x="306" y="186" id="3115" />
-<P2 x="456" y="186" id="3054" />
+<P1 x="306" y="186" id="3175" />
+<P2 x="456" y="186" id="3096" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3251" >
<cdparam x="306" y="153" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(19)" />
-<P1 x="306" y="153" id="3111" />
-<P2 x="456" y="153" id="3050" />
+<P1 x="306" y="153" id="3179" />
+<P2 x="456" y="153" id="3100" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3252" >
<cdparam x="156" y="469" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(16)" />
-<P1 x="156" y="469" id="3228" />
-<P2 x="306" y="469" id="3149" />
+<P1 x="156" y="469" id="3202" />
+<P2 x="306" y="469" id="3141" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3253" >
@@ -8238,47 +8238,47 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="stopAlarm" />
<P1 x="306" y="436" id="3145" />
-<P2 x="606" y="436" id="3023" />
+<P2 x="606" y="436" id="3005" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3254" >
<cdparam x="306" y="269" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="startAlarm" />
-<P1 x="306" y="269" id="3125" />
-<P2 x="606" y="269" id="3003" />
+<P1 x="306" y="269" id="3165" />
+<P2 x="606" y="269" id="3025" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3255" >
<cdparam x="156" y="236" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="156" y="236" id="3200" />
-<P2 x="306" y="236" id="3121" />
+<P1 x="156" y="236" id="3230" />
+<P2 x="306" y="236" id="3169" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3256" >
<cdparam x="156" y="203" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(18)" />
-<P1 x="156" y="203" id="3196" />
-<P2 x="306" y="203" id="3117" />
+<P1 x="156" y="203" id="3234" />
+<P2 x="306" y="203" id="3173" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3257" >
<cdparam x="156" y="169" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure19" />
-<P1 x="156" y="169" id="3192" />
-<P2 x="306" y="169" id="3113" />
+<P1 x="156" y="169" id="3238" />
+<P2 x="306" y="169" id="3177" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3258" >
<cdparam x="156" y="136" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(19)" />
-<P1 x="156" y="136" id="3188" />
-<P2 x="306" y="136" id="3109" />
+<P1 x="156" y="136" id="3242" />
+<P2 x="306" y="136" id="3181" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -8297,7 +8297,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3260" >
<father id="3319" num="0" />
-<cdparam x="589" y="97" />
+<cdparam x="589" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8306,7 +8306,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3262" >
<father id="3319" num="1" />
-<cdparam x="589" y="91" />
+<cdparam x="589" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8315,7 +8315,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3264" >
<father id="3319" num="2" />
-<cdparam x="589" y="556" />
+<cdparam x="589" y="147" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8324,7 +8324,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3266" >
<father id="3319" num="3" />
-<cdparam x="589" y="547" />
+<cdparam x="589" y="164" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8333,7 +8333,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3268" >
<father id="3319" num="4" />
-<cdparam x="589" y="531" />
+<cdparam x="589" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8342,7 +8342,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3270" >
<father id="3319" num="5" />
-<cdparam x="589" y="514" />
+<cdparam x="589" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8351,7 +8351,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3272" >
<father id="3319" num="6" />
-<cdparam x="589" y="497" />
+<cdparam x="589" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8360,7 +8360,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3274" >
<father id="3319" num="7" />
-<cdparam x="589" y="481" />
+<cdparam x="589" y="231" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8369,7 +8369,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3276" >
<father id="3319" num="8" />
-<cdparam x="589" y="464" />
+<cdparam x="589" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8378,7 +8378,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3278" >
<father id="3319" num="9" />
-<cdparam x="589" y="447" />
+<cdparam x="589" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8387,7 +8387,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3280" >
<father id="3319" num="10" />
-<cdparam x="589" y="431" />
+<cdparam x="589" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8396,7 +8396,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3282" >
<father id="3319" num="11" />
-<cdparam x="589" y="414" />
+<cdparam x="589" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8405,7 +8405,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3284" >
<father id="3319" num="12" />
-<cdparam x="589" y="397" />
+<cdparam x="589" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8414,7 +8414,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3286" >
<father id="3319" num="13" />
-<cdparam x="589" y="381" />
+<cdparam x="589" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8423,7 +8423,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3288" >
<father id="3319" num="14" />
-<cdparam x="589" y="364" />
+<cdparam x="589" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8432,7 +8432,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3290" >
<father id="3319" num="15" />
-<cdparam x="589" y="347" />
+<cdparam x="589" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8441,7 +8441,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3292" >
<father id="3319" num="16" />
-<cdparam x="589" y="331" />
+<cdparam x="589" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8450,7 +8450,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3294" >
<father id="3319" num="17" />
-<cdparam x="589" y="314" />
+<cdparam x="589" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8459,7 +8459,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3296" >
<father id="3319" num="18" />
-<cdparam x="589" y="297" />
+<cdparam x="589" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8468,7 +8468,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3298" >
<father id="3319" num="19" />
-<cdparam x="589" y="281" />
+<cdparam x="589" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8477,7 +8477,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3300" >
<father id="3319" num="20" />
-<cdparam x="589" y="264" />
+<cdparam x="589" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8486,7 +8486,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3302" >
<father id="3319" num="21" />
-<cdparam x="589" y="247" />
+<cdparam x="589" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8495,7 +8495,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3304" >
<father id="3319" num="22" />
-<cdparam x="589" y="231" />
+<cdparam x="589" y="481" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8504,7 +8504,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3306" >
<father id="3319" num="23" />
-<cdparam x="589" y="214" />
+<cdparam x="589" y="497" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8513,7 +8513,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3308" >
<father id="3319" num="24" />
-<cdparam x="589" y="197" />
+<cdparam x="589" y="514" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8522,7 +8522,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3310" >
<father id="3319" num="25" />
-<cdparam x="589" y="181" />
+<cdparam x="589" y="531" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8531,7 +8531,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3312" >
<father id="3319" num="26" />
-<cdparam x="589" y="164" />
+<cdparam x="589" y="547" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8540,7 +8540,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3314" >
<father id="3319" num="27" />
-<cdparam x="589" y="147" />
+<cdparam x="589" y="556" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8549,7 +8549,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3316" >
<father id="3319" num="28" />
-<cdparam x="589" y="131" />
+<cdparam x="589" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8558,7 +8558,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3318" >
<father id="3319" num="29" />
-<cdparam x="589" y="114" />
+<cdparam x="589" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8578,7 +8578,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3321" >
<father id="3380" num="0" />
-<cdparam x="439" y="97" />
+<cdparam x="439" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8587,7 +8587,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3323" >
<father id="3380" num="1" />
-<cdparam x="439" y="91" />
+<cdparam x="439" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8596,7 +8596,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3325" >
<father id="3380" num="2" />
-<cdparam x="439" y="556" />
+<cdparam x="439" y="147" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8605,7 +8605,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3327" >
<father id="3380" num="3" />
-<cdparam x="439" y="547" />
+<cdparam x="439" y="164" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8614,7 +8614,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3329" >
<father id="3380" num="4" />
-<cdparam x="439" y="531" />
+<cdparam x="439" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8623,7 +8623,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3331" >
<father id="3380" num="5" />
-<cdparam x="439" y="514" />
+<cdparam x="439" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8632,7 +8632,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3333" >
<father id="3380" num="6" />
-<cdparam x="439" y="497" />
+<cdparam x="439" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8641,7 +8641,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3335" >
<father id="3380" num="7" />
-<cdparam x="439" y="481" />
+<cdparam x="439" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8650,7 +8650,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3337" >
<father id="3380" num="8" />
-<cdparam x="439" y="464" />
+<cdparam x="439" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8659,7 +8659,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3339" >
<father id="3380" num="9" />
-<cdparam x="439" y="447" />
+<cdparam x="439" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8668,7 +8668,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3341" >
<father id="3380" num="10" />
-<cdparam x="439" y="431" />
+<cdparam x="439" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8677,7 +8677,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3343" >
<father id="3380" num="11" />
-<cdparam x="439" y="414" />
+<cdparam x="439" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8686,7 +8686,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3345" >
<father id="3380" num="12" />
-<cdparam x="439" y="397" />
+<cdparam x="439" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8695,7 +8695,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3347" >
<father id="3380" num="13" />
-<cdparam x="439" y="381" />
+<cdparam x="439" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8704,7 +8704,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3349" >
<father id="3380" num="14" />
-<cdparam x="439" y="364" />
+<cdparam x="439" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8713,7 +8713,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3351" >
<father id="3380" num="15" />
-<cdparam x="439" y="347" />
+<cdparam x="439" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8722,7 +8722,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3353" >
<father id="3380" num="16" />
-<cdparam x="439" y="331" />
+<cdparam x="439" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8731,7 +8731,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3355" >
<father id="3380" num="17" />
-<cdparam x="439" y="314" />
+<cdparam x="439" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8740,7 +8740,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3357" >
<father id="3380" num="18" />
-<cdparam x="439" y="297" />
+<cdparam x="439" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8749,7 +8749,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3359" >
<father id="3380" num="19" />
-<cdparam x="439" y="281" />
+<cdparam x="439" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8758,7 +8758,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3361" >
<father id="3380" num="20" />
-<cdparam x="439" y="264" />
+<cdparam x="439" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8767,7 +8767,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3363" >
<father id="3380" num="21" />
-<cdparam x="439" y="247" />
+<cdparam x="439" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8776,7 +8776,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3365" >
<father id="3380" num="22" />
-<cdparam x="439" y="327" />
+<cdparam x="439" y="481" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8785,7 +8785,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3367" >
<father id="3380" num="23" />
-<cdparam x="439" y="214" />
+<cdparam x="439" y="497" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8794,7 +8794,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3369" >
<father id="3380" num="24" />
-<cdparam x="439" y="197" />
+<cdparam x="439" y="514" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8803,7 +8803,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3371" >
<father id="3380" num="25" />
-<cdparam x="439" y="181" />
+<cdparam x="439" y="531" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8812,7 +8812,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3373" >
<father id="3380" num="26" />
-<cdparam x="439" y="164" />
+<cdparam x="439" y="547" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8821,7 +8821,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3375" >
<father id="3380" num="27" />
-<cdparam x="439" y="147" />
+<cdparam x="439" y="556" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8830,7 +8830,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3377" >
<father id="3380" num="28" />
-<cdparam x="439" y="131" />
+<cdparam x="439" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8839,7 +8839,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3379" >
<father id="3380" num="29" />
-<cdparam x="439" y="114" />
+<cdparam x="439" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8859,7 +8859,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3382" >
<father id="3459" num="0" />
-<cdparam x="289" y="97" />
+<cdparam x="289" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -8868,288 +8868,288 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3384" >
<father id="3459" num="1" />
-<cdparam x="289" y="91" />
+<cdparam x="289" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="3383" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="3393" >
+<SUBCOMPONENT type="630" id="3386" >
<father id="3459" num="2" />
-<cdparam x="302" y="376" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="289" y="147" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="timer expiration" value="{timer=timerAlarm}" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
+<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="3385" />
-<TGConnectingPoint num="1" id="3386" />
-<TGConnectingPoint num="2" id="3387" />
-<TGConnectingPoint num="3" id="3388" />
-<TGConnectingPoint num="4" id="3389" />
-<TGConnectingPoint num="5" id="3390" />
-<TGConnectingPoint num="6" id="3391" />
-<TGConnectingPoint num="7" id="3392" />
-<extraparam>
-<Interval timer="timerAlarm" />
-</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="625" id="3402" >
+<SUBCOMPONENT type="630" id="3388" >
<father id="3459" num="3" />
-<cdparam x="302" y="281" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="289" y="164" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
-<TGConnectingPoint num="0" id="3394" />
-<TGConnectingPoint num="1" id="3395" />
-<TGConnectingPoint num="2" id="3396" />
-<TGConnectingPoint num="3" id="3397" />
-<TGConnectingPoint num="4" id="3398" />
-<TGConnectingPoint num="5" id="3399" />
-<TGConnectingPoint num="6" id="3400" />
-<TGConnectingPoint num="7" id="3401" />
-<extraparam>
-<Interval timer="timerAlarm" duration="60" />
-</extraparam>
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="3387" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3404" >
+<SUBCOMPONENT type="630" id="3390" >
<father id="3459" num="4" />
-<cdparam x="289" y="556" />
+<cdparam x="289" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3403" />
+<TGConnectingPoint num="0" id="3389" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3406" >
+<SUBCOMPONENT type="630" id="3392" >
<father id="3459" num="5" />
-<cdparam x="289" y="547" />
+<cdparam x="289" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3405" />
+<TGConnectingPoint num="0" id="3391" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3408" >
+<SUBCOMPONENT type="630" id="3394" >
<father id="3459" num="6" />
-<cdparam x="289" y="531" />
+<cdparam x="289" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3407" />
+<TGConnectingPoint num="0" id="3393" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3410" >
+<SUBCOMPONENT type="630" id="3396" >
<father id="3459" num="7" />
-<cdparam x="289" y="514" />
+<cdparam x="289" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3409" />
+<TGConnectingPoint num="0" id="3395" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3412" >
+<SUBCOMPONENT type="630" id="3398" >
<father id="3459" num="8" />
-<cdparam x="289" y="497" />
+<cdparam x="289" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3411" />
+<TGConnectingPoint num="0" id="3397" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3414" >
+<SUBCOMPONENT type="630" id="3400" >
<father id="3459" num="9" />
-<cdparam x="289" y="481" />
+<cdparam x="289" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3413" />
+<TGConnectingPoint num="0" id="3399" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3416" >
+<SUBCOMPONENT type="630" id="3402" >
<father id="3459" num="10" />
-<cdparam x="289" y="464" />
+<cdparam x="289" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3415" />
+<TGConnectingPoint num="0" id="3401" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3418" >
+<SUBCOMPONENT type="630" id="3404" >
<father id="3459" num="11" />
-<cdparam x="289" y="447" />
+<cdparam x="289" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3417" />
+<TGConnectingPoint num="0" id="3403" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3420" >
+<SUBCOMPONENT type="630" id="3406" >
<father id="3459" num="12" />
-<cdparam x="289" y="431" />
+<cdparam x="289" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3419" />
+<TGConnectingPoint num="0" id="3405" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3422" >
+<SUBCOMPONENT type="630" id="3408" >
<father id="3459" num="13" />
-<cdparam x="289" y="414" />
+<cdparam x="289" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3421" />
+<TGConnectingPoint num="0" id="3407" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3424" >
+<SUBCOMPONENT type="630" id="3410" >
<father id="3459" num="14" />
-<cdparam x="289" y="397" />
+<cdparam x="289" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3423" />
+<TGConnectingPoint num="0" id="3409" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3426" >
+<SUBCOMPONENT type="630" id="3412" >
<father id="3459" num="15" />
-<cdparam x="289" y="381" />
+<cdparam x="289" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3425" />
+<TGConnectingPoint num="0" id="3411" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3428" >
+<SUBCOMPONENT type="630" id="3414" >
<father id="3459" num="16" />
-<cdparam x="289" y="364" />
+<cdparam x="289" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3427" />
+<TGConnectingPoint num="0" id="3413" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3430" >
+<SUBCOMPONENT type="630" id="3416" >
<father id="3459" num="17" />
-<cdparam x="289" y="347" />
+<cdparam x="289" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3429" />
+<TGConnectingPoint num="0" id="3415" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3432" >
+<SUBCOMPONENT type="630" id="3418" >
<father id="3459" num="18" />
-<cdparam x="289" y="331" />
+<cdparam x="289" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3431" />
+<TGConnectingPoint num="0" id="3417" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3434" >
+<SUBCOMPONENT type="630" id="3420" >
<father id="3459" num="19" />
-<cdparam x="289" y="314" />
+<cdparam x="289" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3433" />
+<TGConnectingPoint num="0" id="3419" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3436" >
+<SUBCOMPONENT type="630" id="3422" >
<father id="3459" num="20" />
-<cdparam x="289" y="297" />
+<cdparam x="289" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3435" />
+<TGConnectingPoint num="0" id="3421" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3438" >
+<SUBCOMPONENT type="630" id="3424" >
<father id="3459" num="21" />
-<cdparam x="289" y="281" />
+<cdparam x="289" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3437" />
+<TGConnectingPoint num="0" id="3423" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3440" >
+<SUBCOMPONENT type="630" id="3426" >
<father id="3459" num="22" />
-<cdparam x="289" y="264" />
+<cdparam x="289" y="481" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3439" />
+<TGConnectingPoint num="0" id="3425" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3442" >
+<SUBCOMPONENT type="630" id="3428" >
<father id="3459" num="23" />
-<cdparam x="289" y="247" />
+<cdparam x="289" y="497" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3441" />
+<TGConnectingPoint num="0" id="3427" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3444" >
+<SUBCOMPONENT type="630" id="3430" >
<father id="3459" num="24" />
-<cdparam x="289" y="327" />
+<cdparam x="289" y="514" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3443" />
+<TGConnectingPoint num="0" id="3429" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3446" >
+<SUBCOMPONENT type="630" id="3432" >
<father id="3459" num="25" />
-<cdparam x="289" y="214" />
+<cdparam x="289" y="531" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3445" />
+<TGConnectingPoint num="0" id="3431" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3448" >
+<SUBCOMPONENT type="630" id="3434" >
<father id="3459" num="26" />
-<cdparam x="289" y="197" />
+<cdparam x="289" y="547" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3447" />
+<TGConnectingPoint num="0" id="3433" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3450" >
+<SUBCOMPONENT type="630" id="3436" >
<father id="3459" num="27" />
-<cdparam x="289" y="181" />
+<cdparam x="289" y="556" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3449" />
+<TGConnectingPoint num="0" id="3435" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3452" >
+<SUBCOMPONENT type="625" id="3445" >
<father id="3459" num="28" />
-<cdparam x="289" y="164" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="302" y="281" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3451" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
+<TGConnectingPoint num="0" id="3437" />
+<TGConnectingPoint num="1" id="3438" />
+<TGConnectingPoint num="2" id="3439" />
+<TGConnectingPoint num="3" id="3440" />
+<TGConnectingPoint num="4" id="3441" />
+<TGConnectingPoint num="5" id="3442" />
+<TGConnectingPoint num="6" id="3443" />
+<TGConnectingPoint num="7" id="3444" />
+<extraparam>
+<Interval timer="timerAlarm" duration="60" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3454" >
+<SUBCOMPONENT type="627" id="3454" >
<father id="3459" num="29" />
-<cdparam x="289" y="147" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="302" y="376" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3453" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
+<infoparam name="timer expiration" value="{timer=timerAlarm}" />
+<TGConnectingPoint num="0" id="3446" />
+<TGConnectingPoint num="1" id="3447" />
+<TGConnectingPoint num="2" id="3448" />
+<TGConnectingPoint num="3" id="3449" />
+<TGConnectingPoint num="4" id="3450" />
+<TGConnectingPoint num="5" id="3451" />
+<TGConnectingPoint num="6" id="3452" />
+<TGConnectingPoint num="7" id="3453" />
+<extraparam>
+<Interval timer="timerAlarm" />
+</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3456" >
<father id="3459" num="30" />
-<cdparam x="289" y="131" />
+<cdparam x="289" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9158,7 +9158,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3458" >
<father id="3459" num="31" />
-<cdparam x="289" y="114" />
+<cdparam x="289" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9178,7 +9178,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3461" >
<father id="3520" num="0" />
-<cdparam x="139" y="97" />
+<cdparam x="139" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9187,7 +9187,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3463" >
<father id="3520" num="1" />
-<cdparam x="139" y="91" />
+<cdparam x="139" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9196,7 +9196,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3465" >
<father id="3520" num="2" />
-<cdparam x="139" y="556" />
+<cdparam x="139" y="147" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9205,7 +9205,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3467" >
<father id="3520" num="3" />
-<cdparam x="139" y="547" />
+<cdparam x="139" y="164" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9214,7 +9214,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3469" >
<father id="3520" num="4" />
-<cdparam x="139" y="531" />
+<cdparam x="139" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9223,7 +9223,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3471" >
<father id="3520" num="5" />
-<cdparam x="139" y="514" />
+<cdparam x="139" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9232,7 +9232,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3473" >
<father id="3520" num="6" />
-<cdparam x="139" y="497" />
+<cdparam x="139" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9241,7 +9241,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3475" >
<father id="3520" num="7" />
-<cdparam x="139" y="481" />
+<cdparam x="139" y="231" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9250,7 +9250,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3477" >
<father id="3520" num="8" />
-<cdparam x="139" y="464" />
+<cdparam x="139" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9259,7 +9259,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3479" >
<father id="3520" num="9" />
-<cdparam x="139" y="447" />
+<cdparam x="139" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9268,7 +9268,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3481" >
<father id="3520" num="10" />
-<cdparam x="139" y="431" />
+<cdparam x="139" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9277,7 +9277,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3483" >
<father id="3520" num="11" />
-<cdparam x="139" y="414" />
+<cdparam x="139" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9286,7 +9286,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3485" >
<father id="3520" num="12" />
-<cdparam x="139" y="397" />
+<cdparam x="139" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9295,7 +9295,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3487" >
<father id="3520" num="13" />
-<cdparam x="139" y="381" />
+<cdparam x="139" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9304,7 +9304,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3489" >
<father id="3520" num="14" />
-<cdparam x="139" y="364" />
+<cdparam x="139" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9313,7 +9313,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3491" >
<father id="3520" num="15" />
-<cdparam x="139" y="347" />
+<cdparam x="139" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9322,7 +9322,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3493" >
<father id="3520" num="16" />
-<cdparam x="139" y="331" />
+<cdparam x="139" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9331,7 +9331,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3495" >
<father id="3520" num="17" />
-<cdparam x="139" y="314" />
+<cdparam x="139" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9340,7 +9340,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3497" >
<father id="3520" num="18" />
-<cdparam x="139" y="297" />
+<cdparam x="139" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9349,7 +9349,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3499" >
<father id="3520" num="19" />
-<cdparam x="139" y="281" />
+<cdparam x="139" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9358,7 +9358,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3501" >
<father id="3520" num="20" />
-<cdparam x="139" y="264" />
+<cdparam x="139" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9367,7 +9367,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3503" >
<father id="3520" num="21" />
-<cdparam x="139" y="247" />
+<cdparam x="139" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9376,7 +9376,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3505" >
<father id="3520" num="22" />
-<cdparam x="139" y="231" />
+<cdparam x="139" y="481" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9385,7 +9385,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3507" >
<father id="3520" num="23" />
-<cdparam x="139" y="214" />
+<cdparam x="139" y="497" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9394,7 +9394,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3509" >
<father id="3520" num="24" />
-<cdparam x="139" y="197" />
+<cdparam x="139" y="514" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9403,7 +9403,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3511" >
<father id="3520" num="25" />
-<cdparam x="139" y="181" />
+<cdparam x="139" y="531" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9412,7 +9412,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3513" >
<father id="3520" num="26" />
-<cdparam x="139" y="164" />
+<cdparam x="139" y="547" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9421,7 +9421,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3515" >
<father id="3520" num="27" />
-<cdparam x="139" y="147" />
+<cdparam x="139" y="556" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9430,7 +9430,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3517" >
<father id="3520" num="28" />
-<cdparam x="139" y="131" />
+<cdparam x="139" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9439,7 +9439,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3519" >
<father id="3520" num="29" />
-<cdparam x="139" y="114" />
+<cdparam x="139" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="475" />
@@ -9451,96 +9451,96 @@
<cdparam x="289" y="471" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(16)" />
-<P1 x="289" y="471" id="3415" />
-<P2 x="439" y="471" id="3336" />
+<P1 x="289" y="471" id="3423" />
+<P2 x="439" y="471" id="3362" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3522" >
<cdparam x="289" y="238" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(21)" />
-<P1 x="289" y="334" id="3443" />
-<P2 x="439" y="334" id="3364" />
+<P1 x="289" y="334" id="3395" />
+<P2 x="439" y="334" id="3334" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3523" >
<cdparam x="289" y="204" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(18)" />
-<P1 x="289" y="204" id="3447" />
-<P2 x="439" y="204" id="3368" />
+<P1 x="289" y="204" id="3391" />
+<P2 x="439" y="204" id="3330" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3524" >
<cdparam x="289" y="171" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(19)" />
-<P1 x="289" y="171" id="3451" />
-<P2 x="439" y="171" id="3372" />
+<P1 x="289" y="171" id="3387" />
+<P2 x="439" y="171" id="3326" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3525" >
<cdparam x="289" y="138" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="store(19)" />
-<P1 x="289" y="138" id="3455" />
-<P2 x="439" y="138" id="3376" />
+<P1 x="289" y="138" id="3383" />
+<P2 x="439" y="138" id="3322" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3526" >
<cdparam x="139" y="454" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(16)" />
-<P1 x="139" y="454" id="3478" />
-<P2 x="289" y="454" id="3417" />
+<P1 x="139" y="454" id="3500" />
+<P2 x="289" y="454" id="3421" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3527" >
<cdparam x="289" y="421" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="stopAlarm" />
-<P1 x="289" y="421" id="3421" />
-<P2 x="589" y="421" id="3281" />
+<P1 x="289" y="421" id="3417" />
+<P2 x="589" y="421" id="3295" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3528" >
<cdparam x="289" y="254" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="startAlarm" />
-<P1 x="289" y="254" id="3441" />
-<P2 x="589" y="254" id="3301" />
+<P1 x="289" y="254" id="3397" />
+<P2 x="589" y="254" id="3275" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3529" >
<cdparam x="139" y="221" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="139" y="221" id="3506" />
-<P2 x="289" y="221" id="3445" />
+<P1 x="139" y="221" id="3472" />
+<P2 x="289" y="221" id="3393" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3530" >
<cdparam x="139" y="188" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(18)" />
-<P1 x="139" y="188" id="3510" />
-<P2 x="289" y="188" id="3449" />
+<P1 x="139" y="188" id="3468" />
+<P2 x="289" y="188" id="3389" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3531" >
<cdparam x="139" y="154" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure19" />
-<P1 x="139" y="154" id="3514" />
-<P2 x="289" y="154" id="3453" />
+<P1 x="139" y="154" id="3464" />
+<P2 x="289" y="154" id="3385" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="3532" >
<cdparam x="139" y="121" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(19)" />
-<P1 x="139" y="121" id="3518" />
-<P2 x="289" y="121" id="3457" />
+<P1 x="139" y="121" id="3460" />
+<P2 x="289" y="121" id="3381" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -9651,7 +9651,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3533" />
-<P1 x="964" y="240" id="3635" />
+<P1 x="964" y="240" id="3610" />
<P2 x="1088" y="240" id="3559" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -9667,8 +9667,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3535" />
-<P1 x="659" y="240" id="3610" />
-<P2 x="714" y="240" id="3634" />
+<P1 x="659" y="240" id="3635" />
+<P2 x="714" y="240" id="3609" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -9682,7 +9682,7 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3537" />
<P1 x="325" y="241" id="3585" />
-<P2 x="409" y="240" id="3609" />
+<P2 x="409" y="240" id="3634" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -9887,11 +9887,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="3630" >
<father id="3680" num="0" />
-<cdparam x="409" y="140" />
+<cdparam x="714" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="MainController" />
+<infoparam name="Block0" value="AlarmManager" />
<TGConnectingPoint num="0" id="3606" />
<TGConnectingPoint num="1" id="3607" />
<TGConnectingPoint num="2" id="3608" />
@@ -9919,19 +9919,20 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
-<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
-<Signal value="in pressureValue(int value)" attached="true" />
-<Signal value="out highPressure()" attached="true" />
+<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
+<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
+<Signal value="in highPressure()" attached="true" />
+<Signal value="out alarmOff()" attached="true" />
+<Signal value="out alarmOn()" attached="true" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="3655" >
<father id="3680" num="1" />
-<cdparam x="714" y="140" />
+<cdparam x="409" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="AlarmManager" />
+<infoparam name="Block0" value="MainController" />
<TGConnectingPoint num="0" id="3631" />
<TGConnectingPoint num="1" id="3632" />
<TGConnectingPoint num="2" id="3633" />
@@ -9959,11 +9960,10 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
-<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
-<Signal value="in highPressure()" attached="true" />
-<Signal value="out alarmOff()" attached="true" />
-<Signal value="out alarmOn()" attached="true" />
+<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
+<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
+<Signal value="in pressureValue(int value)" attached="true" />
+<Signal value="out highPressure()" attached="true" />
</extraparam>
</SUBCOMPONENT>
@@ -12352,7 +12352,7 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="4623" />
-<P1 x="964" y="240" id="4683" />
+<P1 x="964" y="240" id="4708" />
<P2 x="1088" y="240" id="4632" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -12368,8 +12368,8 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="4625" />
-<P1 x="659" y="240" id="4708" />
-<P2 x="714" y="240" id="4682" />
+<P1 x="659" y="240" id="4683" />
+<P2 x="714" y="240" id="4707" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -12383,7 +12383,7 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="4627" />
<P1 x="325" y="241" id="4658" />
-<P2 x="409" y="240" id="4707" />
+<P2 x="409" y="240" id="4682" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -12528,11 +12528,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="4703" >
<father id="4753" num="0" />
-<cdparam x="714" y="140" />
+<cdparam x="409" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="AlarmManager" />
+<infoparam name="Block0" value="MainController" />
<TGConnectingPoint num="0" id="4679" />
<TGConnectingPoint num="1" id="4680" />
<TGConnectingPoint num="2" id="4681" />
@@ -12560,20 +12560,19 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
-<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
-<Signal value="in highPressure()" attached="true" />
-<Signal value="out alarmOff()" attached="true" />
-<Signal value="out alarmOn()" attached="true" />
+<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
+<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
+<Signal value="in pressureValue(int value)" attached="true" />
+<Signal value="out highPressure()" attached="true" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="4728" >
<father id="4753" num="1" />
-<cdparam x="409" y="140" />
+<cdparam x="714" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="MainController" />
+<infoparam name="Block0" value="AlarmManager" />
<TGConnectingPoint num="0" id="4704" />
<TGConnectingPoint num="1" id="4705" />
<TGConnectingPoint num="2" id="4706" />
@@ -12601,10 +12600,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
-<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
-<Signal value="in pressureValue(int value)" attached="true" />
-<Signal value="out highPressure()" attached="true" />
+<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
+<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
+<Signal value="in highPressure()" attached="true" />
+<Signal value="out alarmOff()" attached="true" />
+<Signal value="out alarmOn()" attached="true" />
</extraparam>
</SUBCOMPONENT>
@@ -14912,7 +14912,7 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="5606" />
-<P1 x="964" y="240" id="5700" />
+<P1 x="964" y="240" id="5725" />
<P2 x="1088" y="240" id="5649" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -14928,8 +14928,8 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="5608" />
-<P1 x="659" y="240" id="5725" />
-<P2 x="714" y="240" id="5699" />
+<P1 x="659" y="240" id="5700" />
+<P2 x="714" y="240" id="5724" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -14943,7 +14943,7 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="5610" />
<P1 x="325" y="241" id="5675" />
-<P2 x="409" y="240" id="5724" />
+<P2 x="409" y="240" id="5699" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -15077,8 +15077,8 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
<Method value="$setAlarm(bool onoff)" />
-<Signal value="in alarmOn()" attached="false" />
-<Signal value="in alarmOff()" attached="false" />
+<Signal value="in alarmOn()" attached="true" />
+<Signal value="in alarmOff()" attached="true" />
<globalCode value="" />
<globalCode value="void __userImplemented__AlarmActuator__setAlarm(bool onoff) {" />
<globalCode value=" if (onoff) {" />
@@ -15179,11 +15179,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="5720" >
<father id="5770" num="0" />
-<cdparam x="714" y="140" />
+<cdparam x="409" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="AlarmManager" />
+<infoparam name="Block0" value="MainController" />
<TGConnectingPoint num="0" id="5696" />
<TGConnectingPoint num="1" id="5697" />
<TGConnectingPoint num="2" id="5698" />
@@ -15211,20 +15211,19 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="alarmDuration" value="5" type="8" typeOther="" />
-<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
-<Signal value="in highPressure()" attached="true" />
-<Signal value="out alarmOff()" attached="true" />
-<Signal value="out alarmOn()" attached="true" />
+<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
+<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
+<Signal value="in pressureValue(int value)" attached="true" />
+<Signal value="out highPressure()" attached="true" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="5745" >
<father id="5770" num="1" />
-<cdparam x="409" y="140" />
+<cdparam x="714" y="140" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="355" minY="0" maxY="138" />
-<infoparam name="Block0" value="MainController" />
+<infoparam name="Block0" value="AlarmManager" />
<TGConnectingPoint num="0" id="5721" />
<TGConnectingPoint num="1" id="5722" />
<TGConnectingPoint num="2" id="5723" />
@@ -15252,10 +15251,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
-<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
-<Signal value="in pressureValue(int value)" attached="true" />
-<Signal value="out highPressure()" attached="true" />
+<Attribute access="0" id="alarmDuration" value="5" type="8" typeOther="" />
+<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
+<Signal value="in highPressure()" attached="true" />
+<Signal value="out alarmOff()" attached="true" />
+<Signal value="out alarmOn()" attached="true" />
</extraparam>
</SUBCOMPONENT>
diff --git a/src/main/java/ui/interactivesimulation/JFrameSimulationSDPanel.java b/src/main/java/ui/interactivesimulation/JFrameSimulationSDPanel.java
index 51ca1b7a12aa05f05c0e2abe34aa9612d92fd02f..fbff37e734d94e5de8e85e15542467be21572a74 100755
--- a/src/main/java/ui/interactivesimulation/JFrameSimulationSDPanel.java
+++ b/src/main/java/ui/interactivesimulation/JFrameSimulationSDPanel.java
@@ -181,19 +181,19 @@ public class JFrameSimulationSDPanel extends JFrame implements ActionListener {
public void setFileReference(String _fileReference) {
if (sdpanel != null) {
- TraceManager.addDev("Resetting file");
+ //TraceManager.addDev("Setting file:" + _fileReference);
sdpanel.setFileReference(_fileReference);
} else {
- TraceManager.addDev("Null SD Panel");
+ //TraceManager.addDev("Null SD Panel");
}
}
public void setFileReference(BufferedReader inputStream) {
if (sdpanel != null) {
- TraceManager.addDev("Setting input stream");
+ //TraceManager.addDev("Setting input stream");
sdpanel.setFileReference(inputStream);
} else {
- TraceManager.addDev("Null SD Panel");
+ //TraceManager.addDev("Null SD Panel");
}
}
diff --git a/src/main/java/ui/interactivesimulation/JSimulationSDPanel.java b/src/main/java/ui/interactivesimulation/JSimulationSDPanel.java
index 0ad67a66fba35b78d615f98f45f942f0ab353842..bb4fc1f015ea392f9a8c8ff4c53c43da2d0fd5db 100644
--- a/src/main/java/ui/interactivesimulation/JSimulationSDPanel.java
+++ b/src/main/java/ui/interactivesimulation/JSimulationSDPanel.java
@@ -185,6 +185,9 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
int oldMaxX = maxX;
boolean mustDraw = tryToGetExclu();
+
+ //TraceManager.addDev("JSimulationDSPanel MustDraw? " + mustDraw);
+
if (mustDraw) {
if (!spaceBetweenLifeLinesComputed) {
computeSpaceBetweenLifeLines(g);
@@ -225,6 +228,9 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
// Returns the currentY position
private int paintTopElements(Graphics g, int currentX, int currentY) {
+
+ //TraceManager.addDev("Painting n top elements. n= " + entityNames.size());
+
int w;
for(String name : entityNames) {
@@ -935,12 +941,15 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
try {
// Open the file that is the first
// command line parameter
+ //TraceManager.addDev("setfilereference in JSimulationSDPanel");
this.fileReference = _fileReference;
this.mode = FILE_MODE;
FileInputStream fstream = new FileInputStream(_fileReference);
BufferedReader br = new BufferedReader(new InputStreamReader(new DataInputStream(fstream)));
// Get the object of DataInputStream
+
this.setFileReference(br, _fileReference);
+
} catch(FileNotFoundException e) {
TraceManager.addDev("File " + _fileReference + " not found.");
} catch(SecurityException e) {
@@ -974,12 +983,14 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
}
public void run() {
- //TraceManager.addDev("Reading file");
+ //TraceManager.addDev("Reading file 1");
if (mode == NO_MODE) {
return;
}
+ //TraceManager.addDev("Reading file 2");
+
if ((this.mode == FILE_MODE || this.mode == STREAM_MODE) && this.inputStream != null) {
// Read the content of the file
// Read line by line
@@ -990,6 +1001,7 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
String strLine;
//Read File Line By Line
while ((strLine = this.inputStream.readLine()) != null) {
+ //TraceManager.addDev("Reading transaction: " + strLine);
addGenericTransaction(strLine);
}
//Close the input stream
@@ -1033,6 +1045,7 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
// Adding the ID
index0 = trans.indexOf(" ");
if (index0 == -1) {
+ //TraceManager.addDev("addtranse 0 No space");
return;
}
tmp = trans.substring(1, index0);
@@ -1042,7 +1055,7 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
}
- //TraceManager.addDev("1");
+ //TraceManager.addDev("addtrans 1");
// Time
tmp = extract(trans, "time");
@@ -1055,7 +1068,7 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
try {
index0 = tmp.indexOf('.');
if (index0 == -1) {
- TraceManager.addDev("Invalid time value");
+ //TraceManager.addDev("Invalid time value");
return;
}
tmp1 = tmp.substring(0, index0);
@@ -1080,6 +1093,7 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
// Name of the block
tmp = extract(trans, "block");
if (tmp == null) {
+ //TraceManager.addDev("addtrans no block");
return;
}
@@ -1088,10 +1102,13 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
// addEntityNameIfApplicable(tmp);
if (!entityNames.contains(tmp)){
+ //TraceManager.addDev("addtrans New entity");
if (limitEntity){
+ //TraceManager.addDev("addtrans limitEntity");
return;
}
else {
+ //TraceManager.addDev("addtrans ADDING ENTITY NAME");
addEntityNameIfApplicable(tmp);
}
}
diff --git a/src/main/java/ui/window/JDialogAvatarExecutableCodeGeneration.java b/src/main/java/ui/window/JDialogAvatarExecutableCodeGeneration.java
index 2198d71c90d37c8dbc019126ff5ff0bf41690c96..7a5ce7882762ce8068ea25aeae8a7ea2f5ddfb05 100644
--- a/src/main/java/ui/window/JDialogAvatarExecutableCodeGeneration.java
+++ b/src/main/java/ui/window/JDialogAvatarExecutableCodeGeneration.java
@@ -1087,16 +1087,18 @@ public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame im
public void showSimulationTrace() {
JFrameSimulationSDPanel jfssdp = new JFrameSimulationSDPanel(f, mgui, "Simulation trace of " + simulationTraceFile.getText());
+ jfssdp.setLimitEntity(false);
jfssdp.setIconImage(IconManager.img8);
// jfssdp.setSize(600, 600);
GraphicLib.centerOnParent(jfssdp, 800, 600);
if (selectedViewTrace == 0) {
+ //TraceManager.addDev("Selecting avatarcposix file reference");
jfssdp.setFileReference(simulationTraceFile.getText());
} else {
jfssdp.setFileReference(simulationsoclibTraceFile.getText());
}
jfssdp.setVisible(true);
- TraceManager.addDev("Ok JFrame");
+ //TraceManager.addDev("Ok JFrame");
}
diff --git a/src/main/java/ui/window/JFrameSimulationTrace.java b/src/main/java/ui/window/JFrameSimulationTrace.java
index b01ee001f7ec20d386be633f0b4a633e985221be..ab37502948faa01ff589f59f86d4684a5218da89 100644
--- a/src/main/java/ui/window/JFrameSimulationTrace.java
+++ b/src/main/java/ui/window/JFrameSimulationTrace.java
@@ -41,6 +41,7 @@
package ui.window;
+import myutil.TraceManager;
import translator.Gate;
import translator.GroupOfGates;
import translator.MasterGateManager;
@@ -76,22 +77,20 @@ public class JFrameSimulationTrace extends JFrame implements ActionListener {
private int type = 0; // 1 -> function of time // 2-> ordering
-
- public JFrameSimulationTrace(String title, String _simuData) {
- super(title);
- type = 1;
- makeTraceSimu(_simuData);
- makeComponents();
- }
+
public JFrameSimulationTrace(String title, String _simuData, int _type) {
super(title);
+
type = _type;
makeTraceSimu(_simuData);
makeComponents();
}
public boolean makeTraceSimu(String simuData) {
+
+ //TraceManager.addDev("New simulation trace with" + simuData);
+
trace = new Vector<>();
StringReader sr = new StringReader(simuData);