Mergeo actualizaciones de florc.

[z.facultad/75.10/miklolife.git] / carpeta / diagramas / clases.relaciones.dia

diff --git a/carpeta/diagramas/clases.relaciones.dia b/carpeta/diagramas/clases.relaciones.dia
index 359f6b6535cc8910748b8ccfc6d97d5b3b57197c..8a3b43dae295c1b4504609d2971136f600eb60a1 100644 (file)
--- a/carpeta/diagramas/clases.relaciones.dia
+++ b/carpeta/diagramas/clases.relaciones.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">

-          <dia:real val="0.57825964689254761"/>
+          <dia:real val="0.57275241613388062"/>

         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>


@@ -71,13 +71,13 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">

-        <dia:point val="21,16"/>
+        <dia:point val="20,19"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="20.95,15.95;25.55,17.45"/>
+        <dia:rectangle val="19.95,18.95;24.55,20.45"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="21,16"/>
+        <dia:point val="20,19"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.5"/>


@@ -886,8 +886,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="23.025,12.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="23.025,12.4"/>

-        <dia:point val="23.025,14"/>
-        <dia:point val="18.8,14"/>
+        <dia:point val="23.025,17"/>
+        <dia:point val="18.8,17"/>

         <dia:point val="18.8,21"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="18.8,21"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">


@@ -917,13 +917,13 @@
         <dia:point val="23.025,12.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="23.025,12.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="22.175,12.35;23.875,16.05"/>
+        <dia:rectangle val="22.175,12.35;23.875,19.05"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="23.025,12.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="23.025,12.4"/>

-        <dia:point val="23.025,14"/>
-        <dia:point val="23.25,14"/>
-        <dia:point val="23.25,16"/>
+        <dia:point val="23.025,17"/>
+        <dia:point val="22.25,17"/>
+        <dia:point val="22.25,19"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -949,13 +949,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">

-        <dia:point val="32,12"/>
+        <dia:point val="32,10"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="31.95,11.95;34.75,13.45"/>
+        <dia:rectangle val="31.95,9.95;34.75,11.45"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="32,12"/>
+        <dia:point val="32,10"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="2.7000000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="2.7000000000000002"/>


@@ -1050,13 +1050,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">

-        <dia:point val="30,16"/>
+        <dia:point val="26,19"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="29.95,15.95;34.95,17.45"/>
+        <dia:rectangle val="25.95,18.95;30.95,20.45"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="30,16"/>
+        <dia:point val="26,19"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.8999999999999995"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.8999999999999995"/>


@@ -1154,13 +1154,13 @@
         <dia:point val="23.025,12.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="23.025,12.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="22.175,12.35;32.5,16.05"/>
+        <dia:rectangle val="22.175,12.35;28.5,19.05"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="23.025,12.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="23.025,12.4"/>

-        <dia:point val="23.025,14"/>
-        <dia:point val="32.45,14"/>
-        <dia:point val="32.45,16"/>
+        <dia:point val="23.025,17"/>
+        <dia:point val="28.45,17"/>
+        <dia:point val="28.45,19"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -1667,8 +1667,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-0.3,26.7"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-0.3,26.7"/>

-        <dia:point val="4,26.7"/>
-        <dia:point val="4,26.7"/>
+        <dia:point val="4.8,26.7"/>
+        <dia:point val="4.8,26.7"/>

         <dia:point val="9,26.7"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="9,26.7"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">


@@ -1784,14 +1784,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">

-        <dia:point val="32,12.7"/>
+        <dia:point val="32,10.7"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="27.325,6.65;32.7,13.55"/>
+        <dia:rectangle val="27.325,6.65;32.7,11.55"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="32,12.7"/>
-        <dia:point val="28.075,12.7"/>
+        <dia:point val="32,10.7"/>
+        <dia:point val="28.075,10.7"/>

         <dia:point val="28.075,7.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="28.075,7.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">


@@ -1841,16 +1841,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">

-        <dia:point val="30,16"/>
+        <dia:point val="26,19.7"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="25.45,15.25;30.7,17.55"/>
+        <dia:rectangle val="24.4293,18.95;26.7,20.55"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="30,16"/>
-        <dia:point val="27.75,16"/>
-        <dia:point val="27.75,16.7"/>
-        <dia:point val="25.5,16.7"/>
+        <dia:point val="26,19.7"/>
+        <dia:point val="26,19.7"/>
+        <dia:point val="24.5,19.7"/>
+        <dia:point val="24.5,19.7"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -1894,7 +1894,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O11" connection="0"/>
+        <dia:connection handle="0" to="O11" connection="3"/>

         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>


@@ -2082,13 +2082,13 @@
         <dia:point val="14.175,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="14.175,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="14.125,4.25;34.1,12.75"/>
+        <dia:rectangle val="14.125,4.25;34.1,10.75"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="14.175,6"/>
         <dia:point val="14.175,5"/>
         <dia:point val="33.35,5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="14.175,6"/>
         <dia:point val="14.175,5"/>
         <dia:point val="33.35,5"/>

-        <dia:point val="33.35,12"/>
+        <dia:point val="33.35,10"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -2581,12 +2581,12 @@
         <dia:point val="17,22.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="17,22.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="16.25,21.65;27.1,29.05"/>
+        <dia:rectangle val="16.25,21.65;27.1,28.95"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="17,22.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="17,22.4"/>

-        <dia:point val="17,29"/>
-        <dia:point val="20.6,29"/>
+        <dia:point val="17,28.9"/>
+        <dia:point val="20.6,28.9"/>

         <dia:point val="20.6,22.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="20.6,22.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">


@@ -2702,14 +2702,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O35">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O35">
       <dia:attribute name="obj_pos">

-        <dia:point val="20.6,22.4"/>
+        <dia:point val="20.6,21.7"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="19.85,21.65;34.75,28.55"/>
+        <dia:rectangle val="19.85,20.95;34.75,28.55"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="20.6,22.4"/>
-        <dia:point val="28,22.4"/>
+        <dia:point val="20.6,21.7"/>
+        <dia:point val="28,21.7"/>

         <dia:point val="28,27.7"/>
         <dia:point val="30,27.7"/>
       </dia:attribute>
         <dia:point val="28,27.7"/>
         <dia:point val="30,27.7"/>
       </dia:attribute>


@@ -2758,7 +2758,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O2" connection="7"/>
+        <dia:connection handle="0" to="O2" connection="4"/>

         <dia:connection handle="1" to="O27" connection="3"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O27" connection="3"/>
       </dia:connections>
     </dia:object>


@@ -2823,21 +2823,24 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">

-        <dia:point val="32.45,17.4"/>
+        <dia:point val="30.9,19.7"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="20.55,17.35;33.5,21.8"/>
+        <dia:rectangle val="25,10.95;35.95,20.55"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="32.45,17.4"/>
-        <dia:point val="32.45,19.2"/>
-        <dia:point val="20.6,19.2"/>
-        <dia:point val="20.6,21"/>
+        <dia:point val="30.9,19.7"/>
+        <dia:point val="32,19.7"/>
+        <dia:point val="32,11.7"/>
+        <dia:point val="25.05,11.7"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
       </dia:attribute>
       <dia:attribute name="orth_orient">

-        <dia:enum val="1"/>

         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>

+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#titularidad#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#titularidad#</dia:string>


@@ -2876,8 +2879,8 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O11" connection="6"/>
-        <dia:connection handle="1" to="O2" connection="2"/>
+        <dia:connection handle="0" to="O11" connection="4"/>
+        <dia:connection handle="1" to="O1" connection="4"/>

       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O38">
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O38">