Continua la migracion a HTML_Image.

[mecon/meconlib.git] / doc / Marco / uml / Marco.xmi

diff --git a/doc/Marco/uml/Marco.xmi b/doc/Marco/uml/Marco.xmi
index 7b09261cbb1dc4c63c2b3c7e3c34553cacfe4957..4b9e0bc91ba21212f2b8d3d4754940dd30d0ec88 100644 (file)
--- a/doc/Marco/uml/Marco.xmi
+++ b/doc/Marco/uml/Marco.xmi
@@ -5,11 +5,11 @@
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
    <XMI.exporterVersion>1.1</XMI.exporterVersion>
   </XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
    <XMI.exporterVersion>1.1</XMI.exporterVersion>
   </XMI.documentation>

-  <XMI.model xmi.name="Marco" href="/home/martin/public_html/meconlib/tronco/doc/Marco/uml/Marco.xmi" />
+  <XMI.model xmi.name="Marco" href="/home/luca/public_html/meconlib/tronco/doc/Marco/uml/Marco.xmi" />

   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>

-  <docsettings viewid="4" documentation="" uniqueid="207" />
+  <docsettings viewid="4" documentation="" uniqueid="212" />

   <umlobjects>
    <UML:Class stereotype="" package="MECON" xmi.id="3" abstract="0" documentation="Clase que se encarga del manejo del marco en general en los sistemas de intranet.
 Trabaja de forma general, llamando a los demas objetos para la realizacion del marco." name="Marco" static="0" scope="200" >
   <umlobjects>
    <UML:Class stereotype="" package="MECON" xmi.id="3" abstract="0" documentation="Clase que se encarga del manejo del marco en general en los sistemas de intranet.
 Trabaja de forma general, llamando a los demas objetos para la realizacion del marco." name="Marco" static="0" scope="200" >


@@ -135,26 +135,25 @@ Devuelve 1 si pertenece a la seccion, en caso contrario 0." name="verifSeccionSe
 " name="ImagenAnimada" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="70" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre del archivo que contiene la imagen." name="ImagenAnimada" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del archivo imagen.  " name="imagenComun" static="0" scope="200" />
 " name="ImagenAnimada" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="70" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre del archivo que contiene la imagen." name="ImagenAnimada" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del archivo imagen.  " name="imagenComun" static="0" scope="200" />

-     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="string" abstract="0" documentation="Imagen alterna con el mouse por arriba" name="imagenMouseOn" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="3" value="null" type="string" abstract="0" documentation="Imagen alterna cuando esta seleccionada la seccion" name="imagenSelect" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="4" value="null" type="string" abstract="0" documentation="Directorio en donde se encuentran las imagenes" name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="''" type="string" abstract="0" documentation="Imagen alterna con el mouse por arriba" name="imagenMouseOn" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="3" value="''" type="string" abstract="0" documentation="Imagen alterna cuando esta seleccionada la seccion" name="imagenSelect" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="''" type="string" abstract="0" documentation="Directorio en donde se encuentran las imagenes" name="directorio" static="0" scope="200" />

     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="71" type="string" abstract="0" documentation="Funcion que devuelve un string con el html a imprimir en pantalla." name="toHtml" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="71" type="string" abstract="0" documentation="Funcion que devuelve un string con el html a imprimir en pantalla." name="toHtml" static="0" scope="200" />

+    <UML:Operation stereotype="" package="" xmi.id="209" type="string" abstract="0" documentation="" name="calcularImagen" static="0" scope="202" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre de la imagen." name="imagen" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Directorio." name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="3" value="''" type="string" abstract="0" documentation="Modificador que indica una variante de la imagen." name="modificador" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Attribute stereotype="" package="" xmi.id="208" value="" type="string" abstract="0" documentation="Nombre del archivo imagen." name="imgComun" static="0" scope="201" />

     <UML:Attribute stereotype="" package="" xmi.id="68" value="" type="string" abstract="0" documentation="Nombre del archivo imagen." name="imgMouseOn" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="69" value="" type="string" abstract="0" documentation="Nombre del archivo imagen." name="imgSelect" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="68" value="" type="string" abstract="0" documentation="Nombre del archivo imagen." name="imgMouseOn" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="69" value="" type="string" abstract="0" documentation="Nombre del archivo imagen." name="imgSelect" static="0" scope="201" />

-   </UML:Class>
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="18" abstract="0" documentation="Clase para el manejo de las imagenes." name="Imagen" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="73" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre del archivo imagen." name="Imagen" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del archivo imagen" name="imagen" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Directorio en donde se encuentra las imagenes" name="directorio" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="74" type="string" abstract="0" documentation="Funcion que devuelve un string con el html a imprimir en pantalla." name="toHtml" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="83" type="void" abstract="0" documentation="" name="cargarAlt" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Alt de la imagen." name="alt" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Attribute stereotype="" package="" xmi.id="72" value="" type="string" abstract="0" documentation="Nombre del archivo imagen" name="imgComun" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="78" value="" type="string" abstract="0" documentation="Alt de la imagen" name="alt" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="205" value="" type="string" abstract="0" documentation="Directorio en donde se encuentran las imagenes" name="directorio" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="210" value="false" type="bool" abstract="0" documentation="Indica si la imagen esta seleccionada.
+x2c:get set" name="seleccionada" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="211" value="true" type="bool" abstract="0" documentation="Indica si está habilitado el link.
+x2c:get set" name="habilitada" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="212" value="''" type="string" abstract="0" documentation="Link a donde apunta la imagen.
+x2c:get set" name="link" static="0" scope="202" />

    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="92" abstract="0" documentation="x2c:extern
 x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="92" abstract="0" documentation="x2c:extern
 x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />


@@ -198,22 +197,21 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
    </UML:Class>
   </umlobjects>
   <diagrams>
    </UML:Class>
   </umlobjects>
   <diagrams>

-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="6" snapy="6" showatts="1" xmi.id="4" documentation="" type="402" showops="1" showpackage="0" name="Marco" localid="30000" showstereotype="0" showscope="1" font="helvetica,9,-1,0,50,0,0,0,0,0" linecolor="#ff0000" >
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="6" snapy="6" showatts="1" xmi.id="4" documentation="" type="402" showops="1" showpackage="0" name="Marco" localid="30000" showstereotype="0" showscope="1" font="helvetica,6,-1,0,50,0,0,0,0,0" linecolor="#ff0000" >

     <widgets>
     <widgets>

-     <UML:ConceptWidget usesdiagramfillcolour="0" width="198" showattsigs="601" usesdiagramusefillcolour="0" x="362" linecolour="#ff0000" y="117" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="209" usefillcolor="1" showattributes="1" xmi.id="3" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="147" showattsigs="601" usesdiagramusefillcolour="0" x="3" linecolour="#ff0000" y="19" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="9" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="144" showattsigs="601" usesdiagramusefillcolour="0" x="239" linecolour="#ff0000" y="17" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="10" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="209" showattsigs="601" usesdiagramusefillcolour="0" x="180" linecolour="#ff0000" y="894" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="77" usefillcolor="1" showattributes="1" xmi.id="18" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="529" showattsigs="601" usesdiagramusefillcolour="0" x="31" linecolour="#ff0000" y="773" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="210" showattsigs="601" usesdiagramusefillcolour="0" x="327" linecolour="#ff0000" y="381" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="176" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="136" showattsigs="601" usesdiagramusefillcolour="0" x="61" linecolour="#ff0000" y="160" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="66" usefillcolor="1" showattributes="1" xmi.id="15" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="253" showattsigs="601" usesdiagramusefillcolour="0" x="21" linecolour="#ff0000" y="365" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="143" usefillcolor="1" showattributes="1" xmi.id="16" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="123" showattsigs="601" usesdiagramusefillcolour="0" x="541" linecolour="#ff0000" y="21" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="13" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="64" showattsigs="601" usesdiagramusefillcolour="0" x="637" linecolour="#ff0000" y="114" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="21" usefillcolor="1" showattributes="1" xmi.id="92" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="217" showattsigs="601" usesdiagramusefillcolour="0" x="459" linecolour="#ff0000" y="598" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="100" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="207" showattsigs="601" usesdiagramusefillcolour="0" x="647" linecolour="#ff0000" y="388" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="202" showattsigs="601" usesdiagramusefillcolour="0" x="650" linecolour="#ff0000" y="469" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="136" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="187" showattsigs="601" usesdiagramusefillcolour="0" x="508" linecolour="#ff0000" y="693" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" xmi.id="193" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="198" showattsigs="601" usesdiagramusefillcolour="0" x="362" linecolour="#ff0000" y="117" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="209" usefillcolor="1" showattributes="1" xmi.id="3" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="147" showattsigs="601" usesdiagramusefillcolour="0" x="3" linecolour="#ff0000" y="19" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="9" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="144" showattsigs="601" usesdiagramusefillcolour="0" x="239" linecolour="#ff0000" y="17" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="10" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="505" showattsigs="601" usesdiagramusefillcolour="0" x="31" linecolour="#ff0000" y="773" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="110" usefillcolor="1" showattributes="1" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="210" showattsigs="601" usesdiagramusefillcolour="0" x="327" linecolour="#ff0000" y="381" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="176" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="136" showattsigs="601" usesdiagramusefillcolour="0" x="61" linecolour="#ff0000" y="160" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="66" usefillcolor="1" showattributes="1" xmi.id="15" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="253" showattsigs="601" usesdiagramusefillcolour="0" x="21" linecolour="#ff0000" y="365" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="143" usefillcolor="1" showattributes="1" xmi.id="16" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="123" showattsigs="601" usesdiagramusefillcolour="0" x="541" linecolour="#ff0000" y="21" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="13" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="64" showattsigs="601" usesdiagramusefillcolour="0" x="637" linecolour="#ff0000" y="114" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="21" usefillcolor="1" showattributes="1" xmi.id="92" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="217" showattsigs="601" usesdiagramusefillcolour="0" x="459" linecolour="#ff0000" y="598" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="100" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="207" showattsigs="601" usesdiagramusefillcolour="0" x="647" linecolour="#ff0000" y="388" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="202" showattsigs="601" usesdiagramusefillcolour="0" x="650" linecolour="#ff0000" y="469" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="136" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="187" showattsigs="601" usesdiagramusefillcolour="0" x="508" linecolour="#ff0000" y="693" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" xmi.id="193" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />

     </widgets>
     <messages/>
     <associations>
     </widgets>
     <messages/>
     <associations>


@@ -249,16 +247,10 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" widgetbid="16" widgetaid="17" documentation="" type="501" >
       <linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" widgetbid="16" widgetaid="17" documentation="" type="501" >
       <linepath>

-       <startpoint startx="207" starty="773" />
+       <startpoint startx="199" starty="773" />

        <endpoint endx="147" endy="508" />
       </linepath>
      </UML:AssocWidget>
        <endpoint endx="147" endy="508" />
       </linepath>
      </UML:AssocWidget>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="18" widgetaid="17" documentation="" type="500" >
-      <linepath>
-       <startpoint startx="295" starty="828" />
-       <endpoint endx="284" endy="894" />
-      </linepath>
-     </UML:AssocWidget>

      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="92" widgetaid="3" documentation="" type="500" >
       <linepath>
        <startpoint startx="560" starty="221" />
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="92" widgetaid="3" documentation="" type="500" >
       <linepath>
        <startpoint startx="560" starty="221" />


@@ -291,7 +283,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="4" indexb="3" widgetbid="14" widgetaid="17" documentation="" type="501" >
       <linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="4" indexb="3" widgetbid="14" widgetaid="17" documentation="" type="501" >
       <linepath>

-       <startpoint startx="383" starty="773" />
+       <startpoint startx="367" starty="773" />

        <endpoint endx="327" endy="513" />
       </linepath>
      </UML:AssocWidget>
        <endpoint endx="327" endy="513" />
       </linepath>
      </UML:AssocWidget>


@@ -360,20 +352,18 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="815" id="35" label="toHtml" />
       </listitem>
       <listitem open="1" type="813" id="92" label="HTML_Page" />
        <listitem open="0" type="815" id="35" label="toHtml" />
       </listitem>
       <listitem open="1" type="813" id="92" label="HTML_Page" />

-      <listitem open="0" type="813" id="18" label="Imagen" >
-       <listitem open="0" type="814" id="78" label="alt" />
-       <listitem open="0" type="815" id="83" label="cargarAlt" />
-       <listitem open="0" type="814" id="205" label="directorio" />
-       <listitem open="0" type="815" id="73" label="Imagen" />
-       <listitem open="0" type="814" id="72" label="imgComun" />
-       <listitem open="0" type="815" id="74" label="toHtml" />
-      </listitem>

       <listitem open="0" type="813" id="17" label="ImagenAnimada" >
       <listitem open="0" type="813" id="17" label="ImagenAnimada" >

+       <listitem open="0" type="815" id="209" label="calcularImagen" />
+       <listitem open="0" type="814" id="211" label="habilitada" />

        <listitem open="0" type="815" id="70" label="ImagenAnimada" />
        <listitem open="0" type="815" id="70" label="ImagenAnimada" />

+       <listitem open="0" type="814" id="208" label="imgComun" />

        <listitem open="0" type="814" id="68" label="imgMouseOn" />
        <listitem open="0" type="814" id="69" label="imgSelect" />
        <listitem open="0" type="814" id="68" label="imgMouseOn" />
        <listitem open="0" type="814" id="69" label="imgSelect" />

+       <listitem open="0" type="814" id="212" label="link" />
+       <listitem open="0" type="814" id="210" label="seleccionada" />

        <listitem open="0" type="815" id="71" label="toHtml" />
       </listitem>
        <listitem open="0" type="815" id="71" label="toHtml" />
       </listitem>

+      <listitem open="1" type="807" id="4" label="Marco" />

       <listitem open="0" type="813" id="3" label="Marco" >
        <listitem open="0" type="815" id="97" label="addBody" />
        <listitem open="0" type="815" id="124" label="addTitle" />
       <listitem open="0" type="813" id="3" label="Marco" >
        <listitem open="0" type="815" id="97" label="addBody" />
        <listitem open="0" type="815" id="124" label="addTitle" />


@@ -394,7 +384,6 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="814" id="20" label="titulo" />
        <listitem open="0" type="814" id="125" label="titulo2" />
       </listitem>
        <listitem open="0" type="814" id="20" label="titulo" />
        <listitem open="0" type="814" id="125" label="titulo2" />
       </listitem>

-      <listitem open="1" type="807" id="4" label="Marco" />

       <listitem open="0" type="813" id="14" label="Menu" >
        <listitem open="0" type="815" id="134" label="agregarComponente" />
        <listitem open="0" type="815" id="82" label="armarArraySecciones" />
       <listitem open="0" type="813" id="14" label="Menu" >
        <listitem open="0" type="815" id="134" label="agregarComponente" />
        <listitem open="0" type="815" id="82" label="armarArraySecciones" />


@@ -425,8 +414,8 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="815" id="110" label="MenuVertical" />
       </listitem>
       <listitem open="0" type="813" id="15" label="Pagina" >
        <listitem open="0" type="815" id="110" label="MenuVertical" />
       </listitem>
       <listitem open="0" type="813" id="15" label="Pagina" >

-       <listitem open="0" type="814" id="65" label="link" />

        <listitem open="0" type="815" id="67" label="link" />
        <listitem open="0" type="815" id="67" label="link" />

+       <listitem open="0" type="814" id="65" label="link" />

        <listitem open="0" type="815" id="66" label="Pagina" />
        <listitem open="0" type="814" id="81" label="permisos" />
        <listitem open="0" type="814" id="80" label="titulo" />
        <listitem open="0" type="815" id="66" label="Pagina" />
        <listitem open="0" type="814" id="81" label="permisos" />
        <listitem open="0" type="814" id="80" label="titulo" />