From: Leandro Lucarella <llucax@gmail.com>
Date: Tue, 5 Jul 2005 06:08:33 +0000 (+0000)
Subject: Uno flechitas y reacomodo un poco para que quede más lindo y quepa en el informe.
X-Git-Tag: svn_import~33
X-Git-Url: https://git.llucax.com/z.facultad/75.43/tp2.git/commitdiff_plain/3c90211ec717ef357186ad00a398f8fd9a4fb305?ds=sidebyside

Uno flechitas y reacomodo un poco para que quede más lindo y quepa en el informe.
---

diff --git a/diagrama.dia b/diagrama.dia
index a6160e4..d772f01 100644
--- a/diagrama.dia
+++ b/diagrama.dia
@@ -25,13 +25,19 @@
           <dia:real val="2.8222000598907471"/>
         </dia:attribute>
         <dia:attribute name="is_portrait">
-          <dia:boolean val="true"/>
+          <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="1"/>
+          <dia:real val="0.49173638224601746"/>
         </dia:attribute>
         <dia:attribute name="fitto">
-          <dia:boolean val="false"/>
+          <dia:boolean val="true"/>
+        </dia:attribute>
+        <dia:attribute name="fitwidth">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="fitheight">
+          <dia:int val="1"/>
         </dia:attribute>
       </dia:composite>
     </dia:attribute>
@@ -65,13 +71,13 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Activity" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.8529,28.2657"/>
+        <dia:point val="26,19"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.8529,28.2657;28.8529,30.0657"/>
+        <dia:rectangle val="26,19;30,20.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.8529,28.2657"/>
+        <dia:point val="26,19"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -91,7 +97,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="26.8529,29.3657"/>
+            <dia:point val="28,20.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -104,13 +110,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.12083,-0.860433"/>
+        <dia:point val="2,-5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.12083,-0.860433;6.12083,0.939567"/>
+        <dia:rectangle val="2,-5;6,-3.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.12083,-0.860433"/>
+        <dia:point val="2,-5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -130,7 +136,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.12083,0.239567"/>
+            <dia:point val="4,-3.9"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -143,13 +149,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="46.5747,-3.92612"/>
+        <dia:point val="46.8747,-3.67612"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.5747,-3.92612;50.5747,-2.12612"/>
+        <dia:rectangle val="46.8747,-3.67612;50.8747,-1.87612"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="46.5747,-3.92612"/>
+        <dia:point val="46.8747,-3.67612"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -169,7 +175,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="48.5747,-2.82612"/>
+            <dia:point val="48.8747,-2.57612"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -182,13 +188,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.3854,16.0322"/>
+        <dia:point val="11,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.3854,16.0322;18.3854,17.8322"/>
+        <dia:rectangle val="11,11;15,12.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="14.3854,16.0322"/>
+        <dia:point val="11,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -208,7 +214,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="16.3854,17.1322"/>
+            <dia:point val="13,12.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -221,13 +227,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="43.1426,17.1767"/>
+        <dia:point val="41,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="43.1426,17.1767;47.1426,18.9767"/>
+        <dia:rectangle val="41,15;45,16.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="43.1426,17.1767"/>
+        <dia:point val="41,15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -247,7 +253,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="45.1426,18.2767"/>
+            <dia:point val="43,16.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -260,13 +266,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="18.4428,35.0284"/>
+        <dia:point val="20,22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.4428,35.0284;22.4428,36.8284"/>
+        <dia:rectangle val="20,22;24,23.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="18.4428,35.0284"/>
+        <dia:point val="20,22"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -286,7 +292,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="20.4428,36.1284"/>
+            <dia:point val="22,23.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -377,13 +383,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.6452,8.4148"/>
+        <dia:point val="14,0"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.6452,8.4148;17.6452,10.2148"/>
+        <dia:rectangle val="14,0;18,1.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="13.6452,8.4148"/>
+        <dia:point val="14,0"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -403,7 +409,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="15.6452,9.5148"/>
+            <dia:point val="16,1.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -416,13 +422,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.12083,22.8163"/>
+        <dia:point val="9,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.12083,22.8163;6.12083,24.6163"/>
+        <dia:rectangle val="9,17;13,18.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.12083,22.8163"/>
+        <dia:point val="9,17"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -442,7 +448,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.12083,23.9163"/>
+            <dia:point val="11,18.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -455,13 +461,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.56439,35.0991"/>
+        <dia:point val="9,22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.56439,35.0991;10.5644,36.8991"/>
+        <dia:rectangle val="9,22;13,23.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="6.56439,35.0991"/>
+        <dia:point val="9,22"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -481,7 +487,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="8.56439,36.1991"/>
+            <dia:point val="11,23.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -494,13 +500,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="46.0618,23.8435"/>
+        <dia:point val="44,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.0618,23.8435;50.0618,25.6435"/>
+        <dia:rectangle val="44,20;48,21.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="46.0618,23.8435"/>
+        <dia:point val="44,20"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -520,7 +526,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="48.0618,24.9435"/>
+            <dia:point val="46,21.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -533,13 +539,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="37.9564,0.63368"/>
+        <dia:point val="38,0"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.9564,0.63368;41.9564,2.43368"/>
+        <dia:rectangle val="38,0;42,1.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="37.9564,0.63368"/>
+        <dia:point val="38,0"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -559,7 +565,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="39.9564,1.73368"/>
+            <dia:point val="40,1.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -572,13 +578,13 @@
     </dia:object>
     <dia:object type="Jackson - domain" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.1019,25.9532"/>
+        <dia:point val="35,22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.0569,25.9082;37.8239,27.4982"/>
+        <dia:rectangle val="34.955,21.955;38.722,23.545"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34.1019,25.9532"/>
+        <dia:point val="35,22"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -604,7 +610,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="36.1404,26.8532"/>
+            <dia:point val="37.0385,22.9"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -629,13 +635,13 @@
     </dia:object>
     <dia:object type="Jackson - domain" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="29.0769,14.2824"/>
+        <dia:point val="29,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.0319,14.2374;32.7989,15.883"/>
+        <dia:rectangle val="28.955,10.955;32.722,12.6006"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="29.0769,14.2824"/>
+        <dia:point val="29,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -661,7 +667,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="31.1154,15.2102"/>
+            <dia:point val="31.0385,11.9278"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -686,13 +692,13 @@
     </dia:object>
     <dia:object type="Jackson - domain" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="29.6426,19.1614"/>
+        <dia:point val="28,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.5976,19.1164;34.2883,20.762"/>
+        <dia:rectangle val="27.955,15.955;32.6457,17.6006"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="29.6426,19.1614"/>
+        <dia:point val="28,16"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.6006915523956131"/>
@@ -718,7 +724,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="32.1429,20.0892"/>
+            <dia:point val="30.5003,16.9278"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -971,13 +977,13 @@
     </dia:object>
     <dia:object type="Jackson - domain" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="25.8242,8.48409"/>
+        <dia:point val="26,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.7792,8.43909;29.5462,10.0847"/>
+        <dia:rectangle val="25.955,5.955;29.722,7.60063"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="25.8242,8.48409"/>
+        <dia:point val="26,6"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -1003,7 +1009,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="27.8627,9.41191"/>
+            <dia:point val="28.0385,6.92782"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1028,13 +1034,13 @@
     </dia:object>
     <dia:object type="Jackson - domain" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.28235,5.79709"/>
+        <dia:point val="2,2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.23735,5.75209;6.00431,7.39772"/>
+        <dia:rectangle val="1.955,1.955;5.72196,3.60063"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.28235,5.79709"/>
+        <dia:point val="2,2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -1060,7 +1066,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.32083,6.72491"/>
+            <dia:point val="4.03848,2.92782"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1085,13 +1091,13 @@
     </dia:object>
     <dia:object type="Jackson - domain" version="0" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.28235,16.7572"/>
+        <dia:point val="2,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.23735,16.7122;6.00431,18.3578"/>
+        <dia:rectangle val="1.955,16.955;5.72196,18.6006"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.28235,16.7572"/>
+        <dia:point val="2,17"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -1117,7 +1123,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.32083,17.685"/>
+            <dia:point val="4.03848,17.9278"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1142,13 +1148,13 @@
     </dia:object>
     <dia:object type="Jackson - domain" version="0" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.5206,28.0002"/>
+        <dia:point val="17,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.4756,27.9552;17.2426,29.6008"/>
+        <dia:rectangle val="16.955,16.955;20.722,18.6006"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="13.5206,28.0002"/>
+        <dia:point val="17,17"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -1174,7 +1180,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="15.5591,28.928"/>
+            <dia:point val="19.0385,17.9278"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1199,52 +1205,52 @@
     </dia:object>
     <dia:object type="Network - WAN Link" version="1" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="37.7788,26.7032"/>
+        <dia:point val="38.677,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.7788,25.6435;46.0618,26.7032"/>
+        <dia:rectangle val="38.677,20.9;44,22.75"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="37.7788,26.7032"/>
-        <dia:point val="46.0618,25.6435"/>
+        <dia:point val="38.677,22.75"/>
+        <dia:point val="44,20.9"/>
       </dia:attribute>
       <dia:attribute name="width">
         <dia:real val="1"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O13" connection="7"/>
-        <dia:connection handle="1" to="O11" connection="5"/>
+        <dia:connection handle="1" to="O11" connection="3"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Network - WAN Link" version="1" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.0931,20.717"/>
+        <dia:point val="31.4505,17.5556"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.0931,20.717;46.0618,23.8435"/>
+        <dia:rectangle val="31.4505,17.5556;46,20"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="33.0931,20.717"/>
-        <dia:point val="46.0618,23.8435"/>
+        <dia:point val="31.4505,17.5556"/>
+        <dia:point val="46,20"/>
       </dia:attribute>
       <dia:attribute name="width">
         <dia:real val="1"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O15" connection="6"/>
-        <dia:connection handle="1" to="O11" connection="0"/>
+        <dia:connection handle="1" to="O11" connection="1"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.8529,29.1657"/>
+        <dia:point val="26,19.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.145,28.7256;24.9054,29.2182"/>
+        <dia:rectangle val="20.612,17.7129;26.065,19.965"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="24.8529,29.1657"/>
-        <dia:point val="17.1975,28.7781"/>
+        <dia:point val="26,19.9"/>
+        <dia:point val="20.677,17.7778"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1256,14 +1262,14 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.1019,26.7032"/>
+        <dia:point val="35,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.7864,26.6367;34.1684,29.2322"/>
+        <dia:rectangle val="29.9318,19.8318;35.0682,22.8182"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="34.1019,26.7032"/>
-        <dia:point val="28.8529,29.1657"/>
+        <dia:point val="35,22.75"/>
+        <dia:point val="30,19.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1275,14 +1281,14 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="16.2783,29.5559"/>
+        <dia:point val="19.7577,18.5556"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.2082,29.4858;20.5129,35.0985"/>
+        <dia:rectangle val="19.6885,18.4865;22.0692,22.0692"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="16.2783,29.5559"/>
-        <dia:point val="20.4428,35.0284"/>
+        <dia:point val="19.7577,18.5556"/>
+        <dia:point val="22,22"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1294,14 +1300,14 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.4398,29.5559"/>
+        <dia:point val="17.9192,18.5556"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.49371,29.4852;14.5105,35.1698"/>
+        <dia:rectangle val="10.933,18.4886;17.9863,22.067"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="14.4398,29.5559"/>
-        <dia:point val="8.56439,35.0991"/>
+        <dia:point val="17.9192,18.5556"/>
+        <dia:point val="11,22"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1313,52 +1319,52 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O30">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.5206,28.7781"/>
+        <dia:point val="17,17.7778"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.05487,24.5503;13.5866,28.8441"/>
+        <dia:rectangle val="12.9485,17.7263;17.0515,17.9515"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="13.5206,28.7781"/>
-        <dia:point val="4.12083,24.6163"/>
+        <dia:point val="17,17.7778"/>
+        <dia:point val="13,17.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O23" connection="3"/>
-        <dia:connection handle="1" to="O9" connection="6"/>
+        <dia:connection handle="1" to="O9" connection="4"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O31">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.12083,18.3129"/>
+        <dia:point val="5.67696,17.7778"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.07083,18.2629;4.17083,22.8663"/>
+        <dia:rectangle val="5.62515,17.726;9.0518,17.9518"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="4.12083,18.3129"/>
-        <dia:point val="4.12083,22.8163"/>
+        <dia:point val="5.67696,17.7778"/>
+        <dia:point val="9,17.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O22" connection="5"/>
-        <dia:connection handle="1" to="O9" connection="1"/>
+        <dia:connection handle="0" to="O22" connection="7"/>
+        <dia:connection handle="1" to="O9" connection="3"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O32">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.12083,7.35272"/>
+        <dia:point val="3.83848,3.55563"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.07083,7.30272;4.17083,16.8072"/>
+        <dia:rectangle val="3.78848,3.50563;3.88848,17.05"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="4.12083,7.35272"/>
-        <dia:point val="4.12083,16.7572"/>
+        <dia:point val="3.83848,3.55563"/>
+        <dia:point val="3.83848,17"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1370,52 +1376,52 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O33">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.3854,16.9322"/>
+        <dia:point val="11,11.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.90587,16.8788;14.4388,17.5885"/>
+        <dia:rectangle val="4.68736,11.8296;11.0704,17.0704"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="14.3854,16.9322"/>
-        <dia:point val="5.95931,17.5351"/>
+        <dia:point val="11,11.9"/>
+        <dia:point val="4.75772,17"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O3" connection="3"/>
-        <dia:connection handle="1" to="O22" connection="7"/>
+        <dia:connection handle="1" to="O22" connection="0"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O34">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.3854,16.0322"/>
+        <dia:point val="13,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.96941,7.28206;14.4561,16.1029"/>
+        <dia:rectangle val="4.6871,3.48502;13.0706,11.0706"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="14.3854,16.0322"/>
-        <dia:point val="5.04007,7.35272"/>
+        <dia:point val="13,11"/>
+        <dia:point val="4.75772,3.55563"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O3" connection="0"/>
+        <dia:connection handle="0" to="O3" connection="1"/>
         <dia:connection handle="1" to="O21" connection="6"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O35">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.12083,5.79709"/>
+        <dia:point val="3.83848,2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.07083,0.889567;4.17083,5.84709"/>
+        <dia:rectangle val="3.78695,-3.25153;4.05153,2.05153"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="4.12083,5.79709"/>
-        <dia:point val="4.12083,0.939567"/>
+        <dia:point val="3.83848,2"/>
+        <dia:point val="4,-3.2"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1427,14 +1433,14 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O36">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.95931,6.5749"/>
+        <dia:point val="5.67696,2.77782"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.89542,6.51101;13.7091,9.37869"/>
+        <dia:rectangle val="5.61718,0.840222;14.0598,2.8376"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="5.95931,6.5749"/>
-        <dia:point val="13.6452,9.3148"/>
+        <dia:point val="5.67696,2.77782"/>
+        <dia:point val="14,0.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1446,14 +1452,14 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O37">
       <dia:attribute name="obj_pos">
-        <dia:point val="25.8242,9.26191"/>
+        <dia:point val="26,6.77782"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5949,9.21159;25.8745,9.36512"/>
+        <dia:rectangle val="17.9301,0.830102;26.0699,6.84772"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="25.8242,9.26191"/>
-        <dia:point val="17.6452,9.3148"/>
+        <dia:point val="26,6.77782"/>
+        <dia:point val="18,0.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1468,11 +1474,11 @@
         <dia:point val="38.1986,8.83765"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.4488,8.78527;38.251,9.31429"/>
+        <dia:rectangle val="29.6166,6.71747;38.2589,8.898"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="38.1986,8.83765"/>
-        <dia:point val="29.5012,9.26191"/>
+        <dia:point val="29.677,6.77782"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1484,13 +1490,13 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O39">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.9564,2.43368"/>
+        <dia:point val="40,1.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.9057,2.38297;40.0878,8.11054"/>
+        <dia:rectangle val="39.9497,1.7497;40.0874,8.11013"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="39.9564,2.43368"/>
+        <dia:point val="40,1.8"/>
         <dia:point val="40.0371,8.05983"/>
       </dia:attribute>
       <dia:attribute name="numcp">
@@ -1506,11 +1512,11 @@
         <dia:point val="29.3598,1.13018"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.3075,1.07789;38.0087,1.58597"/>
+        <dia:rectangle val="29.3085,0.848686;38.0513,1.18149"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="29.3598,1.13018"/>
-        <dia:point val="37.9564,1.53368"/>
+        <dia:point val="38,0.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1522,20 +1528,20 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O41">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.3937,-3.25698"/>
+        <dia:point val="19.3937,-3.25698"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.323,-3.32769;25.7535,1.20089"/>
+        <dia:rectangle val="19.3241,-3.32659;25.7524,1.19979"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="21.3937,-3.25698"/>
+        <dia:point val="19.3937,-3.25698"/>
         <dia:point val="25.6828,1.13018"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O6" connection="7"/>
+        <dia:connection handle="0" to="O6" connection="6"/>
         <dia:connection handle="1" to="O18" connection="3"/>
       </dia:connections>
     </dia:object>
@@ -1544,29 +1550,29 @@
         <dia:point val="27.3799,-6.36515"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.3342,-6.42467;27.4394,-4.99746"/>
+        <dia:rectangle val="19.3363,-6.42257;27.4373,-4.99956"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="27.3799,-6.36515"/>
-        <dia:point val="21.3937,-5.05698"/>
+        <dia:point val="19.3937,-5.05698"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O17" connection="3"/>
-        <dia:connection handle="1" to="O6" connection="2"/>
+        <dia:connection handle="1" to="O6" connection="1"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O43">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.9564,0.63368"/>
+        <dia:point val="40,0"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.9866,-6.43536;40.0266,0.703891"/>
+        <dia:rectangle val="30.9871,-6.43488;40.0697,0.0697288"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="39.9564,0.63368"/>
+        <dia:point val="40,0"/>
         <dia:point val="31.0568,-6.36515"/>
       </dia:attribute>
       <dia:attribute name="numcp">
@@ -1582,11 +1588,11 @@
         <dia:point val="46.9667,3.74648"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.8905,1.46774;47.0326,3.81242"/>
+        <dia:rectangle val="41.9318,0.831757;47.0349,3.81472"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="46.9667,3.74648"/>
-        <dia:point val="41.9564,1.53368"/>
+        <dia:point val="42,0.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1598,13 +1604,13 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O45">
       <dia:attribute name="obj_pos">
-        <dia:point val="48.5747,-2.12612"/>
+        <dia:point val="48.8747,-1.87612"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="48.5225,-2.17833;48.8574,3.02087"/>
+        <dia:rectangle val="48.7545,-1.92683;48.9254,3.01937"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="48.5747,-2.12612"/>
+        <dia:point val="48.8747,-1.87612"/>
         <dia:point val="48.8052,2.96866"/>
       </dia:attribute>
       <dia:attribute name="numcp">
@@ -1617,52 +1623,52 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O46">
       <dia:attribute name="obj_pos">
-        <dia:point val="46.6785,12.5494"/>
+        <dia:point val="48.6785,12.5494"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.8055,8.76751;46.7486,12.6195"/>
+        <dia:rectangle val="41.8078,8.76981;48.7463,12.6172"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="46.6785,12.5494"/>
+        <dia:point val="48.6785,12.5494"/>
         <dia:point val="41.8756,8.83765"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O7" connection="0"/>
+        <dia:connection handle="0" to="O7" connection="1"/>
         <dia:connection handle="1" to="O19" connection="7"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O47">
       <dia:attribute name="obj_pos">
-        <dia:point val="46.6785,14.3494"/>
+        <dia:point val="46.6785,13.4494"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.7014,14.2969;46.731,15.1127"/>
+        <dia:rectangle val="32.6214,11.7222;46.7341,13.505"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="46.6785,14.3494"/>
-        <dia:point val="32.7539,15.0602"/>
+        <dia:point val="46.6785,13.4494"/>
+        <dia:point val="32.677,11.7778"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O7" connection="5"/>
+        <dia:connection handle="0" to="O7" connection="3"/>
         <dia:connection handle="1" to="O14" connection="7"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O48">
       <dia:attribute name="obj_pos">
-        <dia:point val="29.0769,15.0602"/>
+        <dia:point val="29,11.7778"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.3275,15.0023;29.1348,16.9901"/>
+        <dia:rectangle val="14.9496,11.7274;29.0504,11.9504"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="29.0769,15.0602"/>
-        <dia:point val="18.3854,16.9322"/>
+        <dia:point val="29,11.7778"/>
+        <dia:point val="15,11.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1674,29 +1680,29 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O49">
       <dia:attribute name="obj_pos">
-        <dia:point val="29.6426,19.9392"/>
+        <dia:point val="28,16.7778"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5749,10.1445;29.7129,20.0095"/>
+        <dia:rectangle val="15.9297,1.72972;28.0703,16.8481"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="29.6426,19.9392"/>
-        <dia:point val="17.6452,10.2148"/>
+        <dia:point val="28,16.7778"/>
+        <dia:point val="16,1.8"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O15" connection="3"/>
-        <dia:connection handle="1" to="O8" connection="7"/>
+        <dia:connection handle="1" to="O8" connection="6"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O50">
       <dia:attribute name="obj_pos">
-        <dia:point val="37.9204,28.0896"/>
+        <dia:point val="39,22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.9204,27.4896;39.1204,28.4896"/>
+        <dia:rectangle val="39,21.3812;40.4688,22.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1710,7 +1716,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="37.9204,28.0896"/>
+            <dia:point val="39,22"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1723,10 +1729,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O51">
       <dia:attribute name="obj_pos">
-        <dia:point val="17.5361,28.0214"/>
+        <dia:point val="22,18"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5361,27.4214;18.7361,28.4214"/>
+        <dia:rectangle val="22,17.3812;23.4688,18.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1740,7 +1746,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="17.5361,28.0214"/>
+            <dia:point val="22,18"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1753,10 +1759,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O52">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.35936,5.33843"/>
+        <dia:point val="4,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.35936,4.73843;5.55936,5.73843"/>
+        <dia:rectangle val="4,0.4;5.45,1.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1770,7 +1776,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.35936,5.33843"/>
+            <dia:point val="4,1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1783,10 +1789,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O53">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.4707,14.4778"/>
+        <dia:point val="33,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.4707,13.8778;34.6707,14.8778"/>
+        <dia:rectangle val="33,10.4;34.45,11.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1800,7 +1806,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="33.4707,14.4778"/>
+            <dia:point val="33,11"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1813,10 +1819,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O54">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.8142,19.2154"/>
+        <dia:point val="33,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.8142,18.6154;36.0142,19.6154"/>
+        <dia:rectangle val="33,15.4;34.45,16.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1830,7 +1836,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="34.8142,19.2154"/>
+            <dia:point val="33,16"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1843,10 +1849,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O55">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.75301,19.074"/>
+        <dia:point val="6,19"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.75301,18.474;3.95301,19.474"/>
+        <dia:rectangle val="6,18.3812;7.46875,19.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1860,7 +1866,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="2.75301,19.074"/>
+            <dia:point val="6,19"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1873,14 +1879,14 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O56">
       <dia:attribute name="obj_pos">
-        <dia:point val="43.1426,18.0767"/>
+        <dia:point val="41,15.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.1841,18.0175;43.2018,19.9984"/>
+        <dia:rectangle val="32.5458,15.8451;41.0549,16.8327"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="43.1426,18.0767"/>
-        <dia:point val="34.2433,19.9392"/>
+        <dia:point val="41,15.9"/>
+        <dia:point val="32.6007,16.7778"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1895,7 +1901,7 @@
         <dia:point val="29.5321,0.6422"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.5321,0.0422;30.7321,1.0422"/>
+        <dia:rectangle val="29.5321,0.0422;30.9821,0.9922"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1925,7 +1931,7 @@
         <dia:point val="31.0568,-6.36515"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.0568,-6.96515;32.2568,-5.96515"/>
+        <dia:rectangle val="31.0568,-6.96515;32.5068,-6.01515"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1958,7 +1964,7 @@
         <dia:point val="45.4208,4.26009"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="45.4208,3.66009;46.6208,4.66009"/>
+        <dia:rectangle val="45.4208,3.66009;46.8708,4.61009"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1988,7 +1994,7 @@
         <dia:point val="42.3308,8.89767"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.3308,8.29767;43.5308,9.29767"/>
+        <dia:rectangle val="42.3308,8.29767;43.7808,9.24767"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2015,10 +2021,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O61">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.7026,8.52041"/>
+        <dia:point val="24,7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.7026,7.92041;25.9026,8.92041"/>
+        <dia:rectangle val="24,6.38125;25.4688,7.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2032,7 +2038,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="24.7026,8.52041"/>
+            <dia:point val="24,7"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2045,10 +2051,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O62">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.7636,26.2688"/>
+        <dia:point val="33,23"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.7636,25.6688;33.9636,26.6688"/>
+        <dia:rectangle val="32.9813,22.3812;34.45,23.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2062,7 +2068,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="32.7636,26.2688"/>
+            <dia:point val="33,23"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2075,10 +2081,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O63">
       <dia:attribute name="obj_pos">
-        <dia:point val="17.5113,30.27"/>
+        <dia:point val="21,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5113,29.67;18.7113,30.67"/>
+        <dia:rectangle val="21,19.3812;22.4688,20.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2092,7 +2098,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="17.5113,30.27"/>
+            <dia:point val="21,20"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2105,10 +2111,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O64">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.41997,6.4698"/>
+        <dia:point val="6,2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.41997,5.8698;7.61997,6.8698"/>
+        <dia:rectangle val="6,1.38125;7.46875,2.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2122,7 +2128,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="6.41997,6.4698"/>
+            <dia:point val="6,2"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2135,10 +2141,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O65">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.905,21.6726"/>
+        <dia:point val="32,19"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.905,21.0726;34.105,22.0726"/>
+        <dia:rectangle val="32,18.4;33.45,19.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2152,7 +2158,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="32.905,21.6726"/>
+            <dia:point val="32,19"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2165,10 +2171,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O66">
       <dia:attribute name="obj_pos">
-        <dia:point val="49.6635,2.36858"/>
+        <dia:point val="49,2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="49.6635,1.76858;50.8635,2.76858"/>
+        <dia:rectangle val="49,1.38125;50.4688,2.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2182,7 +2188,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="49.6635,2.36858"/>
+            <dia:point val="49,2"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2198,7 +2204,7 @@
         <dia:point val="23.946,1.70286"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.946,1.10286;25.146,2.10286"/>
+        <dia:rectangle val="23.946,1.10286;25.396,2.05286"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2228,7 +2234,7 @@
         <dia:point val="26.138,-6.44655"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.138,-7.04655;27.338,-6.04655"/>
+        <dia:rectangle val="26.138,-7.04655;27.588,-6.09655"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2255,10 +2261,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O69">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.6222,30.6235"/>
+        <dia:point val="16,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.6222,30.0235;14.8222,31.0235"/>
+        <dia:rectangle val="16,19.3812;17.4688,20.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2272,7 +2278,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="13.6222,30.6235"/>
+            <dia:point val="16,20"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2285,10 +2291,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O70">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.05642,18.4613"/>
+        <dia:point val="5,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.05642,17.8613;7.25642,18.8613"/>
+        <dia:rectangle val="5,15.3812;6.46875,16.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2302,7 +2308,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="6.05642,18.4613"/>
+            <dia:point val="5,16"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2315,10 +2321,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O71">
       <dia:attribute name="obj_pos">
-        <dia:point val="27.6937,20.2998"/>
+        <dia:point val="26,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.6937,19.6998;28.8937,20.6998"/>
+        <dia:rectangle val="26,16.4;27.45,17.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2332,7 +2338,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="27.6937,20.2998"/>
+            <dia:point val="26,17"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2345,10 +2351,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O72">
       <dia:attribute name="obj_pos">
-        <dia:point val="12.4697,27.6123"/>
+        <dia:point val="15,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.4697,27.0123;13.6697,28.0123"/>
+        <dia:rectangle val="15,16.4;16.45,17.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2362,7 +2368,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="12.4697,27.6123"/>
+            <dia:point val="15,17"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2375,10 +2381,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O73">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.40078,16.1278"/>
+        <dia:point val="2,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.40078,15.5278;5.80078,16.5278"/>
+        <dia:rectangle val="2,15.3812;3.61875,16.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2392,7 +2398,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.40078,16.1278"/>
+            <dia:point val="2,16"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2405,10 +2411,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O74">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.42088,7.9254"/>
+        <dia:point val="2,5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.42088,7.3254;3.82088,8.3254"/>
+        <dia:rectangle val="2,4.4;3.6,5.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2422,7 +2428,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="2.42088,7.9254"/>
+            <dia:point val="2,5"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2435,10 +2441,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O75">
       <dia:attribute name="obj_pos">
-        <dia:point val="29.9564,8.49108"/>
+        <dia:point val="30,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.9564,7.89108;31.3564,8.89108"/>
+        <dia:rectangle val="30,5.38125;31.6187,6.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2452,7 +2458,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="29.9564,8.49108"/>
+            <dia:point val="30,6"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2468,7 +2474,7 @@
         <dia:point val="36.6739,8.27895"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.6739,7.67895;38.0739,8.67895"/>
+        <dia:rectangle val="36.6739,7.67895;38.2739,8.62895"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2495,10 +2501,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O77">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.99571,7.8133"/>
+        <dia:point val="6,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.99571,7.2133;7.19571,8.2133"/>
+        <dia:rectangle val="6,3.4;7.45,4.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2512,7 +2518,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="5.99571,7.8133"/>
+            <dia:point val="6,4"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2525,10 +2531,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O78">
       <dia:attribute name="obj_pos">
-        <dia:point val="27.7644,14.7136"/>
+        <dia:point val="27,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.7644,14.1136;28.9644,15.1136"/>
+        <dia:rectangle val="27,10.3812;28.4688,11.3875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2542,7 +2548,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="27.7644,14.7136"/>
+            <dia:point val="27,11"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2558,7 +2564,7 @@
         <dia:point val="40.6125,7.60117"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="40.6125,7.00117;41.8125,8.00117"/>
+        <dia:rectangle val="40.6125,7.00117;42.0625,7.95117"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
diff --git a/red_labo.dia b/red_labo.dia
index 0d2c71d..a66b6e0 100644
--- a/red_labo.dia
+++ b/red_labo.dia
@@ -25,13 +25,19 @@
           <dia:real val="2.8222000598907471"/>
         </dia:attribute>
         <dia:attribute name="is_portrait">
-          <dia:boolean val="true"/>
+          <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="1"/>
+          <dia:real val="0.60013121366500854"/>
         </dia:attribute>
         <dia:attribute name="fitto">
-          <dia:boolean val="false"/>
+          <dia:boolean val="true"/>
+        </dia:attribute>
+        <dia:attribute name="fitwidth">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="fitheight">
+          <dia:int val="1"/>
         </dia:attribute>
       </dia:composite>
     </dia:attribute>
@@ -419,7 +425,7 @@
         <dia:point val="30.3029,26.8657"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.4437,26.4242;30.3568,26.9196"/>
+        <dia:rectangle val="25.4437,26.4241;30.3568,26.9196"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="30.3029,26.8657"/>
@@ -457,7 +463,7 @@
         <dia:point val="22.7398,27.2558"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.7938,27.1852;22.8105,31.5697"/>
+        <dia:rectangle val="18.7938,27.1852;22.8104,31.5697"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="22.7398,27.2558"/>
@@ -495,18 +501,18 @@
         <dia:point val="7.47083,24.3128"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.40219,24.2442;11.6894,26.8849"/>
+        <dia:rectangle val="7.40046,24.2424;11.6912,27.7867"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="7.47083,24.3128"/>
-        <dia:point val="11.6208,26.8163"/>
+        <dia:point val="11.6208,27.7163"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O38" connection="5"/>
-        <dia:connection handle="1" to="O6" connection="0"/>
+        <dia:connection handle="1" to="O6" connection="3"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O14">
@@ -628,36 +634,36 @@
         <dia:point val="25.6098,15.2802"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.5407,10.8647;32.5254,15.3492"/>
+        <dia:rectangle val="25.5451,11.769;34.5211,15.3449"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="25.6098,15.2802"/>
-        <dia:point val="32.4564,10.9337"/>
+        <dia:point val="34.4564,11.8337"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O32" connection="7"/>
-        <dia:connection handle="1" to="O8" connection="3"/>
+        <dia:connection handle="1" to="O8" connection="6"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="17.3937,12.493"/>
+        <dia:point val="15.3937,12.493"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.3249,12.4242;22.0016,15.349"/>
+        <dia:rectangle val="15.3281,12.4274;21.9984,15.3458"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="17.3937,12.493"/>
+        <dia:point val="15.3937,12.493"/>
         <dia:point val="21.9328,15.2802"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O3" connection="7"/>
+        <dia:connection handle="0" to="O3" connection="6"/>
         <dia:connection handle="1" to="O32" connection="3"/>
       </dia:connections>
     </dia:object>
@@ -666,18 +672,18 @@
         <dia:point val="22.3299,8.58485"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.3281,8.51923;22.3955,10.7586"/>
+        <dia:rectangle val="15.3313,8.52247;22.3923,10.7554"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="22.3299,8.58485"/>
-        <dia:point val="17.3937,10.693"/>
+        <dia:point val="15.3937,10.693"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O35" connection="3"/>
-        <dia:connection handle="1" to="O3" connection="2"/>
+        <dia:connection handle="1" to="O3" connection="1"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O23">
@@ -685,7 +691,7 @@
         <dia:point val="34.4564,10.0337"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.9491,8.52712;34.5141,10.0914"/>
+        <dia:rectangle val="25.9492,8.52712;34.5141,10.0914"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="34.4564,10.0337"/>
@@ -701,20 +707,20 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="40.5785,19.1494"/>
+        <dia:point val="42.5785,19.1494"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.6071,15.8691;40.647,19.2179"/>
+        <dia:rectangle val="38.6052,15.8672;42.6489,19.2198"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="40.5785,19.1494"/>
+        <dia:point val="42.5785,19.1494"/>
         <dia:point val="38.6756,15.9376"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O4" connection="0"/>
+        <dia:connection handle="0" to="O4" connection="1"/>
         <dia:connection handle="1" to="O28" connection="7"/>
       </dia:connections>
     </dia:object>
@@ -781,7 +787,7 @@
           <dia:point val="22.3026,20.3204"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="22.3026,19.7204;23.5026,20.7204"/>
+          <dia:rectangle val="22.3026,19.7204;23.7526,20.6704"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -811,7 +817,7 @@
           <dia:point val="26.6564,20.1911"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="26.6564,19.5911;28.0564,20.5911"/>
+          <dia:rectangle val="26.6564,19.5911;28.2564,20.5411"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -900,7 +906,7 @@
           <dia:point val="39.1308,15.9977"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="39.1308,15.3977;40.3308,16.3977"/>
+          <dia:rectangle val="39.1308,15.3977;40.5808,16.3477"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -930,7 +936,7 @@
           <dia:point val="33.4739,15.379"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="33.4739,14.779;34.8739,15.779"/>
+          <dia:rectangle val="33.4739,14.779;35.0739,15.729"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -960,7 +966,7 @@
           <dia:point val="37.4125,14.7012"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="37.4125,14.1012;38.6125,15.1012"/>
+          <dia:rectangle val="37.4125,14.1012;38.8625,15.0512"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1049,7 +1055,7 @@
           <dia:point val="25.7821,14.7922"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="25.7821,14.1922;26.9821,15.1922"/>
+          <dia:rectangle val="25.7821,14.1922;27.2321,15.1422"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1079,7 +1085,7 @@
           <dia:point val="20.196,15.8529"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="20.196,15.2529;21.396,16.2529"/>
+          <dia:rectangle val="20.196,15.2529;21.646,16.2029"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1168,7 +1174,7 @@
           <dia:point val="26.0069,8.58485"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="26.0069,7.98485;27.2069,8.98485"/>
+          <dia:rectangle val="26.0069,7.98485;27.4569,8.93485"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1201,7 +1207,7 @@
           <dia:point val="20.8208,8.31203"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="20.8208,7.71203;22.0208,8.71203"/>
+          <dia:rectangle val="20.8208,7.71203;22.2708,8.66203"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1290,7 +1296,7 @@
           <dia:point val="6.15301,25.374"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="6.15301,24.774;7.35301,25.774"/>
+          <dia:rectangle val="6.15301,24.774;7.60301,25.724"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1320,7 +1326,7 @@
           <dia:point val="9.45642,24.7613"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="9.45642,24.1613;10.6564,25.1613"/>
+          <dia:rectangle val="9.45642,24.1613;10.9064,25.1113"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1350,7 +1356,7 @@
           <dia:point val="7.80078,22.4278"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="7.80078,21.8278;9.20078,22.8278"/>
+          <dia:rectangle val="7.80078,21.8278;9.40078,22.7778"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1439,7 +1445,7 @@
           <dia:point val="26.3361,25.7214"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="26.3361,25.1214;27.5361,26.1214"/>
+          <dia:rectangle val="26.3361,25.1214;27.7861,26.0714"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1469,7 +1475,7 @@
           <dia:point val="26.3113,27.97"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="26.3113,27.37;27.5113,28.37"/>
+          <dia:rectangle val="26.3113,27.37;27.7613,28.32"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1499,7 +1505,7 @@
           <dia:point val="22.4222,28.3235"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="22.4222,27.7235;23.6222,28.7235"/>
+          <dia:rectangle val="22.4222,27.7235;23.8722,28.6735"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1529,7 +1535,7 @@
           <dia:point val="21.2697,25.3123"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="21.2697,24.7123;22.4697,25.7123"/>
+          <dia:rectangle val="21.2697,24.7123;22.7197,25.6623"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1618,7 +1624,7 @@
           <dia:point val="8.85936,16.2384"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="8.85936,15.6384;10.0594,16.6384"/>
+          <dia:rectangle val="8.85936,15.6384;10.3094,16.5884"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1648,7 +1654,7 @@
           <dia:point val="10.92,17.3698"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="10.92,16.7698;12.12,17.7698"/>
+          <dia:rectangle val="10.92,16.7698;12.37,17.7198"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -1678,7 +1684,7 @@
           <dia:point val="6.92088,18.8254"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="6.92088,18.2254;8.32088,19.2254"/>
+          <dia:rectangle val="6.92088,18.2254;8.52088,19.1754"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">