From 879577ae0543b989aef9c41ffe1666b793cf08bb Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 24 Sep 2020 10:55:10 +0200
Subject: [PATCH] Update on Nokia license DSEZ3Engine
---
modeling/AVATAR/PressureController.xml | 1957 +++++++++--------
.../dsez3engine/InputInstance.java | 6 +
.../dsez3engine/OptimizationModel.java | 6 +
.../dsez3engine/OptimizationResult.java | 41 +-
.../dsez3engine/InputInstanceTest.java | 6 +
5 files changed, 1002 insertions(+), 1014 deletions(-)
diff --git a/modeling/AVATAR/PressureController.xml b/modeling/AVATAR/PressureController.xml
index 469fec77c0..bc112fc535 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="0" LAST_SELECTED_SUB_TAB="1">
+<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="0" LAST_SELECTED_SUB_TAB="0">
<Modeling type="Avatar Requirement" nameTab="Requirements" >
<AvatarRDPanel name="RequirementsSystemView" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
@@ -377,7 +377,7 @@
<TGConnectingPoint num="41" id="262" />
<TGConnectingPoint num="42" id="263" />
<extraparam>
-<textline data="The system shall use a pressure " />
+<textline data="The system shall have a pressure " />
<textline data="sensor to monitor the pressure " />
<textline data="of the cabin" />
<kind data="Functional" />
@@ -523,7 +523,7 @@
<COMPONENT type="5200" id="396" >
<cdparam x="223" y="55" />
-<sizeparam width="676" height="72" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="140" minDesiredHeight="0" />
+<sizeparam width="387" height="72" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="140" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Requirement" value="PressureController" />
@@ -599,7 +599,7 @@
<infoparam name="connector" value="<<composition>>" />
<TGConnectingPoint num="0" id="399" />
<P1 x="991" y="254" id="52" />
-<P2 x="730" y="127" id="364" />
+<P2 x="513" y="127" id="364" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="5206" id="402" >
@@ -626,7 +626,7 @@
<infoparam name="connector" value="<<composition>>" />
<TGConnectingPoint num="0" id="405" />
<P1 x="561" y="223" id="184" />
-<P2 x="561" y="127" id="363" />
+<P2 x="416" y="127" id="363" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="5202" id="408" >
@@ -653,7 +653,7 @@
<infoparam name="connector" value="<<composition>>" />
<TGConnectingPoint num="0" id="411" />
<P1 x="193" y="242" id="316" />
-<P2 x="392" y="127" id="362" />
+<P2 x="319" y="127" id="362" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -711,7 +711,8 @@
<TGConnectingPoint num="42" id="455" />
<extraparam>
<textline data="The software shall store recorded " />
-<textline data="values in a removable disk" />
+<textline data="values in a removable disk provided" />
+<textline data="with the overall system" />
<kind data="Functional" />
<criticality data="Low" />
<reqType data="Requirement" color="-1773070" />
@@ -904,8 +905,8 @@
<TGConnectingPoint num="41" id="586" />
<TGConnectingPoint num="42" id="587" />
<extraparam>
-<textline data="The software shall trigger an alarm" />
-<textline data="to inform the crew about an " />
+<textline data="The software shall trigger an external" />
+<textline data="alarm to inform the crew about an " />
<textline data="over pressure in the cabin" />
<kind data="Functional" />
<criticality data="Low" />
@@ -1033,8 +1034,8 @@
<TGConnectingPoint num="41" id="674" />
<TGConnectingPoint num="42" id="675" />
<extraparam>
-<textline data="The software shall rely on a " />
-<textline data="pressure sensor to monitor " />
+<textline data="The software shall rely on an " />
+<textline data="external pressure sensor to monitor " />
<textline data="the pressure of the cabin" />
<kind data="Functional" />
<criticality data="Low" />
@@ -3002,7 +3003,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="1644" >
<father id="1703" num="0" />
-<cdparam x="595" y="109" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3011,7 +3012,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1646" >
<father id="1703" num="1" />
-<cdparam x="595" y="115" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3020,7 +3021,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1648" >
<father id="1703" num="2" />
-<cdparam x="595" y="132" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3029,7 +3030,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1650" >
<father id="1703" num="3" />
-<cdparam x="595" y="149" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3038,7 +3039,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1652" >
<father id="1703" num="4" />
-<cdparam x="595" y="165" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3047,7 +3048,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1654" >
<father id="1703" num="5" />
-<cdparam x="595" y="182" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3056,7 +3057,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1656" >
<father id="1703" num="6" />
-<cdparam x="595" y="199" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3065,7 +3066,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1658" >
<father id="1703" num="7" />
-<cdparam x="595" y="215" />
+<cdparam x="595" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3074,7 +3075,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1660" >
<father id="1703" num="8" />
-<cdparam x="595" y="232" />
+<cdparam x="595" y="449" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3083,7 +3084,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1662" >
<father id="1703" num="9" />
-<cdparam x="595" y="249" />
+<cdparam x="595" y="432" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3092,7 +3093,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1664" >
<father id="1703" num="10" />
-<cdparam x="595" y="265" />
+<cdparam x="595" y="415" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3101,7 +3102,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1666" >
<father id="1703" num="11" />
-<cdparam x="595" y="282" />
+<cdparam x="595" y="399" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3110,7 +3111,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1668" >
<father id="1703" num="12" />
-<cdparam x="595" y="299" />
+<cdparam x="595" y="382" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3119,7 +3120,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1670" >
<father id="1703" num="13" />
-<cdparam x="595" y="315" />
+<cdparam x="595" y="365" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3128,7 +3129,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1672" >
<father id="1703" num="14" />
-<cdparam x="595" y="332" />
+<cdparam x="595" y="349" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3137,7 +3138,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1674" >
<father id="1703" num="15" />
-<cdparam x="595" y="349" />
+<cdparam x="595" y="332" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3146,7 +3147,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1676" >
<father id="1703" num="16" />
-<cdparam x="595" y="365" />
+<cdparam x="595" y="315" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3155,7 +3156,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1678" >
<father id="1703" num="17" />
-<cdparam x="595" y="382" />
+<cdparam x="595" y="299" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3164,7 +3165,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1680" >
<father id="1703" num="18" />
-<cdparam x="595" y="399" />
+<cdparam x="595" y="282" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3173,7 +3174,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1682" >
<father id="1703" num="19" />
-<cdparam x="595" y="415" />
+<cdparam x="595" y="265" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3182,7 +3183,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1684" >
<father id="1703" num="20" />
-<cdparam x="595" y="432" />
+<cdparam x="595" y="249" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3191,7 +3192,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1686" >
<father id="1703" num="21" />
-<cdparam x="595" y="449" />
+<cdparam x="595" y="232" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3200,7 +3201,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1688" >
<father id="1703" num="22" />
-<cdparam x="595" y="461" />
+<cdparam x="595" y="215" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3209,7 +3210,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1690" >
<father id="1703" num="23" />
-<cdparam x="595" y="461" />
+<cdparam x="595" y="199" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3218,7 +3219,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1692" >
<father id="1703" num="24" />
-<cdparam x="595" y="461" />
+<cdparam x="595" y="182" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3227,7 +3228,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1694" >
<father id="1703" num="25" />
-<cdparam x="595" y="461" />
+<cdparam x="595" y="165" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3236,7 +3237,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1696" >
<father id="1703" num="26" />
-<cdparam x="595" y="461" />
+<cdparam x="595" y="149" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3245,7 +3246,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1698" >
<father id="1703" num="27" />
-<cdparam x="595" y="461" />
+<cdparam x="595" y="132" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3254,7 +3255,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1700" >
<father id="1703" num="28" />
-<cdparam x="595" y="461" />
+<cdparam x="595" y="115" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3263,7 +3264,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1702" >
<father id="1703" num="29" />
-<cdparam x="595" y="461" />
+<cdparam x="595" y="109" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3281,13 +3282,13 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="625" id="1712" >
+<SUBCOMPONENT type="627" id="1712" >
<father id="1782" num="0" />
-<cdparam x="365" y="299" />
+<cdparam x="365" y="394" />
<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="365" />
-<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
+<infoparam name="timer expiration" value="{timer=timerAlarm}" />
<TGConnectingPoint num="0" id="1704" />
<TGConnectingPoint num="1" id="1705" />
<TGConnectingPoint num="2" id="1706" />
@@ -3297,12 +3298,12 @@
<TGConnectingPoint num="6" id="1710" />
<TGConnectingPoint num="7" id="1711" />
<extraparam>
-<Interval timer="timerAlarm" duration="60" />
+<Interval timer="timerAlarm" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1714" >
<father id="1782" num="1" />
-<cdparam x="352" y="115" />
+<cdparam x="352" y="109" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3311,7 +3312,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1716" >
<father id="1782" num="2" />
-<cdparam x="352" y="132" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3320,7 +3321,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1718" >
<father id="1782" num="3" />
-<cdparam x="352" y="149" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3329,7 +3330,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1720" >
<father id="1782" num="4" />
-<cdparam x="352" y="165" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3338,7 +3339,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1722" >
<father id="1782" num="5" />
-<cdparam x="352" y="182" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3347,7 +3348,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1724" >
<father id="1782" num="6" />
-<cdparam x="352" y="199" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3356,7 +3357,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1726" >
<father id="1782" num="7" />
-<cdparam x="352" y="215" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3365,7 +3366,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1728" >
<father id="1782" num="8" />
-<cdparam x="352" y="232" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3374,7 +3375,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1730" >
<father id="1782" num="9" />
-<cdparam x="352" y="249" />
+<cdparam x="352" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3383,7 +3384,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1732" >
<father id="1782" num="10" />
-<cdparam x="352" y="265" />
+<cdparam x="352" y="449" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3392,7 +3393,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1734" >
<father id="1782" num="11" />
-<cdparam x="352" y="282" />
+<cdparam x="352" y="432" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3401,7 +3402,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1736" >
<father id="1782" num="12" />
-<cdparam x="352" y="299" />
+<cdparam x="352" y="415" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3410,7 +3411,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1738" >
<father id="1782" num="13" />
-<cdparam x="352" y="315" />
+<cdparam x="352" y="399" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3419,7 +3420,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1740" >
<father id="1782" num="14" />
-<cdparam x="352" y="332" />
+<cdparam x="352" y="382" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3428,7 +3429,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1742" >
<father id="1782" num="15" />
-<cdparam x="352" y="349" />
+<cdparam x="352" y="365" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3437,7 +3438,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1744" >
<father id="1782" num="16" />
-<cdparam x="352" y="365" />
+<cdparam x="352" y="349" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3446,7 +3447,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1746" >
<father id="1782" num="17" />
-<cdparam x="352" y="382" />
+<cdparam x="352" y="332" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3455,7 +3456,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1748" >
<father id="1782" num="18" />
-<cdparam x="352" y="399" />
+<cdparam x="352" y="315" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3464,7 +3465,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1750" >
<father id="1782" num="19" />
-<cdparam x="352" y="415" />
+<cdparam x="352" y="299" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3473,7 +3474,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1752" >
<father id="1782" num="20" />
-<cdparam x="352" y="432" />
+<cdparam x="352" y="282" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3482,7 +3483,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1754" >
<father id="1782" num="21" />
-<cdparam x="352" y="449" />
+<cdparam x="352" y="265" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3491,7 +3492,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1756" >
<father id="1782" num="22" />
-<cdparam x="352" y="461" />
+<cdparam x="352" y="249" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3500,7 +3501,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1758" >
<father id="1782" num="23" />
-<cdparam x="352" y="461" />
+<cdparam x="352" y="232" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3509,7 +3510,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1760" >
<father id="1782" num="24" />
-<cdparam x="352" y="461" />
+<cdparam x="352" y="215" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3518,7 +3519,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1762" >
<father id="1782" num="25" />
-<cdparam x="352" y="461" />
+<cdparam x="352" y="199" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3527,7 +3528,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1764" >
<father id="1782" num="26" />
-<cdparam x="352" y="461" />
+<cdparam x="352" y="182" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3536,7 +3537,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1766" >
<father id="1782" num="27" />
-<cdparam x="352" y="461" />
+<cdparam x="352" y="165" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3545,7 +3546,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1768" >
<father id="1782" num="28" />
-<cdparam x="352" y="461" />
+<cdparam x="352" y="149" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3554,7 +3555,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1770" >
<father id="1782" num="29" />
-<cdparam x="352" y="461" />
+<cdparam x="352" y="132" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3563,20 +3564,20 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1772" >
<father id="1782" num="30" />
-<cdparam x="352" y="109" />
+<cdparam x="352" y="115" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="1771" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="1781" >
+<SUBCOMPONENT type="625" id="1781" >
<father id="1782" num="31" />
-<cdparam x="365" y="394" />
+<cdparam x="365" y="299" />
<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="365" />
-<infoparam name="timer expiration" value="{timer=timerAlarm}" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
<TGConnectingPoint num="0" id="1773" />
<TGConnectingPoint num="1" id="1774" />
<TGConnectingPoint num="2" id="1775" />
@@ -3586,7 +3587,7 @@
<TGConnectingPoint num="6" id="1779" />
<TGConnectingPoint num="7" id="1780" />
<extraparam>
-<Interval timer="timerAlarm" />
+<Interval timer="timerAlarm" duration="60" />
</extraparam>
</SUBCOMPONENT>
@@ -3602,7 +3603,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="1784" >
<father id="1843" num="0" />
-<cdparam x="105" y="109" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3611,7 +3612,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1786" >
<father id="1843" num="1" />
-<cdparam x="105" y="115" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3620,7 +3621,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1788" >
<father id="1843" num="2" />
-<cdparam x="105" y="132" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3629,7 +3630,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1790" >
<father id="1843" num="3" />
-<cdparam x="105" y="149" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3638,7 +3639,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1792" >
<father id="1843" num="4" />
-<cdparam x="105" y="165" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3647,7 +3648,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1794" >
<father id="1843" num="5" />
-<cdparam x="105" y="182" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3656,7 +3657,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1796" >
<father id="1843" num="6" />
-<cdparam x="105" y="199" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3665,7 +3666,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1798" >
<father id="1843" num="7" />
-<cdparam x="105" y="215" />
+<cdparam x="105" y="461" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3674,7 +3675,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1800" >
<father id="1843" num="8" />
-<cdparam x="105" y="232" />
+<cdparam x="105" y="449" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3683,7 +3684,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1802" >
<father id="1843" num="9" />
-<cdparam x="105" y="249" />
+<cdparam x="105" y="432" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3692,7 +3693,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1804" >
<father id="1843" num="10" />
-<cdparam x="105" y="265" />
+<cdparam x="105" y="415" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3701,7 +3702,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1806" >
<father id="1843" num="11" />
-<cdparam x="105" y="282" />
+<cdparam x="105" y="399" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3710,7 +3711,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1808" >
<father id="1843" num="12" />
-<cdparam x="105" y="299" />
+<cdparam x="105" y="382" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3719,7 +3720,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1810" >
<father id="1843" num="13" />
-<cdparam x="105" y="315" />
+<cdparam x="105" y="365" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3728,7 +3729,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1812" >
<father id="1843" num="14" />
-<cdparam x="105" y="332" />
+<cdparam x="105" y="349" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3737,7 +3738,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1814" >
<father id="1843" num="15" />
-<cdparam x="105" y="349" />
+<cdparam x="105" y="332" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3746,7 +3747,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1816" >
<father id="1843" num="16" />
-<cdparam x="105" y="365" />
+<cdparam x="105" y="315" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3755,7 +3756,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1818" >
<father id="1843" num="17" />
-<cdparam x="105" y="382" />
+<cdparam x="105" y="299" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3764,7 +3765,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1820" >
<father id="1843" num="18" />
-<cdparam x="105" y="399" />
+<cdparam x="105" y="282" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3773,7 +3774,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1822" >
<father id="1843" num="19" />
-<cdparam x="105" y="415" />
+<cdparam x="105" y="265" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3782,7 +3783,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1824" >
<father id="1843" num="20" />
-<cdparam x="105" y="432" />
+<cdparam x="105" y="249" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3791,7 +3792,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1826" >
<father id="1843" num="21" />
-<cdparam x="105" y="449" />
+<cdparam x="105" y="232" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3800,7 +3801,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1828" >
<father id="1843" num="22" />
-<cdparam x="105" y="461" />
+<cdparam x="105" y="215" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3809,7 +3810,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1830" >
<father id="1843" num="23" />
-<cdparam x="105" y="461" />
+<cdparam x="105" y="199" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3818,7 +3819,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1832" >
<father id="1843" num="24" />
-<cdparam x="105" y="461" />
+<cdparam x="105" y="182" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3827,7 +3828,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1834" >
<father id="1843" num="25" />
-<cdparam x="105" y="461" />
+<cdparam x="105" y="165" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3836,7 +3837,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1836" >
<father id="1843" num="26" />
-<cdparam x="105" y="461" />
+<cdparam x="105" y="149" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3845,7 +3846,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1838" >
<father id="1843" num="27" />
-<cdparam x="105" y="461" />
+<cdparam x="105" y="132" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3854,7 +3855,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1840" >
<father id="1843" num="28" />
-<cdparam x="105" y="461" />
+<cdparam x="105" y="115" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3863,7 +3864,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1842" >
<father id="1843" num="29" />
-<cdparam x="105" y="461" />
+<cdparam x="105" y="109" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="362" />
@@ -3875,56 +3876,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="468" id="1827" />
-<P2 x="352" y="468" id="1755" />
+<P1 x="105" y="468" id="1797" />
+<P2 x="352" y="468" id="1729" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1845" >
<cdparam x="255" y="440" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="stopAlarm" />
-<P1 x="352" y="439" id="1751" />
-<P2 x="595" y="439" id="1683" />
+<P1 x="352" y="439" id="1733" />
+<P2 x="595" y="439" id="1661" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1846" >
<cdparam x="255" y="273" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="startAlarm" />
-<P1 x="352" y="272" id="1731" />
-<P2 x="595" y="272" id="1663" />
+<P1 x="352" y="272" id="1753" />
+<P2 x="595" y="272" id="1681" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1847" >
<cdparam x="105" y="240" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="105" y="239" id="1799" />
-<P2 x="352" y="239" id="1727" />
+<P1 x="105" y="239" id="1825" />
+<P2 x="352" y="239" id="1757" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1848" >
<cdparam x="105" y="207" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(18)" />
-<P1 x="105" y="206" id="1795" />
-<P2 x="352" y="206" id="1723" />
+<P1 x="105" y="206" id="1829" />
+<P2 x="352" y="206" id="1761" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1849" >
<cdparam x="105" y="173" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure19" />
-<P1 x="105" y="172" id="1791" />
-<P2 x="352" y="172" id="1719" />
+<P1 x="105" y="172" id="1833" />
+<P2 x="352" y="172" id="1765" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="1850" >
<cdparam x="105" y="140" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(19)" />
-<P1 x="105" y="139" id="1787" />
-<P2 x="352" y="139" id="1715" />
+<P1 x="105" y="139" id="1837" />
+<P2 x="352" y="139" id="1769" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -3941,357 +3942,357 @@
<Actor data="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="630" id="1852" >
+<SUBCOMPONENT type="623" id="1859" >
<father id="1958" num="0" />
-<cdparam x="516" y="111" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="431" />
+<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
-<infoparam name="port" value="port" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
+<infoparam name="action state" value="timerValue = 60" />
<TGConnectingPoint num="0" id="1851" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1854" >
+<TGConnectingPoint num="1" id="1852" />
+<TGConnectingPoint num="2" id="1853" />
+<TGConnectingPoint num="3" id="1854" />
+<TGConnectingPoint num="4" id="1855" />
+<TGConnectingPoint num="5" id="1856" />
+<TGConnectingPoint num="6" id="1857" />
+<TGConnectingPoint num="7" id="1858" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="622" id="1869" >
<father id="1958" num="1" />
-<cdparam x="516" y="127" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="476" y="342" />
+<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1853" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1856" >
+<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="355" />
+<infoparam name="Line of relative time constraint" value="rtc" />
+<TGConnectingPoint num="0" id="1860" />
+<TGConnectingPoint num="1" id="1861" />
+<TGConnectingPoint num="2" id="1862" />
+<TGConnectingPoint num="3" id="1863" />
+<TGConnectingPoint num="4" id="1864" />
+<TGConnectingPoint num="5" id="1865" />
+<TGConnectingPoint num="6" id="1866" />
+<TGConnectingPoint num="7" id="1867" />
+<TGConnectingPoint num="8" id="1868" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="622" id="1879" >
<father id="1958" num="2" />
-<cdparam x="516" y="144" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="476" y="292" />
+<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1855" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1858" >
+<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="355" />
+<infoparam name="Line of relative time constraint" value="rtc" />
+<TGConnectingPoint num="0" id="1870" />
+<TGConnectingPoint num="1" id="1871" />
+<TGConnectingPoint num="2" id="1872" />
+<TGConnectingPoint num="3" id="1873" />
+<TGConnectingPoint num="4" id="1874" />
+<TGConnectingPoint num="5" id="1875" />
+<TGConnectingPoint num="6" id="1876" />
+<TGConnectingPoint num="7" id="1877" />
+<TGConnectingPoint num="8" id="1878" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="623" id="1888" >
<father id="1958" num="3" />
-<cdparam x="516" y="161" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="341" />
+<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1857" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1860" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
+<infoparam name="action state" value="timerValue = 59" />
+<TGConnectingPoint num="0" id="1880" />
+<TGConnectingPoint num="1" id="1881" />
+<TGConnectingPoint num="2" id="1882" />
+<TGConnectingPoint num="3" id="1883" />
+<TGConnectingPoint num="4" id="1884" />
+<TGConnectingPoint num="5" id="1885" />
+<TGConnectingPoint num="6" id="1886" />
+<TGConnectingPoint num="7" id="1887" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="623" id="1897" >
<father id="1958" num="4" />
-<cdparam x="516" y="177" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="292" />
+<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1859" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1862" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
+<infoparam name="action state" value="timerValue = 60" />
+<TGConnectingPoint num="0" id="1889" />
+<TGConnectingPoint num="1" id="1890" />
+<TGConnectingPoint num="2" id="1891" />
+<TGConnectingPoint num="3" id="1892" />
+<TGConnectingPoint num="4" id="1893" />
+<TGConnectingPoint num="5" id="1894" />
+<TGConnectingPoint num="6" id="1895" />
+<TGConnectingPoint num="7" id="1896" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1899" >
<father id="1958" num="5" />
-<cdparam x="516" y="194" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1861" />
+<TGConnectingPoint num="0" id="1898" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1864" >
+<SUBCOMPONENT type="630" id="1901" >
<father id="1958" num="6" />
-<cdparam x="516" y="211" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1863" />
+<TGConnectingPoint num="0" id="1900" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1866" >
+<SUBCOMPONENT type="630" id="1903" >
<father id="1958" num="7" />
-<cdparam x="516" y="227" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1865" />
+<TGConnectingPoint num="0" id="1902" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1868" >
+<SUBCOMPONENT type="630" id="1905" >
<father id="1958" num="8" />
-<cdparam x="516" y="244" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1867" />
+<TGConnectingPoint num="0" id="1904" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1870" >
+<SUBCOMPONENT type="630" id="1907" >
<father id="1958" num="9" />
-<cdparam x="516" y="261" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1869" />
+<TGConnectingPoint num="0" id="1906" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1872" >
+<SUBCOMPONENT type="630" id="1909" >
<father id="1958" num="10" />
-<cdparam x="516" y="277" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1871" />
+<TGConnectingPoint num="0" id="1908" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1874" >
+<SUBCOMPONENT type="630" id="1911" >
<father id="1958" num="11" />
-<cdparam x="516" y="294" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1873" />
+<TGConnectingPoint num="0" id="1910" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1876" >
+<SUBCOMPONENT type="630" id="1913" >
<father id="1958" num="12" />
-<cdparam x="516" y="311" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1875" />
+<TGConnectingPoint num="0" id="1912" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1878" >
+<SUBCOMPONENT type="630" id="1915" >
<father id="1958" num="13" />
-<cdparam x="516" y="327" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1877" />
+<TGConnectingPoint num="0" id="1914" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1880" >
+<SUBCOMPONENT type="630" id="1917" >
<father id="1958" num="14" />
-<cdparam x="516" y="344" />
+<cdparam x="516" y="436" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1879" />
+<TGConnectingPoint num="0" id="1916" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1882" >
+<SUBCOMPONENT type="630" id="1919" >
<father id="1958" num="15" />
-<cdparam x="516" y="361" />
+<cdparam x="516" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1881" />
+<TGConnectingPoint num="0" id="1918" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1884" >
+<SUBCOMPONENT type="630" id="1921" >
<father id="1958" num="16" />
-<cdparam x="516" y="377" />
+<cdparam x="516" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1883" />
+<TGConnectingPoint num="0" id="1920" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1886" >
+<SUBCOMPONENT type="630" id="1923" >
<father id="1958" num="17" />
<cdparam x="516" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1885" />
+<TGConnectingPoint num="0" id="1922" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1888" >
+<SUBCOMPONENT type="630" id="1925" >
<father id="1958" num="18" />
-<cdparam x="516" y="410" />
+<cdparam x="516" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1887" />
+<TGConnectingPoint num="0" id="1924" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1890" >
+<SUBCOMPONENT type="630" id="1927" >
<father id="1958" num="19" />
-<cdparam x="516" y="427" />
+<cdparam x="516" y="361" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1889" />
+<TGConnectingPoint num="0" id="1926" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="1892" >
+<SUBCOMPONENT type="630" id="1929" >
<father id="1958" num="20" />
-<cdparam x="516" y="436" />
+<cdparam x="516" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<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="436" />
+<cdparam x="516" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<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="436" />
+<cdparam x="516" y="311" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<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="436" />
+<cdparam x="516" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<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="436" />
+<cdparam x="516" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<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="436" />
+<cdparam x="516" y="261" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<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="436" />
+<cdparam x="516" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<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="436" />
+<cdparam x="516" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<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="436" />
+<cdparam x="516" y="211" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<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="436" />
+<cdparam x="516" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="1909" />
+<TGConnectingPoint num="0" id="1946" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1919" >
+<SUBCOMPONENT type="630" id="1949" >
<father id="1958" num="30" />
-<cdparam x="516" y="292" />
-<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="177" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
-<infoparam name="action state" value="timerValue = 60" />
-<TGConnectingPoint num="0" id="1911" />
-<TGConnectingPoint num="1" id="1912" />
-<TGConnectingPoint num="2" id="1913" />
-<TGConnectingPoint num="3" id="1914" />
-<TGConnectingPoint num="4" id="1915" />
-<TGConnectingPoint num="5" id="1916" />
-<TGConnectingPoint num="6" id="1917" />
-<TGConnectingPoint num="7" id="1918" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1928" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1948" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1951" >
<father id="1958" num="31" />
-<cdparam x="516" y="341" />
-<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="161" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
-<infoparam name="action state" value="timerValue = 59" />
-<TGConnectingPoint num="0" id="1920" />
-<TGConnectingPoint num="1" id="1921" />
-<TGConnectingPoint num="2" id="1922" />
-<TGConnectingPoint num="3" id="1923" />
-<TGConnectingPoint num="4" id="1924" />
-<TGConnectingPoint num="5" id="1925" />
-<TGConnectingPoint num="6" id="1926" />
-<TGConnectingPoint num="7" id="1927" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="622" id="1938" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1950" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1953" >
<father id="1958" num="32" />
-<cdparam x="476" y="292" />
-<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="144" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="355" />
-<infoparam name="Line of relative time constraint" value="rtc" />
-<TGConnectingPoint num="0" id="1929" />
-<TGConnectingPoint num="1" id="1930" />
-<TGConnectingPoint num="2" id="1931" />
-<TGConnectingPoint num="3" id="1932" />
-<TGConnectingPoint num="4" id="1933" />
-<TGConnectingPoint num="5" id="1934" />
-<TGConnectingPoint num="6" id="1935" />
-<TGConnectingPoint num="7" id="1936" />
-<TGConnectingPoint num="8" id="1937" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="622" id="1948" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1952" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1955" >
<father id="1958" num="33" />
-<cdparam x="476" y="342" />
-<sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="127" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="-35" maxX="5" minY="10" maxY="355" />
-<infoparam name="Line of relative time constraint" value="rtc" />
-<TGConnectingPoint num="0" id="1939" />
-<TGConnectingPoint num="1" id="1940" />
-<TGConnectingPoint num="2" id="1941" />
-<TGConnectingPoint num="3" id="1942" />
-<TGConnectingPoint num="4" id="1943" />
-<TGConnectingPoint num="5" id="1944" />
-<TGConnectingPoint num="6" id="1945" />
-<TGConnectingPoint num="7" id="1946" />
-<TGConnectingPoint num="8" id="1947" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="623" id="1957" >
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1954" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="630" id="1957" >
<father id="1958" num="34" />
-<cdparam x="516" y="431" />
-<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="111" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="335" />
-<infoparam name="action state" value="timerValue = 60" />
-<TGConnectingPoint num="0" id="1949" />
-<TGConnectingPoint num="1" id="1950" />
-<TGConnectingPoint num="2" id="1951" />
-<TGConnectingPoint num="3" id="1952" />
-<TGConnectingPoint num="4" id="1953" />
-<TGConnectingPoint num="5" id="1954" />
-<TGConnectingPoint num="6" id="1955" />
-<TGConnectingPoint num="7" id="1956" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="1956" />
</SUBCOMPONENT>
<COMPONENT type="620" id="2019" >
@@ -4306,7 +4307,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="1960" >
<father id="2019" num="0" />
-<cdparam x="716" y="104" />
+<cdparam x="716" y="110" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4315,7 +4316,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1962" >
<father id="2019" num="1" />
-<cdparam x="716" y="434" />
+<cdparam x="716" y="127" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4324,7 +4325,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1964" >
<father id="2019" num="2" />
-<cdparam x="716" y="434" />
+<cdparam x="716" y="144" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4333,7 +4334,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1966" >
<father id="2019" num="3" />
-<cdparam x="716" y="434" />
+<cdparam x="716" y="160" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4342,7 +4343,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1968" >
<father id="2019" num="4" />
-<cdparam x="716" y="434" />
+<cdparam x="716" y="177" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4351,7 +4352,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1970" >
<father id="2019" num="5" />
-<cdparam x="716" y="434" />
+<cdparam x="716" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4360,7 +4361,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1972" >
<father id="2019" num="6" />
-<cdparam x="716" y="434" />
+<cdparam x="716" y="210" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4369,7 +4370,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1974" >
<father id="2019" num="7" />
-<cdparam x="716" y="434" />
+<cdparam x="716" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4378,7 +4379,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1976" >
<father id="2019" num="8" />
-<cdparam x="716" y="434" />
+<cdparam x="716" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4387,7 +4388,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1978" >
<father id="2019" num="9" />
-<cdparam x="716" y="434" />
+<cdparam x="716" y="261" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4396,7 +4397,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1980" >
<father id="2019" num="10" />
-<cdparam x="716" y="427" />
+<cdparam x="716" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4405,7 +4406,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1982" >
<father id="2019" num="11" />
-<cdparam x="716" y="410" />
+<cdparam x="716" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4414,7 +4415,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1984" >
<father id="2019" num="12" />
-<cdparam x="716" y="394" />
+<cdparam x="716" y="310" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4423,7 +4424,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1986" >
<father id="2019" num="13" />
-<cdparam x="716" y="377" />
+<cdparam x="716" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4432,7 +4433,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1988" >
<father id="2019" num="14" />
-<cdparam x="716" y="360" />
+<cdparam x="716" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4441,7 +4442,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1990" >
<father id="2019" num="15" />
-<cdparam x="716" y="344" />
+<cdparam x="716" y="360" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4450,7 +4451,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1992" >
<father id="2019" num="16" />
-<cdparam x="716" y="327" />
+<cdparam x="716" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4459,7 +4460,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1994" >
<father id="2019" num="17" />
-<cdparam x="716" y="310" />
+<cdparam x="716" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4468,7 +4469,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1996" >
<father id="2019" num="18" />
-<cdparam x="716" y="294" />
+<cdparam x="716" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4477,7 +4478,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="1998" >
<father id="2019" num="19" />
-<cdparam x="716" y="277" />
+<cdparam x="716" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4486,7 +4487,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2000" >
<father id="2019" num="20" />
-<cdparam x="716" y="261" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4495,7 +4496,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2002" >
<father id="2019" num="21" />
-<cdparam x="716" y="244" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4504,7 +4505,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2004" >
<father id="2019" num="22" />
-<cdparam x="716" y="227" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4513,7 +4514,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2006" >
<father id="2019" num="23" />
-<cdparam x="716" y="210" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4522,7 +4523,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2008" >
<father id="2019" num="24" />
-<cdparam x="716" y="194" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4531,7 +4532,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2010" >
<father id="2019" num="25" />
-<cdparam x="716" y="177" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4540,7 +4541,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2012" >
<father id="2019" num="26" />
-<cdparam x="716" y="160" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4549,7 +4550,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2014" >
<father id="2019" num="27" />
-<cdparam x="716" y="144" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4558,7 +4559,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2016" >
<father id="2019" num="28" />
-<cdparam x="716" y="127" />
+<cdparam x="716" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4567,7 +4568,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2018" >
<father id="2019" num="29" />
-<cdparam x="716" y="110" />
+<cdparam x="716" y="104" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4587,7 +4588,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="2021" >
<father id="2080" num="0" />
-<cdparam x="309" y="104" />
+<cdparam x="309" y="110" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4596,7 +4597,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2023" >
<father id="2080" num="1" />
-<cdparam x="309" y="434" />
+<cdparam x="309" y="127" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4605,7 +4606,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2025" >
<father id="2080" num="2" />
-<cdparam x="309" y="434" />
+<cdparam x="309" y="144" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4614,7 +4615,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2027" >
<father id="2080" num="3" />
-<cdparam x="309" y="434" />
+<cdparam x="309" y="160" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4623,7 +4624,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2029" >
<father id="2080" num="4" />
-<cdparam x="309" y="434" />
+<cdparam x="309" y="177" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4632,7 +4633,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2031" >
<father id="2080" num="5" />
-<cdparam x="309" y="434" />
+<cdparam x="309" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4641,7 +4642,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2033" >
<father id="2080" num="6" />
-<cdparam x="309" y="434" />
+<cdparam x="309" y="210" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4650,7 +4651,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2035" >
<father id="2080" num="7" />
-<cdparam x="309" y="434" />
+<cdparam x="309" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4659,7 +4660,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2037" >
<father id="2080" num="8" />
-<cdparam x="309" y="434" />
+<cdparam x="309" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4668,7 +4669,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2039" >
<father id="2080" num="9" />
-<cdparam x="309" y="434" />
+<cdparam x="309" y="256" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4677,7 +4678,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2041" >
<father id="2080" num="10" />
-<cdparam x="309" y="427" />
+<cdparam x="309" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4686,7 +4687,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2043" >
<father id="2080" num="11" />
-<cdparam x="309" y="410" />
+<cdparam x="309" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4695,7 +4696,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2045" >
<father id="2080" num="12" />
-<cdparam x="309" y="394" />
+<cdparam x="309" y="310" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4704,7 +4705,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2047" >
<father id="2080" num="13" />
-<cdparam x="309" y="377" />
+<cdparam x="309" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4713,7 +4714,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2049" >
<father id="2080" num="14" />
-<cdparam x="309" y="360" />
+<cdparam x="309" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4722,7 +4723,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2051" >
<father id="2080" num="15" />
-<cdparam x="309" y="344" />
+<cdparam x="309" y="360" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4731,7 +4732,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2053" >
<father id="2080" num="16" />
-<cdparam x="309" y="327" />
+<cdparam x="309" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4740,7 +4741,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2055" >
<father id="2080" num="17" />
-<cdparam x="309" y="310" />
+<cdparam x="309" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4749,7 +4750,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2057" >
<father id="2080" num="18" />
-<cdparam x="309" y="294" />
+<cdparam x="309" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4758,7 +4759,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2059" >
<father id="2080" num="19" />
-<cdparam x="309" y="277" />
+<cdparam x="309" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4767,7 +4768,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2061" >
<father id="2080" num="20" />
-<cdparam x="309" y="256" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4776,7 +4777,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2063" >
<father id="2080" num="21" />
-<cdparam x="309" y="244" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4785,7 +4786,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2065" >
<father id="2080" num="22" />
-<cdparam x="309" y="227" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4794,7 +4795,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2067" >
<father id="2080" num="23" />
-<cdparam x="309" y="210" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4803,7 +4804,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2069" >
<father id="2080" num="24" />
-<cdparam x="309" y="194" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4812,7 +4813,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2071" >
<father id="2080" num="25" />
-<cdparam x="309" y="177" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4821,7 +4822,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2073" >
<father id="2080" num="26" />
-<cdparam x="309" y="160" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4830,7 +4831,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2075" >
<father id="2080" num="27" />
-<cdparam x="309" y="144" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4839,7 +4840,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2077" >
<father id="2080" num="28" />
-<cdparam x="309" y="127" />
+<cdparam x="309" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4848,7 +4849,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2079" >
<father id="2080" num="29" />
-<cdparam x="309" y="110" />
+<cdparam x="309" y="104" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4868,7 +4869,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="2082" >
<father id="2141" num="0" />
-<cdparam x="131" y="104" />
+<cdparam x="131" y="110" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4877,7 +4878,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2084" >
<father id="2141" num="1" />
-<cdparam x="131" y="434" />
+<cdparam x="131" y="127" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4886,7 +4887,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2086" >
<father id="2141" num="2" />
-<cdparam x="131" y="434" />
+<cdparam x="131" y="144" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4895,7 +4896,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2088" >
<father id="2141" num="3" />
-<cdparam x="131" y="434" />
+<cdparam x="131" y="160" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4904,7 +4905,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2090" >
<father id="2141" num="4" />
-<cdparam x="131" y="434" />
+<cdparam x="131" y="177" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4913,7 +4914,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2092" >
<father id="2141" num="5" />
-<cdparam x="131" y="434" />
+<cdparam x="131" y="194" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4922,7 +4923,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2094" >
<father id="2141" num="6" />
-<cdparam x="131" y="434" />
+<cdparam x="131" y="210" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4931,7 +4932,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2096" >
<father id="2141" num="7" />
-<cdparam x="131" y="434" />
+<cdparam x="131" y="227" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4940,7 +4941,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2098" >
<father id="2141" num="8" />
-<cdparam x="131" y="434" />
+<cdparam x="131" y="244" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4949,7 +4950,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2100" >
<father id="2141" num="9" />
-<cdparam x="131" y="434" />
+<cdparam x="131" y="260" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4958,7 +4959,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2102" >
<father id="2141" num="10" />
-<cdparam x="131" y="427" />
+<cdparam x="131" y="277" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4967,7 +4968,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2104" >
<father id="2141" num="11" />
-<cdparam x="131" y="410" />
+<cdparam x="131" y="294" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4976,7 +4977,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2106" >
<father id="2141" num="12" />
-<cdparam x="131" y="394" />
+<cdparam x="131" y="310" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4985,7 +4986,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2108" >
<father id="2141" num="13" />
-<cdparam x="131" y="377" />
+<cdparam x="131" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -4994,7 +4995,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2110" >
<father id="2141" num="14" />
-<cdparam x="131" y="360" />
+<cdparam x="131" y="344" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5003,7 +5004,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2112" >
<father id="2141" num="15" />
-<cdparam x="131" y="344" />
+<cdparam x="131" y="360" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5012,7 +5013,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2114" >
<father id="2141" num="16" />
-<cdparam x="131" y="327" />
+<cdparam x="131" y="377" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5021,7 +5022,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2116" >
<father id="2141" num="17" />
-<cdparam x="131" y="310" />
+<cdparam x="131" y="394" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5030,7 +5031,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2118" >
<father id="2141" num="18" />
-<cdparam x="131" y="294" />
+<cdparam x="131" y="410" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5039,7 +5040,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2120" >
<father id="2141" num="19" />
-<cdparam x="131" y="277" />
+<cdparam x="131" y="427" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5048,7 +5049,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2122" >
<father id="2141" num="20" />
-<cdparam x="131" y="260" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5057,7 +5058,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2124" >
<father id="2141" num="21" />
-<cdparam x="131" y="244" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5066,7 +5067,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2126" >
<father id="2141" num="22" />
-<cdparam x="131" y="227" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5075,7 +5076,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2128" >
<father id="2141" num="23" />
-<cdparam x="131" y="210" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5084,7 +5085,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2130" >
<father id="2141" num="24" />
-<cdparam x="131" y="194" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5093,7 +5094,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2132" >
<father id="2141" num="25" />
-<cdparam x="131" y="177" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5102,7 +5103,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2134" >
<father id="2141" num="26" />
-<cdparam x="131" y="160" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5111,7 +5112,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2136" >
<father id="2141" num="27" />
-<cdparam x="131" y="144" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5120,7 +5121,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2138" >
<father id="2141" num="28" />
-<cdparam x="131" y="127" />
+<cdparam x="131" y="434" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5129,7 +5130,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2140" >
<father id="2141" num="29" />
-<cdparam x="131" y="110" />
+<cdparam x="131" y="104" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="340" />
@@ -5141,8 +5142,8 @@
<cdparam x="486" y="292" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="relative time constraint" value="{1..1}" />
-<P1 x="486" y="292" id="1929" />
-<P2 x="486" y="342" id="1939" />
+<P1 x="486" y="292" id="1870" />
+<P2 x="486" y="342" id="1860" />
<AutomaticDrawing data="true" />
<extraparam>
<Interval minConstraint="1" maxConstraint="1" />
@@ -5152,64 +5153,64 @@
<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="2144" >
<cdparam x="131" y="401" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="131" y="401" id="2105" />
-<P2 x="309" y="401" id="2044" />
+<P1 x="131" y="401" id="2115" />
+<P2 x="309" y="401" id="2054" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2145" >
<cdparam x="516" y="268" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="start" />
-<P1 x="516" y="268" id="1869" />
-<P2 x="716" y="268" id="1999" />
+<P1 x="516" y="268" id="1938" />
+<P2 x="716" y="268" id="1977" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2146" >
<cdparam x="309" y="251" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="start" />
-<P1 x="309" y="251" id="2062" />
-<P2 x="516" y="251" id="1867" />
+<P1 x="309" y="251" id="2036" />
+<P2 x="516" y="251" id="1940" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2147" >
<cdparam x="131" y="234" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(21)" />
-<P1 x="131" y="234" id="2125" />
-<P2 x="309" y="234" id="2064" />
+<P1 x="131" y="234" id="2095" />
+<P2 x="309" y="234" id="2034" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2148" >
<cdparam x="131" y="201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(18)" />
-<P1 x="131" y="201" id="2129" />
-<P2 x="309" y="201" id="2068" />
+<P1 x="131" y="201" id="2091" />
+<P2 x="309" y="201" id="2030" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2149" >
<cdparam x="131" y="167" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure19" />
-<P1 x="131" y="167" id="2133" />
-<P2 x="309" y="167" id="2072" />
+<P1 x="131" y="167" id="2087" />
+<P2 x="309" y="167" id="2026" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="107" id="2150" >
<cdparam x="131" y="134" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="pressure(19)" />
-<P1 x="131" y="134" id="2137" />
-<P2 x="309" y="134" id="2076" />
+<P1 x="131" y="134" id="2083" />
+<P2 x="309" y="134" id="2022" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -7035,7 +7036,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="2986" >
<father id="3045" num="0" />
-<cdparam x="606" y="112" />
+<cdparam x="606" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7044,7 +7045,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2988" >
<father id="3045" num="1" />
-<cdparam x="606" y="129" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7053,7 +7054,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2990" >
<father id="3045" num="2" />
-<cdparam x="606" y="146" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7062,7 +7063,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2992" >
<father id="3045" num="3" />
-<cdparam x="606" y="162" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7071,7 +7072,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2994" >
<father id="3045" num="4" />
-<cdparam x="606" y="179" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7080,7 +7081,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2996" >
<father id="3045" num="5" />
-<cdparam x="606" y="196" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7089,7 +7090,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="2998" >
<father id="3045" num="6" />
-<cdparam x="606" y="212" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7098,7 +7099,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3000" >
<father id="3045" num="7" />
-<cdparam x="606" y="229" />
+<cdparam x="606" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7107,7 +7108,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3002" >
<father id="3045" num="8" />
-<cdparam x="606" y="246" />
+<cdparam x="606" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7116,7 +7117,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3004" >
<father id="3045" num="9" />
-<cdparam x="606" y="262" />
+<cdparam x="606" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7125,7 +7126,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3006" >
<father id="3045" num="10" />
-<cdparam x="606" y="279" />
+<cdparam x="606" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7134,7 +7135,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3008" >
<father id="3045" num="11" />
-<cdparam x="606" y="296" />
+<cdparam x="606" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7143,7 +7144,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3010" >
<father id="3045" num="12" />
-<cdparam x="606" y="312" />
+<cdparam x="606" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7152,7 +7153,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3012" >
<father id="3045" num="13" />
-<cdparam x="606" y="329" />
+<cdparam x="606" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7161,7 +7162,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3014" >
<father id="3045" num="14" />
-<cdparam x="606" y="346" />
+<cdparam x="606" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7170,7 +7171,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3016" >
<father id="3045" num="15" />
-<cdparam x="606" y="362" />
+<cdparam x="606" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7179,7 +7180,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3018" >
<father id="3045" num="16" />
-<cdparam x="606" y="379" />
+<cdparam x="606" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7188,7 +7189,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3020" >
<father id="3045" num="17" />
-<cdparam x="606" y="396" />
+<cdparam x="606" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7197,7 +7198,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3022" >
<father id="3045" num="18" />
-<cdparam x="606" y="412" />
+<cdparam x="606" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7206,7 +7207,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3024" >
<father id="3045" num="19" />
-<cdparam x="606" y="429" />
+<cdparam x="606" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7215,7 +7216,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3026" >
<father id="3045" num="20" />
-<cdparam x="606" y="446" />
+<cdparam x="606" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7224,7 +7225,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3028" >
<father id="3045" num="21" />
-<cdparam x="606" y="462" />
+<cdparam x="606" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7233,7 +7234,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3030" >
<father id="3045" num="22" />
-<cdparam x="606" y="475" />
+<cdparam x="606" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7242,7 +7243,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3032" >
<father id="3045" num="23" />
-<cdparam x="606" y="475" />
+<cdparam x="606" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7251,7 +7252,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3034" >
<father id="3045" num="24" />
-<cdparam x="606" y="475" />
+<cdparam x="606" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7260,7 +7261,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3036" >
<father id="3045" num="25" />
-<cdparam x="606" y="475" />
+<cdparam x="606" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7269,7 +7270,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3038" >
<father id="3045" num="26" />
-<cdparam x="606" y="475" />
+<cdparam x="606" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7278,7 +7279,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3040" >
<father id="3045" num="27" />
-<cdparam x="606" y="475" />
+<cdparam x="606" y="146" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7287,7 +7288,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3042" >
<father id="3045" num="28" />
-<cdparam x="606" y="475" />
+<cdparam x="606" y="129" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7296,7 +7297,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3044" >
<father id="3045" num="29" />
-<cdparam x="606" y="106" />
+<cdparam x="606" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7316,7 +7317,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3047" >
<father id="3106" num="0" />
-<cdparam x="456" y="112" />
+<cdparam x="456" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7325,7 +7326,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3049" >
<father id="3106" num="1" />
-<cdparam x="456" y="129" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7334,7 +7335,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3051" >
<father id="3106" num="2" />
-<cdparam x="456" y="146" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7343,7 +7344,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3053" >
<father id="3106" num="3" />
-<cdparam x="456" y="162" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7352,7 +7353,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3055" >
<father id="3106" num="4" />
-<cdparam x="456" y="179" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7361,7 +7362,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3057" >
<father id="3106" num="5" />
-<cdparam x="456" y="196" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7370,7 +7371,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3059" >
<father id="3106" num="6" />
-<cdparam x="456" y="212" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7379,7 +7380,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3061" >
<father id="3106" num="7" />
-<cdparam x="456" y="229" />
+<cdparam x="456" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7388,7 +7389,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3063" >
<father id="3106" num="8" />
-<cdparam x="456" y="246" />
+<cdparam x="456" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7397,7 +7398,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3065" >
<father id="3106" num="9" />
-<cdparam x="456" y="262" />
+<cdparam x="456" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7406,7 +7407,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3067" >
<father id="3106" num="10" />
-<cdparam x="456" y="279" />
+<cdparam x="456" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7415,7 +7416,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3069" >
<father id="3106" num="11" />
-<cdparam x="456" y="296" />
+<cdparam x="456" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7424,7 +7425,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3071" >
<father id="3106" num="12" />
-<cdparam x="456" y="312" />
+<cdparam x="456" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7433,7 +7434,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3073" >
<father id="3106" num="13" />
-<cdparam x="456" y="329" />
+<cdparam x="456" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7442,7 +7443,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3075" >
<father id="3106" num="14" />
-<cdparam x="456" y="346" />
+<cdparam x="456" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7451,7 +7452,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3077" >
<father id="3106" num="15" />
-<cdparam x="456" y="362" />
+<cdparam x="456" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7460,7 +7461,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3079" >
<father id="3106" num="16" />
-<cdparam x="456" y="379" />
+<cdparam x="456" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7469,7 +7470,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3081" >
<father id="3106" num="17" />
-<cdparam x="456" y="396" />
+<cdparam x="456" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7478,7 +7479,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3083" >
<father id="3106" num="18" />
-<cdparam x="456" y="412" />
+<cdparam x="456" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7487,7 +7488,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3085" >
<father id="3106" num="19" />
-<cdparam x="456" y="429" />
+<cdparam x="456" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7496,7 +7497,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3087" >
<father id="3106" num="20" />
-<cdparam x="456" y="446" />
+<cdparam x="456" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7505,7 +7506,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3089" >
<father id="3106" num="21" />
-<cdparam x="456" y="462" />
+<cdparam x="456" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7514,7 +7515,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3091" >
<father id="3106" num="22" />
-<cdparam x="456" y="475" />
+<cdparam x="456" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7523,7 +7524,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3093" >
<father id="3106" num="23" />
-<cdparam x="456" y="475" />
+<cdparam x="456" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7532,7 +7533,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3095" >
<father id="3106" num="24" />
-<cdparam x="456" y="475" />
+<cdparam x="456" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7541,7 +7542,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3097" >
<father id="3106" num="25" />
-<cdparam x="456" y="475" />
+<cdparam x="456" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7550,7 +7551,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3099" >
<father id="3106" num="26" />
-<cdparam x="456" y="475" />
+<cdparam x="456" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7559,7 +7560,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3101" >
<father id="3106" num="27" />
-<cdparam x="456" y="475" />
+<cdparam x="456" y="146" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7568,7 +7569,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3103" >
<father id="3106" num="28" />
-<cdparam x="456" y="475" />
+<cdparam x="456" y="129" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7577,7 +7578,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3105" >
<father id="3106" num="29" />
-<cdparam x="456" y="106" />
+<cdparam x="456" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7597,306 +7598,306 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3108" >
<father id="3185" num="0" />
-<cdparam x="306" y="112" />
+<cdparam x="306" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="3107" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3110" >
+<SUBCOMPONENT type="627" id="3117" >
<father id="3185" num="1" />
-<cdparam x="306" y="129" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="319" y="391" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
-<infoparam name="port" value="port" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="382" />
+<infoparam name="timer expiration" value="{timer=timerAlarm}" />
<TGConnectingPoint num="0" id="3109" />
+<TGConnectingPoint num="1" id="3110" />
+<TGConnectingPoint num="2" id="3111" />
+<TGConnectingPoint num="3" id="3112" />
+<TGConnectingPoint num="4" id="3113" />
+<TGConnectingPoint num="5" id="3114" />
+<TGConnectingPoint num="6" id="3115" />
+<TGConnectingPoint num="7" id="3116" />
+<extraparam>
+<Interval timer="timerAlarm" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3112" >
+<SUBCOMPONENT type="625" id="3126" >
<father id="3185" num="2" />
-<cdparam x="306" y="146" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="319" y="296" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3111" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="382" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
+<TGConnectingPoint num="0" id="3118" />
+<TGConnectingPoint num="1" id="3119" />
+<TGConnectingPoint num="2" id="3120" />
+<TGConnectingPoint num="3" id="3121" />
+<TGConnectingPoint num="4" id="3122" />
+<TGConnectingPoint num="5" id="3123" />
+<TGConnectingPoint num="6" id="3124" />
+<TGConnectingPoint num="7" id="3125" />
+<extraparam>
+<Interval timer="timerAlarm" duration="60" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3114" >
+<SUBCOMPONENT type="630" id="3128" >
<father id="3185" num="3" />
-<cdparam x="306" y="162" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3113" />
+<TGConnectingPoint num="0" id="3127" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3116" >
+<SUBCOMPONENT type="630" id="3130" >
<father id="3185" num="4" />
-<cdparam x="306" y="179" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3115" />
+<TGConnectingPoint num="0" id="3129" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3118" >
+<SUBCOMPONENT type="630" id="3132" >
<father id="3185" num="5" />
-<cdparam x="306" y="196" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3117" />
+<TGConnectingPoint num="0" id="3131" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3120" >
+<SUBCOMPONENT type="630" id="3134" >
<father id="3185" num="6" />
-<cdparam x="306" y="212" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3119" />
+<TGConnectingPoint num="0" id="3133" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3122" >
+<SUBCOMPONENT type="630" id="3136" >
<father id="3185" num="7" />
-<cdparam x="306" y="229" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3121" />
+<TGConnectingPoint num="0" id="3135" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3124" >
+<SUBCOMPONENT type="630" id="3138" >
<father id="3185" num="8" />
-<cdparam x="306" y="246" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3123" />
+<TGConnectingPoint num="0" id="3137" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3126" >
+<SUBCOMPONENT type="630" id="3140" >
<father id="3185" num="9" />
-<cdparam x="306" y="262" />
+<cdparam x="306" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3125" />
+<TGConnectingPoint num="0" id="3139" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3128" >
+<SUBCOMPONENT type="630" id="3142" >
<father id="3185" num="10" />
-<cdparam x="306" y="279" />
+<cdparam x="306" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3127" />
+<TGConnectingPoint num="0" id="3141" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3130" >
+<SUBCOMPONENT type="630" id="3144" >
<father id="3185" num="11" />
-<cdparam x="306" y="296" />
+<cdparam x="306" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3129" />
+<TGConnectingPoint num="0" id="3143" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3132" >
+<SUBCOMPONENT type="630" id="3146" >
<father id="3185" num="12" />
-<cdparam x="306" y="312" />
+<cdparam x="306" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3131" />
+<TGConnectingPoint num="0" id="3145" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3134" >
+<SUBCOMPONENT type="630" id="3148" >
<father id="3185" num="13" />
-<cdparam x="306" y="329" />
+<cdparam x="306" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3133" />
+<TGConnectingPoint num="0" id="3147" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3136" >
+<SUBCOMPONENT type="630" id="3150" >
<father id="3185" num="14" />
-<cdparam x="306" y="346" />
+<cdparam x="306" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3135" />
+<TGConnectingPoint num="0" id="3149" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3138" >
+<SUBCOMPONENT type="630" id="3152" >
<father id="3185" num="15" />
-<cdparam x="306" y="362" />
+<cdparam x="306" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3137" />
+<TGConnectingPoint num="0" id="3151" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3140" >
+<SUBCOMPONENT type="630" id="3154" >
<father id="3185" num="16" />
-<cdparam x="306" y="379" />
+<cdparam x="306" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3139" />
+<TGConnectingPoint num="0" id="3153" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3142" >
+<SUBCOMPONENT type="630" id="3156" >
<father id="3185" num="17" />
-<cdparam x="306" y="396" />
+<cdparam x="306" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3141" />
+<TGConnectingPoint num="0" id="3155" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3144" >
+<SUBCOMPONENT type="630" id="3158" >
<father id="3185" num="18" />
-<cdparam x="306" y="412" />
+<cdparam x="306" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3143" />
+<TGConnectingPoint num="0" id="3157" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3146" >
+<SUBCOMPONENT type="630" id="3160" >
<father id="3185" num="19" />
-<cdparam x="306" y="429" />
+<cdparam x="306" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3145" />
+<TGConnectingPoint num="0" id="3159" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3148" >
+<SUBCOMPONENT type="630" id="3162" >
<father id="3185" num="20" />
-<cdparam x="306" y="446" />
+<cdparam x="306" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3147" />
+<TGConnectingPoint num="0" id="3161" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3150" >
+<SUBCOMPONENT type="630" id="3164" >
<father id="3185" num="21" />
-<cdparam x="306" y="462" />
+<cdparam x="306" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3149" />
+<TGConnectingPoint num="0" id="3163" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3152" >
+<SUBCOMPONENT type="630" id="3166" >
<father id="3185" num="22" />
-<cdparam x="306" y="475" />
+<cdparam x="306" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<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="475" />
+<cdparam x="306" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<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="475" />
+<cdparam x="306" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<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="475" />
+<cdparam x="306" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<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="475" />
+<cdparam x="306" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<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="475" />
+<cdparam x="306" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<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="475" />
+<cdparam x="306" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3163" />
+<TGConnectingPoint num="0" id="3177" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="625" id="3173" >
+<SUBCOMPONENT type="630" id="3180" >
<father id="3185" num="29" />
-<cdparam x="319" y="296" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="306" y="146" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="382" />
-<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
-<TGConnectingPoint num="0" id="3165" />
-<TGConnectingPoint num="1" id="3166" />
-<TGConnectingPoint num="2" id="3167" />
-<TGConnectingPoint num="3" id="3168" />
-<TGConnectingPoint num="4" id="3169" />
-<TGConnectingPoint num="5" id="3170" />
-<TGConnectingPoint num="6" id="3171" />
-<TGConnectingPoint num="7" id="3172" />
-<extraparam>
-<Interval timer="timerAlarm" duration="60" />
-</extraparam>
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="3179" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="3182" >
+<SUBCOMPONENT type="630" id="3182" >
<father id="3185" num="30" />
-<cdparam x="319" y="391" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="306" y="129" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="382" />
-<infoparam name="timer expiration" value="{timer=timerAlarm}" />
-<TGConnectingPoint num="0" id="3174" />
-<TGConnectingPoint num="1" id="3175" />
-<TGConnectingPoint num="2" id="3176" />
-<TGConnectingPoint num="3" id="3177" />
-<TGConnectingPoint num="4" id="3178" />
-<TGConnectingPoint num="5" id="3179" />
-<TGConnectingPoint num="6" id="3180" />
-<TGConnectingPoint num="7" id="3181" />
-<extraparam>
-<Interval timer="timerAlarm" />
-</extraparam>
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="3181" />
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3184" >
<father id="3185" num="31" />
-<cdparam x="306" y="106" />
+<cdparam x="306" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7916,7 +7917,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3187" >
<father id="3246" num="0" />
-<cdparam x="156" y="112" />
+<cdparam x="156" y="106" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7925,7 +7926,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3189" >
<father id="3246" num="1" />
-<cdparam x="156" y="129" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7934,7 +7935,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3191" >
<father id="3246" num="2" />
-<cdparam x="156" y="146" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7943,7 +7944,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3193" >
<father id="3246" num="3" />
-<cdparam x="156" y="162" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7952,7 +7953,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3195" >
<father id="3246" num="4" />
-<cdparam x="156" y="179" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7961,7 +7962,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3197" >
<father id="3246" num="5" />
-<cdparam x="156" y="196" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7970,7 +7971,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3199" >
<father id="3246" num="6" />
-<cdparam x="156" y="212" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7979,7 +7980,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3201" >
<father id="3246" num="7" />
-<cdparam x="156" y="229" />
+<cdparam x="156" y="475" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7988,7 +7989,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3203" >
<father id="3246" num="8" />
-<cdparam x="156" y="246" />
+<cdparam x="156" y="462" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -7997,7 +7998,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3205" >
<father id="3246" num="9" />
-<cdparam x="156" y="262" />
+<cdparam x="156" y="446" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8006,7 +8007,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3207" >
<father id="3246" num="10" />
-<cdparam x="156" y="279" />
+<cdparam x="156" y="429" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8015,7 +8016,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3209" >
<father id="3246" num="11" />
-<cdparam x="156" y="296" />
+<cdparam x="156" y="412" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8024,7 +8025,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3211" >
<father id="3246" num="12" />
-<cdparam x="156" y="312" />
+<cdparam x="156" y="396" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8033,7 +8034,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3213" >
<father id="3246" num="13" />
-<cdparam x="156" y="329" />
+<cdparam x="156" y="379" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8042,7 +8043,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3215" >
<father id="3246" num="14" />
-<cdparam x="156" y="346" />
+<cdparam x="156" y="362" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8051,7 +8052,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3217" >
<father id="3246" num="15" />
-<cdparam x="156" y="362" />
+<cdparam x="156" y="346" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8060,7 +8061,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3219" >
<father id="3246" num="16" />
-<cdparam x="156" y="379" />
+<cdparam x="156" y="329" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8069,7 +8070,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3221" >
<father id="3246" num="17" />
-<cdparam x="156" y="396" />
+<cdparam x="156" y="312" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8078,7 +8079,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3223" >
<father id="3246" num="18" />
-<cdparam x="156" y="412" />
+<cdparam x="156" y="296" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8087,7 +8088,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3225" >
<father id="3246" num="19" />
-<cdparam x="156" y="429" />
+<cdparam x="156" y="279" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8096,7 +8097,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3227" >
<father id="3246" num="20" />
-<cdparam x="156" y="446" />
+<cdparam x="156" y="262" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8105,7 +8106,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3229" >
<father id="3246" num="21" />
-<cdparam x="156" y="462" />
+<cdparam x="156" y="246" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8114,7 +8115,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3231" >
<father id="3246" num="22" />
-<cdparam x="156" y="475" />
+<cdparam x="156" y="229" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8123,7 +8124,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3233" >
<father id="3246" num="23" />
-<cdparam x="156" y="475" />
+<cdparam x="156" y="212" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8132,7 +8133,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3235" >
<father id="3246" num="24" />
-<cdparam x="156" y="475" />
+<cdparam x="156" y="196" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8141,7 +8142,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3237" >
<father id="3246" num="25" />
-<cdparam x="156" y="475" />
+<cdparam x="156" y="179" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8150,7 +8151,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3239" >
<father id="3246" num="26" />
-<cdparam x="156" y="475" />
+<cdparam x="156" y="162" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8159,7 +8160,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3241" >
<father id="3246" num="27" />
-<cdparam x="156" y="475" />
+<cdparam x="156" y="146" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8168,7 +8169,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3243" >
<father id="3246" num="28" />
-<cdparam x="156" y="475" />
+<cdparam x="156" y="129" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8177,7 +8178,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3245" >
<father id="3246" num="29" />
-<cdparam x="156" y="106" />
+<cdparam x="156" y="112" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="379" />
@@ -8189,48 +8190,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="482" id="3151" />
-<P2 x="456" y="482" id="3090" />
+<P1 x="306" y="482" id="3139" />
+<P2 x="456" y="482" id="3060" />
<AutomaticDrawing data="true" />
</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 +8239,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 +8298,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3260" >
<father id="3319" num="0" />
-<cdparam x="589" y="97" />
+<cdparam x="589" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8306,7 +8307,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3262" >
<father id="3319" num="1" />
-<cdparam x="589" y="91" />
+<cdparam x="589" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8315,7 +8316,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3264" >
<father id="3319" num="2" />
-<cdparam x="589" y="469" />
+<cdparam x="589" y="147" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8324,7 +8325,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3266" >
<father id="3319" num="3" />
-<cdparam x="589" y="469" />
+<cdparam x="589" y="164" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8333,7 +8334,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3268" >
<father id="3319" num="4" />
-<cdparam x="589" y="469" />
+<cdparam x="589" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8342,7 +8343,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3270" >
<father id="3319" num="5" />
-<cdparam x="589" y="469" />
+<cdparam x="589" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8351,7 +8352,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3272" >
<father id="3319" num="6" />
-<cdparam x="589" y="469" />
+<cdparam x="589" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8360,7 +8361,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3274" >
<father id="3319" num="7" />
-<cdparam x="589" y="469" />
+<cdparam x="589" y="231" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8369,7 +8370,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3276" >
<father id="3319" num="8" />
-<cdparam x="589" y="464" />
+<cdparam x="589" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8378,7 +8379,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3278" >
<father id="3319" num="9" />
-<cdparam x="589" y="447" />
+<cdparam x="589" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8387,7 +8388,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3280" >
<father id="3319" num="10" />
-<cdparam x="589" y="431" />
+<cdparam x="589" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8396,7 +8397,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3282" >
<father id="3319" num="11" />
-<cdparam x="589" y="414" />
+<cdparam x="589" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8405,7 +8406,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3284" >
<father id="3319" num="12" />
-<cdparam x="589" y="397" />
+<cdparam x="589" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8414,7 +8415,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3286" >
<father id="3319" num="13" />
-<cdparam x="589" y="381" />
+<cdparam x="589" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8423,7 +8424,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3288" >
<father id="3319" num="14" />
-<cdparam x="589" y="364" />
+<cdparam x="589" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8432,7 +8433,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3290" >
<father id="3319" num="15" />
-<cdparam x="589" y="347" />
+<cdparam x="589" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8441,7 +8442,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3292" >
<father id="3319" num="16" />
-<cdparam x="589" y="331" />
+<cdparam x="589" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8450,7 +8451,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3294" >
<father id="3319" num="17" />
-<cdparam x="589" y="314" />
+<cdparam x="589" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8459,7 +8460,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3296" >
<father id="3319" num="18" />
-<cdparam x="589" y="297" />
+<cdparam x="589" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8468,7 +8469,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3298" >
<father id="3319" num="19" />
-<cdparam x="589" y="281" />
+<cdparam x="589" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8477,7 +8478,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3300" >
<father id="3319" num="20" />
-<cdparam x="589" y="264" />
+<cdparam x="589" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8486,7 +8487,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3302" >
<father id="3319" num="21" />
-<cdparam x="589" y="247" />
+<cdparam x="589" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8495,7 +8496,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3304" >
<father id="3319" num="22" />
-<cdparam x="589" y="231" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8504,7 +8505,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3306" >
<father id="3319" num="23" />
-<cdparam x="589" y="214" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8513,7 +8514,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3308" >
<father id="3319" num="24" />
-<cdparam x="589" y="197" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8522,7 +8523,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3310" >
<father id="3319" num="25" />
-<cdparam x="589" y="181" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8531,7 +8532,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3312" >
<father id="3319" num="26" />
-<cdparam x="589" y="164" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8540,7 +8541,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3314" >
<father id="3319" num="27" />
-<cdparam x="589" y="147" />
+<cdparam x="589" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8549,7 +8550,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3316" >
<father id="3319" num="28" />
-<cdparam x="589" y="131" />
+<cdparam x="589" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8558,7 +8559,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3318" >
<father id="3319" num="29" />
-<cdparam x="589" y="114" />
+<cdparam x="589" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8578,7 +8579,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3321" >
<father id="3380" num="0" />
-<cdparam x="439" y="97" />
+<cdparam x="439" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8587,7 +8588,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3323" >
<father id="3380" num="1" />
-<cdparam x="439" y="91" />
+<cdparam x="439" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8596,7 +8597,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3325" >
<father id="3380" num="2" />
-<cdparam x="439" y="469" />
+<cdparam x="439" y="147" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8605,7 +8606,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3327" >
<father id="3380" num="3" />
-<cdparam x="439" y="469" />
+<cdparam x="439" y="164" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8614,7 +8615,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3329" >
<father id="3380" num="4" />
-<cdparam x="439" y="469" />
+<cdparam x="439" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8623,7 +8624,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3331" >
<father id="3380" num="5" />
-<cdparam x="439" y="469" />
+<cdparam x="439" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8632,7 +8633,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3333" >
<father id="3380" num="6" />
-<cdparam x="439" y="469" />
+<cdparam x="439" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8641,7 +8642,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3335" >
<father id="3380" num="7" />
-<cdparam x="439" y="469" />
+<cdparam x="439" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8650,7 +8651,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3337" >
<father id="3380" num="8" />
-<cdparam x="439" y="464" />
+<cdparam x="439" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8659,7 +8660,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3339" >
<father id="3380" num="9" />
-<cdparam x="439" y="447" />
+<cdparam x="439" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8668,7 +8669,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3341" >
<father id="3380" num="10" />
-<cdparam x="439" y="431" />
+<cdparam x="439" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8677,7 +8678,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3343" >
<father id="3380" num="11" />
-<cdparam x="439" y="414" />
+<cdparam x="439" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8686,7 +8687,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3345" >
<father id="3380" num="12" />
-<cdparam x="439" y="397" />
+<cdparam x="439" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8695,7 +8696,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3347" >
<father id="3380" num="13" />
-<cdparam x="439" y="381" />
+<cdparam x="439" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8704,7 +8705,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3349" >
<father id="3380" num="14" />
-<cdparam x="439" y="364" />
+<cdparam x="439" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8713,7 +8714,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3351" >
<father id="3380" num="15" />
-<cdparam x="439" y="347" />
+<cdparam x="439" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8722,7 +8723,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3353" >
<father id="3380" num="16" />
-<cdparam x="439" y="331" />
+<cdparam x="439" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8731,7 +8732,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3355" >
<father id="3380" num="17" />
-<cdparam x="439" y="314" />
+<cdparam x="439" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8740,7 +8741,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3357" >
<father id="3380" num="18" />
-<cdparam x="439" y="297" />
+<cdparam x="439" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8749,7 +8750,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3359" >
<father id="3380" num="19" />
-<cdparam x="439" y="281" />
+<cdparam x="439" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8758,7 +8759,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3361" >
<father id="3380" num="20" />
-<cdparam x="439" y="264" />
+<cdparam x="439" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8767,7 +8768,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3363" >
<father id="3380" num="21" />
-<cdparam x="439" y="247" />
+<cdparam x="439" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8776,7 +8777,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3365" >
<father id="3380" num="22" />
-<cdparam x="439" y="327" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8785,7 +8786,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3367" >
<father id="3380" num="23" />
-<cdparam x="439" y="214" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8794,7 +8795,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3369" >
<father id="3380" num="24" />
-<cdparam x="439" y="197" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8803,7 +8804,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3371" >
<father id="3380" num="25" />
-<cdparam x="439" y="181" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8812,7 +8813,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3373" >
<father id="3380" num="26" />
-<cdparam x="439" y="164" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8821,7 +8822,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3375" >
<father id="3380" num="27" />
-<cdparam x="439" y="147" />
+<cdparam x="439" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8830,7 +8831,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3377" >
<father id="3380" num="28" />
-<cdparam x="439" y="131" />
+<cdparam x="439" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8839,7 +8840,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3379" >
<father id="3380" num="29" />
-<cdparam x="439" y="114" />
+<cdparam x="439" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8859,7 +8860,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3382" >
<father id="3459" num="0" />
-<cdparam x="289" y="97" />
+<cdparam x="289" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -8868,288 +8869,288 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3384" >
<father id="3459" num="1" />
-<cdparam x="289" y="91" />
+<cdparam x="289" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="3383" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="627" id="3393" >
+<SUBCOMPONENT type="630" id="3386" >
<father id="3459" num="2" />
-<cdparam x="302" y="376" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="289" y="147" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="391" />
-<infoparam name="timer expiration" value="{timer=timerAlarm}" />
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
+<infoparam name="port" value="port" />
<TGConnectingPoint num="0" id="3385" />
-<TGConnectingPoint num="1" id="3386" />
-<TGConnectingPoint num="2" id="3387" />
-<TGConnectingPoint num="3" id="3388" />
-<TGConnectingPoint num="4" id="3389" />
-<TGConnectingPoint num="5" id="3390" />
-<TGConnectingPoint num="6" id="3391" />
-<TGConnectingPoint num="7" id="3392" />
-<extraparam>
-<Interval timer="timerAlarm" />
-</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="625" id="3402" >
+<SUBCOMPONENT type="630" id="3388" >
<father id="3459" num="3" />
-<cdparam x="302" y="281" />
-<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="289" y="164" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="391" />
-<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
-<TGConnectingPoint num="0" id="3394" />
-<TGConnectingPoint num="1" id="3395" />
-<TGConnectingPoint num="2" id="3396" />
-<TGConnectingPoint num="3" id="3397" />
-<TGConnectingPoint num="4" id="3398" />
-<TGConnectingPoint num="5" id="3399" />
-<TGConnectingPoint num="6" id="3400" />
-<TGConnectingPoint num="7" id="3401" />
-<extraparam>
-<Interval timer="timerAlarm" duration="60" />
-</extraparam>
+<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
+<infoparam name="port" value="port" />
+<TGConnectingPoint num="0" id="3387" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3404" >
+<SUBCOMPONENT type="630" id="3390" >
<father id="3459" num="4" />
-<cdparam x="289" y="469" />
+<cdparam x="289" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<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="469" />
+<cdparam x="289" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<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="469" />
+<cdparam x="289" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<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="469" />
+<cdparam x="289" y="327" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<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="469" />
+<cdparam x="289" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<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="469" />
+<cdparam x="289" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3413" />
+<TGConnectingPoint num="0" id="3399" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3416" >
+<SUBCOMPONENT type="630" id="3402" >
<father id="3459" num="10" />
-<cdparam x="289" y="464" />
+<cdparam x="289" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3415" />
+<TGConnectingPoint num="0" id="3401" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3418" >
+<SUBCOMPONENT type="630" id="3404" >
<father id="3459" num="11" />
-<cdparam x="289" y="447" />
+<cdparam x="289" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3417" />
+<TGConnectingPoint num="0" id="3403" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3420" >
+<SUBCOMPONENT type="630" id="3406" >
<father id="3459" num="12" />
-<cdparam x="289" y="431" />
+<cdparam x="289" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3419" />
+<TGConnectingPoint num="0" id="3405" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3422" >
+<SUBCOMPONENT type="630" id="3408" >
<father id="3459" num="13" />
-<cdparam x="289" y="414" />
+<cdparam x="289" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3421" />
+<TGConnectingPoint num="0" id="3407" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3424" >
+<SUBCOMPONENT type="630" id="3410" >
<father id="3459" num="14" />
-<cdparam x="289" y="397" />
+<cdparam x="289" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3423" />
+<TGConnectingPoint num="0" id="3409" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3426" >
+<SUBCOMPONENT type="630" id="3412" >
<father id="3459" num="15" />
-<cdparam x="289" y="381" />
+<cdparam x="289" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3425" />
+<TGConnectingPoint num="0" id="3411" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3428" >
+<SUBCOMPONENT type="630" id="3414" >
<father id="3459" num="16" />
-<cdparam x="289" y="364" />
+<cdparam x="289" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3427" />
+<TGConnectingPoint num="0" id="3413" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3430" >
+<SUBCOMPONENT type="630" id="3416" >
<father id="3459" num="17" />
-<cdparam x="289" y="347" />
+<cdparam x="289" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3429" />
+<TGConnectingPoint num="0" id="3415" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3432" >
+<SUBCOMPONENT type="630" id="3418" >
<father id="3459" num="18" />
-<cdparam x="289" y="331" />
+<cdparam x="289" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3431" />
+<TGConnectingPoint num="0" id="3417" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3434" >
+<SUBCOMPONENT type="630" id="3420" >
<father id="3459" num="19" />
-<cdparam x="289" y="314" />
+<cdparam x="289" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3433" />
+<TGConnectingPoint num="0" id="3419" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3436" >
+<SUBCOMPONENT type="630" id="3422" >
<father id="3459" num="20" />
-<cdparam x="289" y="297" />
+<cdparam x="289" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3435" />
+<TGConnectingPoint num="0" id="3421" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3438" >
+<SUBCOMPONENT type="630" id="3424" >
<father id="3459" num="21" />
-<cdparam x="289" y="281" />
+<cdparam x="289" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3437" />
+<TGConnectingPoint num="0" id="3423" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3440" >
+<SUBCOMPONENT type="630" id="3426" >
<father id="3459" num="22" />
-<cdparam x="289" y="264" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3439" />
+<TGConnectingPoint num="0" id="3425" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3442" >
+<SUBCOMPONENT type="630" id="3428" >
<father id="3459" num="23" />
-<cdparam x="289" y="247" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3441" />
+<TGConnectingPoint num="0" id="3427" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3444" >
+<SUBCOMPONENT type="630" id="3430" >
<father id="3459" num="24" />
-<cdparam x="289" y="327" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3443" />
+<TGConnectingPoint num="0" id="3429" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3446" >
+<SUBCOMPONENT type="630" id="3432" >
<father id="3459" num="25" />
-<cdparam x="289" y="214" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3445" />
+<TGConnectingPoint num="0" id="3431" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3448" >
+<SUBCOMPONENT type="630" id="3434" >
<father id="3459" num="26" />
-<cdparam x="289" y="197" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3447" />
+<TGConnectingPoint num="0" id="3433" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3450" >
+<SUBCOMPONENT type="630" id="3436" >
<father id="3459" num="27" />
-<cdparam x="289" y="181" />
+<cdparam x="289" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3449" />
+<TGConnectingPoint num="0" id="3435" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3452" >
+<SUBCOMPONENT type="625" id="3445" >
<father id="3459" num="28" />
-<cdparam x="289" y="164" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="302" y="281" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3451" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="391" />
+<infoparam name="setting timer" value="{timer=timerAlarm, duration=60}" />
+<TGConnectingPoint num="0" id="3437" />
+<TGConnectingPoint num="1" id="3438" />
+<TGConnectingPoint num="2" id="3439" />
+<TGConnectingPoint num="3" id="3440" />
+<TGConnectingPoint num="4" id="3441" />
+<TGConnectingPoint num="5" id="3442" />
+<TGConnectingPoint num="6" id="3443" />
+<TGConnectingPoint num="7" id="3444" />
+<extraparam>
+<Interval timer="timerAlarm" duration="60" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="630" id="3454" >
+<SUBCOMPONENT type="627" id="3454" >
<father id="3459" num="29" />
-<cdparam x="289" y="147" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="302" y="376" />
+<sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
-<infoparam name="port" value="port" />
-<TGConnectingPoint num="0" id="3453" />
+<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="391" />
+<infoparam name="timer expiration" value="{timer=timerAlarm}" />
+<TGConnectingPoint num="0" id="3446" />
+<TGConnectingPoint num="1" id="3447" />
+<TGConnectingPoint num="2" id="3448" />
+<TGConnectingPoint num="3" id="3449" />
+<TGConnectingPoint num="4" id="3450" />
+<TGConnectingPoint num="5" id="3451" />
+<TGConnectingPoint num="6" id="3452" />
+<TGConnectingPoint num="7" id="3453" />
+<extraparam>
+<Interval timer="timerAlarm" />
+</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3456" >
<father id="3459" num="30" />
-<cdparam x="289" y="131" />
+<cdparam x="289" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9158,7 +9159,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3458" >
<father id="3459" num="31" />
-<cdparam x="289" y="114" />
+<cdparam x="289" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9178,7 +9179,7 @@
</COMPONENT>
<SUBCOMPONENT type="630" id="3461" >
<father id="3520" num="0" />
-<cdparam x="139" y="97" />
+<cdparam x="139" y="114" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9187,7 +9188,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3463" >
<father id="3520" num="1" />
-<cdparam x="139" y="91" />
+<cdparam x="139" y="131" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9196,7 +9197,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3465" >
<father id="3520" num="2" />
-<cdparam x="139" y="469" />
+<cdparam x="139" y="147" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9205,7 +9206,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3467" >
<father id="3520" num="3" />
-<cdparam x="139" y="469" />
+<cdparam x="139" y="164" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9214,7 +9215,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3469" >
<father id="3520" num="4" />
-<cdparam x="139" y="469" />
+<cdparam x="139" y="181" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9223,7 +9224,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3471" >
<father id="3520" num="5" />
-<cdparam x="139" y="469" />
+<cdparam x="139" y="197" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9232,7 +9233,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3473" >
<father id="3520" num="6" />
-<cdparam x="139" y="469" />
+<cdparam x="139" y="214" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9241,7 +9242,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3475" >
<father id="3520" num="7" />
-<cdparam x="139" y="469" />
+<cdparam x="139" y="231" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9250,7 +9251,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3477" >
<father id="3520" num="8" />
-<cdparam x="139" y="464" />
+<cdparam x="139" y="247" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9259,7 +9260,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3479" >
<father id="3520" num="9" />
-<cdparam x="139" y="447" />
+<cdparam x="139" y="264" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9268,7 +9269,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3481" >
<father id="3520" num="10" />
-<cdparam x="139" y="431" />
+<cdparam x="139" y="281" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9277,7 +9278,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3483" >
<father id="3520" num="11" />
-<cdparam x="139" y="414" />
+<cdparam x="139" y="297" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9286,7 +9287,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3485" >
<father id="3520" num="12" />
-<cdparam x="139" y="397" />
+<cdparam x="139" y="314" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9295,7 +9296,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3487" >
<father id="3520" num="13" />
-<cdparam x="139" y="381" />
+<cdparam x="139" y="331" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9304,7 +9305,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3489" >
<father id="3520" num="14" />
-<cdparam x="139" y="364" />
+<cdparam x="139" y="347" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9313,7 +9314,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3491" >
<father id="3520" num="15" />
-<cdparam x="139" y="347" />
+<cdparam x="139" y="364" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9322,7 +9323,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3493" >
<father id="3520" num="16" />
-<cdparam x="139" y="331" />
+<cdparam x="139" y="381" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9331,7 +9332,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3495" >
<father id="3520" num="17" />
-<cdparam x="139" y="314" />
+<cdparam x="139" y="397" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9340,7 +9341,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3497" >
<father id="3520" num="18" />
-<cdparam x="139" y="297" />
+<cdparam x="139" y="414" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9349,7 +9350,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3499" >
<father id="3520" num="19" />
-<cdparam x="139" y="281" />
+<cdparam x="139" y="431" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9358,7 +9359,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3501" >
<father id="3520" num="20" />
-<cdparam x="139" y="264" />
+<cdparam x="139" y="447" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9367,7 +9368,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3503" >
<father id="3520" num="21" />
-<cdparam x="139" y="247" />
+<cdparam x="139" y="464" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9376,7 +9377,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3505" >
<father id="3520" num="22" />
-<cdparam x="139" y="231" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9385,7 +9386,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3507" >
<father id="3520" num="23" />
-<cdparam x="139" y="214" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9394,7 +9395,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3509" >
<father id="3520" num="24" />
-<cdparam x="139" y="197" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9403,7 +9404,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3511" >
<father id="3520" num="25" />
-<cdparam x="139" y="181" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9412,7 +9413,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3513" >
<father id="3520" num="26" />
-<cdparam x="139" y="164" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9421,7 +9422,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3515" >
<father id="3520" num="27" />
-<cdparam x="139" y="147" />
+<cdparam x="139" y="469" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9430,7 +9431,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3517" >
<father id="3520" num="28" />
-<cdparam x="139" y="131" />
+<cdparam x="139" y="91" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9439,7 +9440,7 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="630" id="3519" >
<father id="3520" num="29" />
-<cdparam x="139" y="114" />
+<cdparam x="139" y="97" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="388" />
@@ -9451,96 +9452,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>
@@ -9652,7 +9653,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3533" />
-<P1 x="964" y="206" id="3635" />
+<P1 x="964" y="206" id="3610" />
<P2 x="1077" y="206" id="3559" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -9668,8 +9669,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3535" />
-<P1 x="676" y="207" id="3610" />
-<P2 x="714" y="206" id="3634" />
+<P1 x="676" y="207" id="3635" />
+<P2 x="714" y="206" id="3609" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -9683,7 +9684,7 @@
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3537" />
<P1 x="331" y="206" id="3585" />
-<P2 x="426" y="207" id="3609" />
+<P2 x="426" y="207" id="3634" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -9888,11 +9889,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="3630" >
<father id="3680" num="0" />
-<cdparam x="426" y="140" />
-<sizeparam width="250" height="134" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="714" y="140" />
+<sizeparam width="250" height="132" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="82" />
-<infoparam name="Block0" value="MainController" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="84" />
+<infoparam name="Block0" value="AlarmManager" />
<TGConnectingPoint num="0" id="3606" />
<TGConnectingPoint num="1" id="3607" />
<TGConnectingPoint num="2" id="3608" />
@@ -9920,19 +9921,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" />
-<sizeparam width="250" height="132" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="426" y="140" />
+<sizeparam width="250" height="134" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="84" />
-<infoparam name="Block0" value="AlarmManager" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="82" />
+<infoparam name="Block0" value="MainController" />
<TGConnectingPoint num="0" id="3631" />
<TGConnectingPoint num="1" id="3632" />
<TGConnectingPoint num="2" id="3633" />
@@ -9960,11 +9962,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>
@@ -12811,7 +12812,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="4975" />
-<P1 x="964" y="213" id="5052" />
+<P1 x="964" y="213" id="5077" />
<P2 x="1077" y="214" id="5001" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -12827,8 +12828,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="4977" />
-<P1 x="676" y="212" id="5077" />
-<P2 x="714" y="213" id="5051" />
+<P1 x="676" y="212" id="5052" />
+<P2 x="714" y="213" id="5076" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -12842,7 +12843,7 @@ PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="4979" />
<P1 x="331" y="212" id="5027" />
-<P2 x="426" y="212" id="5076" />
+<P2 x="426" y="212" id="5051" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -13047,11 +13048,11 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="5072" >
<father id="5122" num="0" />
-<cdparam x="714" y="140" />
-<sizeparam width="250" height="147" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="426" y="140" />
+<sizeparam width="250" height="145" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="140" />
-<infoparam name="Block0" value="AlarmManager" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="142" />
+<infoparam name="Block0" value="MainController" />
<TGConnectingPoint num="0" id="5048" />
<TGConnectingPoint num="1" id="5049" />
<TGConnectingPoint num="2" id="5050" />
@@ -13079,20 +13080,19 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
-<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
-<Signal value="in highPressure()" attached="true" />
-<Signal value="out alarmOff()" attached="true" />
-<Signal value="out alarmOn()" attached="true" />
+<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
+<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
+<Signal value="in pressureValue(int value)" attached="true" />
+<Signal value="out highPressure()" attached="true" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="5097" >
<father id="5122" num="1" />
-<cdparam x="426" y="140" />
-<sizeparam width="250" height="145" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="714" y="140" />
+<sizeparam width="250" height="147" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="142" />
-<infoparam name="Block0" value="MainController" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="140" />
+<infoparam name="Block0" value="AlarmManager" />
<TGConnectingPoint num="0" id="5073" />
<TGConnectingPoint num="1" id="5074" />
<TGConnectingPoint num="2" id="5075" />
@@ -13120,10 +13120,11 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
-<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
-<Signal value="in pressureValue(int value)" attached="true" />
-<Signal value="out highPressure()" attached="true" />
+<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
+<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
+<Signal value="in highPressure()" attached="true" />
+<Signal value="out alarmOff()" attached="true" />
+<Signal value="out alarmOn()" attached="true" />
</extraparam>
</SUBCOMPONENT>
@@ -15984,7 +15985,7 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="6419" />
-<P1 x="551" y="274" id="6533" />
+<P1 x="551" y="274" id="6508" />
<P2 x="550" y="333" id="6435" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -15998,7 +15999,7 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="6421" />
-<P1 x="964" y="206" id="6506" />
+<P1 x="964" y="206" id="6531" />
<P2 x="1077" y="206" id="6455" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -16014,8 +16015,8 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="6423" />
-<P1 x="676" y="207" id="6531" />
-<P2 x="714" y="206" id="6505" />
+<P1 x="676" y="207" id="6506" />
+<P2 x="714" y="206" id="6530" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -16029,7 +16030,7 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="6425" />
<P1 x="331" y="206" id="6481" />
-<P2 x="426" y="207" id="6530" />
+<P2 x="426" y="207" id="6505" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -16213,11 +16214,11 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="6526" >
<father id="6576" num="0" />
-<cdparam x="714" y="140" />
-<sizeparam width="250" height="132" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="426" y="140" />
+<sizeparam width="250" height="134" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="84" />
-<infoparam name="Block0" value="AlarmManager" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="82" />
+<infoparam name="Block0" value="MainController" />
<TGConnectingPoint num="0" id="6502" />
<TGConnectingPoint num="1" id="6503" />
<TGConnectingPoint num="2" id="6504" />
@@ -16245,20 +16246,20 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
-<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
-<Signal value="in highPressure()" attached="true" />
-<Signal value="out alarmOff()" attached="true" />
-<Signal value="out alarmOn()" attached="true" />
+<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
+<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
+<Signal value="in pressureValue(int value)" attached="true" />
+<Signal value="out highPressure()" attached="true" />
+<Signal value="out highPressureObs()" attached="true" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="6551" >
<father id="6576" num="1" />
-<cdparam x="426" y="140" />
-<sizeparam width="250" height="134" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="714" y="140" />
+<sizeparam width="250" height="132" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="355" minY="0" maxY="82" />
-<infoparam name="Block0" value="MainController" />
+<cdrectangleparam minX="0" maxX="355" minY="0" maxY="84" />
+<infoparam name="Block0" value="AlarmManager" />
<TGConnectingPoint num="0" id="6527" />
<TGConnectingPoint num="1" id="6528" />
<TGConnectingPoint num="2" id="6529" />
@@ -16286,11 +16287,11 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
-<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
-<Signal value="in pressureValue(int value)" attached="true" />
-<Signal value="out highPressure()" attached="true" />
-<Signal value="out highPressureObs()" attached="true" />
+<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
+<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
+<Signal value="in highPressure()" attached="true" />
+<Signal value="out alarmOff()" attached="true" />
+<Signal value="out alarmOn()" attached="true" />
</extraparam>
</SUBCOMPONENT>
@@ -19780,7 +19781,7 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="8200" />
-<P1 x="964" y="240" id="8260" />
+<P1 x="964" y="240" id="8285" />
<P2 x="1088" y="240" id="8209" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -19796,8 +19797,8 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="8202" />
-<P1 x="659" y="240" id="8285" />
-<P2 x="714" y="240" id="8259" />
+<P1 x="659" y="240" id="8260" />
+<P2 x="714" y="240" id="8284" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -19811,7 +19812,7 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="8204" />
<P1 x="325" y="241" id="8235" />
-<P2 x="409" y="240" id="8284" />
+<P2 x="409" y="240" id="8259" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -19955,11 +19956,11 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="8280" >
<father id="8330" 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="8256" />
<TGConnectingPoint num="1" id="8257" />
<TGConnectingPoint num="2" id="8258" />
@@ -19987,20 +19988,19 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
-<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
-<Signal value="in highPressure()" attached="true" />
-<Signal value="out alarmOff()" attached="true" />
-<Signal value="out alarmOn()" attached="true" />
+<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
+<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
+<Signal value="in pressureValue(int value)" attached="true" />
+<Signal value="out highPressure()" attached="true" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="8305" >
<father id="8330" 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="8281" />
<TGConnectingPoint num="1" id="8282" />
<TGConnectingPoint num="2" id="8283" />
@@ -20028,10 +20028,11 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
-<Attribute access="0" id="threshold" value="20" type="8" typeOther="" />
-<Attribute access="0" id="currentPressure" value="0" type="8" typeOther="" />
-<Signal value="in pressureValue(int value)" attached="true" />
-<Signal value="out highPressure()" attached="true" />
+<Attribute access="0" id="alarmDuration" value="60" type="8" typeOther="" />
+<Attribute access="0" id="alarmTimer" value="" type="9" typeOther="" />
+<Signal value="in highPressure()" attached="true" />
+<Signal value="out alarmOff()" attached="true" />
+<Signal value="out alarmOn()" attached="true" />
</extraparam>
</SUBCOMPONENT>
@@ -22701,7 +22702,7 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="9439" />
-<P1 x="964" y="240" id="9533" />
+<P1 x="964" y="240" id="9558" />
<P2 x="1088" y="240" id="9482" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -22717,8 +22718,8 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="9441" />
-<P1 x="659" y="240" id="9558" />
-<P2 x="714" y="240" id="9532" />
+<P1 x="659" y="240" id="9533" />
+<P2 x="714" y="240" id="9557" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in highPressure()" />
@@ -22732,7 +22733,7 @@ F PressureSensor.SendingPressure --> MainController.HighPressure
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="9443" />
<P1 x="325" y="241" id="9508" />
-<P2 x="409" y="240" id="9557" />
+<P2 x="409" y="240" id="9532" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pressureValue(int value)" />
@@ -22967,11 +22968,11 @@ PressureSensor.SendingPressure --> MainController.HighPressure
</COMPONENT>
<SUBCOMPONENT type="5000" id="9553" >
<father id="9603" 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="9529" />
<TGConnectingPoint num="1" id="9530" />
<TGConnectingPoint num="2" id="9531" />
@@ -22999,20 +23000,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="9578" >
<father id="9603" 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="9554" />
<TGConnectingPoint num="1" id="9555" />
<TGConnectingPoint num="2" id="9556" />
@@ -23040,10 +23040,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/tmltranslator/dsez3engine/InputInstance.java b/src/main/java/tmltranslator/dsez3engine/InputInstance.java
index 3962e94e5d..869dee396f 100644
--- a/src/main/java/tmltranslator/dsez3engine/InputInstance.java
+++ b/src/main/java/tmltranslator/dsez3engine/InputInstance.java
@@ -1,3 +1,9 @@
+/* Copyright or (C) 2017-2020 Nokia
+ * Copyright or (C) GET / ENST, Telecom-Paris
+ * Licensed under the BSD 3 Clause license
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
package tmltranslator.dsez3engine;
import myutil.TraceManager;
diff --git a/src/main/java/tmltranslator/dsez3engine/OptimizationModel.java b/src/main/java/tmltranslator/dsez3engine/OptimizationModel.java
index 2d8b796612..e1a0c27fb0 100644
--- a/src/main/java/tmltranslator/dsez3engine/OptimizationModel.java
+++ b/src/main/java/tmltranslator/dsez3engine/OptimizationModel.java
@@ -1,3 +1,9 @@
+/* Copyright or (C) 2017-2020 Nokia
+ * Copyright or (C) GET / ENST, Telecom-Paris
+ * Licensed under the BSD 3 Clause license
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
package tmltranslator.dsez3engine;
import com.microsoft.z3.*;
diff --git a/src/main/java/tmltranslator/dsez3engine/OptimizationResult.java b/src/main/java/tmltranslator/dsez3engine/OptimizationResult.java
index fa3e402a95..c1b89d8327 100644
--- a/src/main/java/tmltranslator/dsez3engine/OptimizationResult.java
+++ b/src/main/java/tmltranslator/dsez3engine/OptimizationResult.java
@@ -1,41 +1,10 @@
-/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
- * ludovic.apvrille AT enst.fr
- *
- * This software is a computer program whose purpose is to allow the
- * edition of TURTLE analysis, design and deployment diagrams, to
- * allow the generation of RT-LOTOS or Java code from this diagram,
- * and at last to allow the analysis of formal validation traces
- * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- * from INRIA Rhone-Alpes.
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
+/* Copyright or (C) 2017-2020 Nokia
+ * Copyright or (C) GET / ENST, Telecom-Paris
+ * Licensed under the BSD 3 Clause license
+ * SPDX-License-Identifier: BSD-3-Clause
*/
+
package tmltranslator.dsez3engine;
import tmltranslator.*;
diff --git a/ttool/src/test/java/tmltranslator/dsez3engine/InputInstanceTest.java b/ttool/src/test/java/tmltranslator/dsez3engine/InputInstanceTest.java
index d1bde753a7..5a280c9b56 100644
--- a/ttool/src/test/java/tmltranslator/dsez3engine/InputInstanceTest.java
+++ b/ttool/src/test/java/tmltranslator/dsez3engine/InputInstanceTest.java
@@ -1,3 +1,9 @@
+/* Copyright or (C) 2017-2020 Nokia
+ * Copyright or (C) GET / ENST, Telecom-Paris
+ * Licensed under the BSD 3 Clause license
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
package tmltranslator.dsez3engine;
import com.microsoft.z3.Log;
--
GitLab