X-Git-Url: https://git.llucax.com/z.facultad/75.43/tp2.git/blobdiff_plain/b4f122fc966bb813516d804a7acef41378a14f9a..5519ad8960da78e642c7af2c8e971129e2188848:/diagrama.dia

diff --git a/diagrama.dia b/diagrama.dia
index 4d0b5dc..a6160e4 100644
--- a/diagrama.dia
+++ b/diagrama.dia
@@ -575,7 +575,7 @@
         <dia:point val="34.1019,25.9532"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.0569,25.9082;37.8238,27.4982"/>
+        <dia:rectangle val="34.0569,25.9082;37.8239,27.4982"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="34.1019,25.9532"/>
@@ -718,7 +718,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="32.143,20.0892"/>
+            <dia:point val="32.1429,20.0892"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -803,7 +803,7 @@
         <dia:point val="27.3799,-7.14297"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.3349,-7.18797;31.1018,-5.54233"/>
+        <dia:rectangle val="27.3349,-7.18797;31.1019,-5.54234"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="27.3799,-7.14297"/>
@@ -832,7 +832,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="29.4183,-6.21515"/>
+            <dia:point val="29.4184,-6.21515"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1060,7 +1060,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.32083,6.7249"/>
+            <dia:point val="4.32083,6.72491"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1088,7 +1088,7 @@
         <dia:point val="2.28235,16.7572"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.23735,16.7122;6.00431,18.3579"/>
+        <dia:rectangle val="2.23735,16.7122;6.00431,18.3578"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="2.28235,16.7572"/>
@@ -1117,7 +1117,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.32083,17.6851"/>
+            <dia:point val="4.32083,17.685"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1145,7 +1145,7 @@
         <dia:point val="13.5206,28.0002"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.4756,27.9552;17.2425,29.6009"/>
+        <dia:rectangle val="13.4756,27.9552;17.2426,29.6008"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="13.5206,28.0002"/>
@@ -1174,7 +1174,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="15.5591,28.9281"/>
+            <dia:point val="15.5591,28.928"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1240,7 +1240,7 @@
         <dia:point val="24.8529,29.1657"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.1451,28.7256;24.9054,29.2181"/>
+        <dia:rectangle val="17.145,28.7256;24.9054,29.2182"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="24.8529,29.1657"/>
@@ -1316,7 +1316,7 @@
         <dia:point val="13.5206,28.7781"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.05487,24.5503;13.5865,28.844"/>
+        <dia:rectangle val="4.05487,24.5503;13.5866,28.8441"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="13.5206,28.7781"/>
@@ -1331,25 +1331,6 @@
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O31">
-      <dia:attribute name="obj_pos">
-        <dia:point val="14.3854,17.8322"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.05219,17.7636;14.454,22.8849"/>
-      </dia:attribute>
-      <dia:attribute name="conn_endpoints">
-        <dia:point val="14.3854,17.8322"/>
-        <dia:point val="6.12083,22.8163"/>
-      </dia:attribute>
-      <dia:attribute name="numcp">
-        <dia:int val="1"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O3" connection="5"/>
-        <dia:connection handle="1" to="O9" connection="2"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O32">
       <dia:attribute name="obj_pos">
         <dia:point val="4.12083,18.3129"/>
       </dia:attribute>
@@ -1368,7 +1349,7 @@
         <dia:connection handle="1" to="O9" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O33">
+    <dia:object type="Standard - Line" version="0" id="O32">
       <dia:attribute name="obj_pos">
         <dia:point val="4.12083,7.35272"/>
       </dia:attribute>
@@ -1387,7 +1368,7 @@
         <dia:connection handle="1" to="O22" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O34">
+    <dia:object type="Standard - Line" version="0" id="O33">
       <dia:attribute name="obj_pos">
         <dia:point val="14.3854,16.9322"/>
       </dia:attribute>
@@ -1406,12 +1387,12 @@
         <dia:connection handle="1" to="O22" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O35">
+    <dia:object type="Standard - Line" version="0" id="O34">
       <dia:attribute name="obj_pos">
         <dia:point val="14.3854,16.0322"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.96941,7.28206;14.456,16.1029"/>
+        <dia:rectangle val="4.96941,7.28206;14.4561,16.1029"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="14.3854,16.0322"/>
@@ -1425,7 +1406,7 @@
         <dia:connection handle="1" to="O21" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O36">
+    <dia:object type="Standard - Line" version="0" id="O35">
       <dia:attribute name="obj_pos">
         <dia:point val="4.12083,5.79709"/>
       </dia:attribute>
@@ -1444,12 +1425,12 @@
         <dia:connection handle="1" to="O1" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O37">
+    <dia:object type="Standard - Line" version="0" id="O36">
       <dia:attribute name="obj_pos">
         <dia:point val="5.95931,6.5749"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.89542,6.51102;13.709,9.37868"/>
+        <dia:rectangle val="5.89542,6.51101;13.7091,9.37869"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="5.95931,6.5749"/>
@@ -1463,12 +1444,12 @@
         <dia:connection handle="1" to="O8" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O38">
+    <dia:object type="Standard - Line" version="0" id="O37">
       <dia:attribute name="obj_pos">
         <dia:point val="25.8242,9.26191"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5948,9.21159;25.8746,9.36512"/>
+        <dia:rectangle val="17.5949,9.21159;25.8745,9.36512"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="25.8242,9.26191"/>
@@ -1482,7 +1463,7 @@
         <dia:connection handle="1" to="O8" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O39">
+    <dia:object type="Standard - Line" version="0" id="O38">
       <dia:attribute name="obj_pos">
         <dia:point val="38.1986,8.83765"/>
       </dia:attribute>
@@ -1501,7 +1482,7 @@
         <dia:connection handle="1" to="O20" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O40">
+    <dia:object type="Standard - Line" version="0" id="O39">
       <dia:attribute name="obj_pos">
         <dia:point val="39.9564,2.43368"/>
       </dia:attribute>
@@ -1520,7 +1501,7 @@
         <dia:connection handle="1" to="O19" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O41">
+    <dia:object type="Standard - Line" version="0" id="O40">
       <dia:attribute name="obj_pos">
         <dia:point val="29.3598,1.13018"/>
       </dia:attribute>
@@ -1539,7 +1520,7 @@
         <dia:connection handle="1" to="O12" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O42">
+    <dia:object type="Standard - Line" version="0" id="O41">
       <dia:attribute name="obj_pos">
         <dia:point val="21.3937,-3.25698"/>
       </dia:attribute>
@@ -1558,7 +1539,7 @@
         <dia:connection handle="1" to="O18" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O43">
+    <dia:object type="Standard - Line" version="0" id="O42">
       <dia:attribute name="obj_pos">
         <dia:point val="27.3799,-6.36515"/>
       </dia:attribute>
@@ -1577,12 +1558,12 @@
         <dia:connection handle="1" to="O6" connection="2"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O44">
+    <dia:object type="Standard - Line" version="0" id="O43">
       <dia:attribute name="obj_pos">
         <dia:point val="39.9564,0.63368"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.9866,-6.43536;40.0266,0.70389"/>
+        <dia:rectangle val="30.9866,-6.43536;40.0266,0.703891"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="39.9564,0.63368"/>
@@ -1596,12 +1577,12 @@
         <dia:connection handle="1" to="O17" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O45">
+    <dia:object type="Standard - Line" version="0" id="O44">
       <dia:attribute name="obj_pos">
         <dia:point val="46.9667,3.74648"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.8905,1.46774;47.0327,3.81242"/>
+        <dia:rectangle val="41.8905,1.46774;47.0326,3.81242"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="46.9667,3.74648"/>
@@ -1615,12 +1596,12 @@
         <dia:connection handle="1" to="O12" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O46">
+    <dia:object type="Standard - Line" version="0" id="O45">
       <dia:attribute name="obj_pos">
         <dia:point val="48.5747,-2.12612"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="48.5224,-2.17833;48.8574,3.02087"/>
+        <dia:rectangle val="48.5225,-2.17833;48.8574,3.02087"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="48.5747,-2.12612"/>
@@ -1634,12 +1615,12 @@
         <dia:connection handle="1" to="O16" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O47">
+    <dia:object type="Standard - Line" version="0" id="O46">
       <dia:attribute name="obj_pos">
         <dia:point val="46.6785,12.5494"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.8054,8.76751;46.7486,12.6195"/>
+        <dia:rectangle val="41.8055,8.76751;46.7486,12.6195"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="46.6785,12.5494"/>
@@ -1653,12 +1634,12 @@
         <dia:connection handle="1" to="O19" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O48">
+    <dia:object type="Standard - Line" version="0" id="O47">
       <dia:attribute name="obj_pos">
         <dia:point val="46.6785,14.3494"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.7014,14.2969;46.7309,15.1127"/>
+        <dia:rectangle val="32.7014,14.2969;46.731,15.1127"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="46.6785,14.3494"/>
@@ -1672,7 +1653,7 @@
         <dia:connection handle="1" to="O14" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O49">
+    <dia:object type="Standard - Line" version="0" id="O48">
       <dia:attribute name="obj_pos">
         <dia:point val="29.0769,15.0602"/>
       </dia:attribute>
@@ -1691,12 +1672,12 @@
         <dia:connection handle="1" to="O3" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O50">
+    <dia:object type="Standard - Line" version="0" id="O49">
       <dia:attribute name="obj_pos">
         <dia:point val="29.6426,19.9392"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5748,10.1445;29.7129,20.0095"/>
+        <dia:rectangle val="17.5749,10.1445;29.7129,20.0095"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="29.6426,19.9392"/>
@@ -1710,12 +1691,12 @@
         <dia:connection handle="1" to="O8" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O51">
+    <dia:object type="Standard - Text" version="0" id="O50">
       <dia:attribute name="obj_pos">
         <dia:point val="37.9204,28.0896"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.9204,27.4696;39.1404,28.5296"/>
+        <dia:rectangle val="37.9204,27.4896;39.1204,28.4896"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1740,12 +1721,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O52">
+    <dia:object type="Standard - Text" version="0" id="O51">
       <dia:attribute name="obj_pos">
         <dia:point val="17.5361,28.0214"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5161,27.4014;18.7361,28.4614"/>
+        <dia:rectangle val="17.5361,27.4214;18.7361,28.4214"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1770,12 +1751,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O53">
+    <dia:object type="Standard - Text" version="0" id="O52">
       <dia:attribute name="obj_pos">
         <dia:point val="4.35936,5.33843"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.35936,4.71843;5.57936,5.77843"/>
+        <dia:rectangle val="4.35936,4.73843;5.55936,5.73843"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1800,12 +1781,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O54">
+    <dia:object type="Standard - Text" version="0" id="O53">
       <dia:attribute name="obj_pos">
         <dia:point val="33.4707,14.4778"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.4507,13.8578;34.6707,14.9178"/>
+        <dia:rectangle val="33.4707,13.8778;34.6707,14.8778"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1830,12 +1811,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O55">
+    <dia:object type="Standard - Text" version="0" id="O54">
       <dia:attribute name="obj_pos">
         <dia:point val="34.8142,19.2154"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.7942,18.5954;36.0142,19.6554"/>
+        <dia:rectangle val="34.8142,18.6154;36.0142,19.6154"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1860,12 +1841,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O56">
+    <dia:object type="Standard - Text" version="0" id="O55">
       <dia:attribute name="obj_pos">
         <dia:point val="2.75301,19.074"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.75301,18.454;3.97301,19.514"/>
+        <dia:rectangle val="2.75301,18.474;3.95301,19.474"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1890,12 +1871,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O57">
+    <dia:object type="Standard - Line" version="0" id="O56">
       <dia:attribute name="obj_pos">
         <dia:point val="43.1426,18.0767"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.1841,18.0175;43.2017,19.9984"/>
+        <dia:rectangle val="34.1841,18.0175;43.2018,19.9984"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="43.1426,18.0767"/>
@@ -1909,12 +1890,12 @@
         <dia:connection handle="1" to="O15" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O58">
+    <dia:object type="Standard - Text" version="0" id="O57">
       <dia:attribute name="obj_pos">
         <dia:point val="29.5321,0.6422"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.5321,0.0221997;30.7521,1.0822"/>
+        <dia:rectangle val="29.5321,0.0422;30.7321,1.0422"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1939,12 +1920,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O59">
+    <dia:object type="Standard - Text" version="0" id="O58">
       <dia:attribute name="obj_pos">
         <dia:point val="31.0568,-6.36515"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.0568,-6.98515;32.2768,-5.92515"/>
+        <dia:rectangle val="31.0568,-6.96515;32.2568,-5.96515"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1972,12 +1953,12 @@
         <dia:connection handle="0" to="O17" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O60">
+    <dia:object type="Standard - Text" version="0" id="O59">
       <dia:attribute name="obj_pos">
         <dia:point val="45.4208,4.26009"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="45.4208,3.64009;46.6408,4.70009"/>
+        <dia:rectangle val="45.4208,3.66009;46.6208,4.66009"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2002,12 +1983,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O61">
+    <dia:object type="Standard - Text" version="0" id="O60">
       <dia:attribute name="obj_pos">
         <dia:point val="42.3308,8.89767"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.3308,8.27767;43.5508,9.33767"/>
+        <dia:rectangle val="42.3308,8.29767;43.5308,9.29767"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2032,7 +2013,7 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O62">
+    <dia:object type="Standard - Text" version="0" id="O61">
       <dia:attribute name="obj_pos">
         <dia:point val="24.7026,8.52041"/>
       </dia:attribute>
@@ -2062,12 +2043,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O63">
+    <dia:object type="Standard - Text" version="0" id="O62">
       <dia:attribute name="obj_pos">
         <dia:point val="32.7636,26.2688"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.7636,25.6488;33.9836,26.7088"/>
+        <dia:rectangle val="32.7636,25.6688;33.9636,26.6688"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2092,12 +2073,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O64">
+    <dia:object type="Standard - Text" version="0" id="O63">
       <dia:attribute name="obj_pos">
         <dia:point val="17.5113,30.27"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5113,29.65;18.7313,30.71"/>
+        <dia:rectangle val="17.5113,29.67;18.7113,30.67"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2122,12 +2103,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O65">
+    <dia:object type="Standard - Text" version="0" id="O64">
       <dia:attribute name="obj_pos">
         <dia:point val="6.41997,6.4698"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.41997,5.8498;7.63997,6.9098"/>
+        <dia:rectangle val="6.41997,5.8698;7.61997,6.8698"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2152,7 +2133,7 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O66">
+    <dia:object type="Standard - Text" version="0" id="O65">
       <dia:attribute name="obj_pos">
         <dia:point val="32.905,21.6726"/>
       </dia:attribute>
@@ -2182,12 +2163,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O67">
+    <dia:object type="Standard - Text" version="0" id="O66">
       <dia:attribute name="obj_pos">
         <dia:point val="49.6635,2.36858"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="49.6435,1.74858;50.8635,2.80858"/>
+        <dia:rectangle val="49.6635,1.76858;50.8635,2.76858"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2212,12 +2193,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O68">
+    <dia:object type="Standard - Text" version="0" id="O67">
       <dia:attribute name="obj_pos">
         <dia:point val="23.946,1.70286"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.946,1.08286;25.166,2.14286"/>
+        <dia:rectangle val="23.946,1.10286;25.146,2.10286"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2242,12 +2223,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O69">
+    <dia:object type="Standard - Text" version="0" id="O68">
       <dia:attribute name="obj_pos">
         <dia:point val="26.138,-6.44655"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.138,-7.06655;27.358,-6.00655"/>
+        <dia:rectangle val="26.138,-7.04655;27.338,-6.04655"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2272,12 +2253,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O70">
+    <dia:object type="Standard - Text" version="0" id="O69">
       <dia:attribute name="obj_pos">
         <dia:point val="13.6222,30.6235"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.6222,30.0035;14.8422,31.0635"/>
+        <dia:rectangle val="13.6222,30.0235;14.8222,31.0235"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2302,12 +2283,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O71">
+    <dia:object type="Standard - Text" version="0" id="O70">
       <dia:attribute name="obj_pos">
         <dia:point val="6.05642,18.4613"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.05642,17.8413;7.27642,18.9013"/>
+        <dia:rectangle val="6.05642,17.8613;7.25642,18.8613"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2332,12 +2313,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O72">
+    <dia:object type="Standard - Text" version="0" id="O71">
       <dia:attribute name="obj_pos">
         <dia:point val="27.6937,20.2998"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.6937,19.6798;28.9137,20.7398"/>
+        <dia:rectangle val="27.6937,19.6998;28.8937,20.6998"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2362,12 +2343,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O73">
+    <dia:object type="Standard - Text" version="0" id="O72">
       <dia:attribute name="obj_pos">
         <dia:point val="12.4697,27.6123"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.4697,26.9923;13.6897,28.0523"/>
+        <dia:rectangle val="12.4697,27.0123;13.6697,28.0123"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2392,12 +2373,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O74">
+    <dia:object type="Standard - Text" version="0" id="O73">
       <dia:attribute name="obj_pos">
         <dia:point val="4.40078,16.1278"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.40078,15.5078;5.82078,16.5678"/>
+        <dia:rectangle val="4.40078,15.5278;5.80078,16.5278"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2422,12 +2403,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O75">
+    <dia:object type="Standard - Text" version="0" id="O74">
       <dia:attribute name="obj_pos">
         <dia:point val="2.42088,7.9254"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.42088,7.3054;3.84088,8.3654"/>
+        <dia:rectangle val="2.42088,7.3254;3.82088,8.3254"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2452,12 +2433,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O76">
+    <dia:object type="Standard - Text" version="0" id="O75">
       <dia:attribute name="obj_pos">
         <dia:point val="29.9564,8.49108"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.9564,7.87108;31.3764,8.93108"/>
+        <dia:rectangle val="29.9564,7.89108;31.3564,8.89108"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2482,12 +2463,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O77">
+    <dia:object type="Standard - Text" version="0" id="O76">
       <dia:attribute name="obj_pos">
         <dia:point val="36.6739,8.27895"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.6739,7.65895;38.0939,8.71895"/>
+        <dia:rectangle val="36.6739,7.67895;38.0739,8.67895"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2512,12 +2493,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O78">
+    <dia:object type="Standard - Text" version="0" id="O77">
       <dia:attribute name="obj_pos">
         <dia:point val="5.99571,7.8133"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.99571,7.1933;7.21571,8.2533"/>
+        <dia:rectangle val="5.99571,7.2133;7.19571,8.2133"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2542,12 +2523,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O79">
+    <dia:object type="Standard - Text" version="0" id="O78">
       <dia:attribute name="obj_pos">
         <dia:point val="27.7644,14.7136"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.7644,14.0936;28.9844,15.1536"/>
+        <dia:rectangle val="27.7644,14.1136;28.9644,15.1136"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2572,7 +2553,7 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O80">
+    <dia:object type="Standard - Text" version="0" id="O79">
       <dia:attribute name="obj_pos">
         <dia:point val="40.6125,7.60117"/>
       </dia:attribute>