Se agrega Cap.codigo como propuso Julian.

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 91e2c0d4800701d8700763e7f7b8f242e4a9bd8f..3d6556d0777ef8fb346f46b16e76b22b0f6f6047 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -1142,19 +1142,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">

-        <dia:point val="36.275,5.35"/>
+        <dia:point val="37.575,3.05"/>

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

-        <dia:rectangle val="36.225,5.3;43.925,8.6"/>
+        <dia:rectangle val="37.525,3;45.225,7.1"/>

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

-        <dia:point val="36.275,5.35"/>
+        <dia:point val="37.575,3.05"/>

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

-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="4"/>

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


@@ -1281,6 +1281,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Código único para identificar al Cap (se usa para referirse al Cap en listados, etc)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>

       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">


@@ -2818,12 +2841,12 @@
         <dia:point val="44.715,11.76"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="44.715,11.76"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="39.325,7.8;45.415,12.61"/>
+        <dia:rectangle val="40.625,6.3;45.415,12.61"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="44.715,11.76"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="44.715,11.76"/>

-        <dia:point val="40.075,11.76"/>
-        <dia:point val="40.075,8.55"/>
+        <dia:point val="41.375,11.76"/>
+        <dia:point val="41.375,7.05"/>

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


@@ -4005,13 +4028,13 @@
         <dia:point val="32.7008,1.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="32.7008,1.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="32.6508,0.8075;37.025,8.9"/>
+        <dia:rectangle val="32.6508,0.8075;38.325,6.6"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.7008,1.5575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.7008,1.5575"/>

-        <dia:point val="34.4879,1.5575"/>
-        <dia:point val="34.4879,8.05"/>
-        <dia:point val="36.275,8.05"/>
+        <dia:point val="35.1379,1.5575"/>
+        <dia:point val="35.1379,5.75"/>
+        <dia:point val="37.575,5.75"/>

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

diff --git a/diagramas/der.dia b/diagramas/der.dia
index a1051e1cb1a709670599ca4476d6cdbd4a352f62..00761b7a3df80677df7e8b65c41080498c9c4c91 100644 (file)
--- a/diagramas/der.dia
+++ b/diagramas/der.dia
@@ -1445,7 +1445,7 @@
         <dia:point val="33.525,-1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="33.525,-1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="33.475,-1.05;41.875,3.85"/>
+        <dia:rectangle val="33.475,-1.05;41.875,4.65"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="33.525,-1"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="33.525,-1"/>


@@ -1454,7 +1454,7 @@
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="5.5999999999999996"/>

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


@@ -1558,6 +1558,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Código único de identificación del Cap.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>

         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#responsable#</dia:string>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#responsable#</dia:string>


@@ -4020,13 +4043,13 @@
         <dia:point val="31.9008,12.0575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="31.9008,12.0575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="31.8508,2.55;33.875,12.9075"/>
+        <dia:rectangle val="31.8508,3.35;33.875,12.9075"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="31.9008,12.0575"/>
         <dia:point val="32.7129,12.0575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="31.9008,12.0575"/>
         <dia:point val="32.7129,12.0575"/>

-        <dia:point val="32.7129,3.3"/>
-        <dia:point val="33.525,3.3"/>
+        <dia:point val="32.7129,4.1"/>
+        <dia:point val="33.525,4.1"/>

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


@@ -4071,7 +4094,7 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O19" connection="4"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O19" connection="4"/>

-        <dia:connection handle="1" to="O6" connection="14"/>
+        <dia:connection handle="1" to="O6" connection="16"/>

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


@@ -4269,12 +4292,12 @@
         <dia:point val="38.75,15.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="38.75,15.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="37.625,3.75;39.1,16.1"/>
+        <dia:rectangle val="37.625,4.55;39.1,16.1"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.75,15.25"/>
         <dia:point val="37.675,15.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.75,15.25"/>
         <dia:point val="37.675,15.25"/>

-        <dia:point val="37.675,3.8"/>
+        <dia:point val="37.675,4.6"/>

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