(no commit message)

diff --git a/marco/doc/uml/Marco.xmi b/marco/doc/uml/Marco.xmi
index 1a761fe76d5ca69028db76ab39e7163ef8a0ff27..a50d7e27ae82ba40a0251665f7dda5c71779d390 100644 (file)
--- a/marco/doc/uml/Marco.xmi
+++ b/marco/doc/uml/Marco.xmi
@@ -79,7 +79,7 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="14" abstract="0" documentation="Clase para el manejo de los menues y secciones de los sistemas." name="Menu" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="56" type="void" abstract="0" documentation="Constructor. Recibe como parametro el directorio en donde se encuentra el sistema." name="Menu" static="0" scope="200" >
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="14" abstract="0" documentation="Clase para el manejo de los menues y secciones de los sistemas." name="Menu" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="56" type="void" abstract="0" documentation="Constructor. Recibe como parametro el directorio en donde se encuentra el sistema." name="Menu" static="0" scope="200" >

-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del directorio en donde se encuentra el sistema.                                                     " name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="string" abstract="0" documentation="Nombre del directorio en donde se encuentra el sistema.                                                 " name="directorio" static="0" scope="200" />

      <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="string" abstract="0" documentation="Nombre del menu" name="nombre" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="3" value="null" type="string" abstract="0" documentation="Link del menu." name="link" static="0" scope="200" />
     </UML:Operation>
      <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="string" abstract="0" documentation="Nombre del menu" name="nombre" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="3" value="null" type="string" abstract="0" documentation="Link del menu." name="link" static="0" scope="200" />
     </UML:Operation>


@@ -147,7 +147,7 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
      <UML:ConceptWidget usesdiagramfillcolour="0" width="247" showattsigs="601" usesdiagramusefillcolour="0" x="521" linecolour="#ff0000" y="195" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="96" usefillcolor="1" showattributes="1" xmi.id="12" 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="342" linecolour="#ff0000" y="896" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="96" 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="641" showattsigs="601" usesdiagramusefillcolour="0" x="351" linecolour="#ff0000" y="716" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="80" 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="247" showattsigs="601" usesdiagramusefillcolour="0" x="521" linecolour="#ff0000" y="195" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="96" usefillcolor="1" showattributes="1" xmi.id="12" 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="342" linecolour="#ff0000" y="896" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="96" 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="641" showattsigs="601" usesdiagramusefillcolour="0" x="351" linecolour="#ff0000" y="716" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="80" 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="447" showattsigs="601" usesdiagramusefillcolour="0" x="17" linecolour="#ff0000" y="484" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="192" 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="482" showattsigs="601" usesdiagramusefillcolour="0" x="17" linecolour="#ff0000" y="484" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="192" 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="191" showattsigs="601" usesdiagramusefillcolour="0" x="26" linecolour="#ff0000" y="854" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="96" 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="204" showattsigs="601" usesdiagramusefillcolour="0" x="17" linecolour="#ff0000" y="708" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="112" 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="223" showattsigs="601" usesdiagramusefillcolour="0" x="494" linecolour="#ff0000" y="416" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="64" 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="191" showattsigs="601" usesdiagramusefillcolour="0" x="26" linecolour="#ff0000" y="854" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="96" 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="204" showattsigs="601" usesdiagramusefillcolour="0" x="17" linecolour="#ff0000" y="708" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="112" 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="223" showattsigs="601" usesdiagramusefillcolour="0" x="494" linecolour="#ff0000" y="416" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="64" 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" />


@@ -186,20 +186,20 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="3" widgetaid="14" documentation="" type="501" >
       <linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="3" widgetaid="14" documentation="" type="501" >
       <linepath>

-       <startpoint startx="240" starty="484" />
+       <startpoint startx="258" starty="484" />

        <endpoint endx="203" endy="400" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="3" indexb="1" widgetbid="16" widgetaid="14" documentation="" type="501" >
       <linepath>
        <endpoint endx="203" endy="400" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="3" indexb="1" widgetbid="16" widgetaid="14" documentation="" type="501" >
       <linepath>

-       <startpoint startx="166" starty="676" />
+       <startpoint startx="177" starty="676" />

        <endpoint endx="85" endy="708" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="2" widgetbid="14" widgetaid="16" documentation="" type="501" >
       <linepath>
        <startpoint startx="153" starty="708" />
        <endpoint endx="85" endy="708" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="2" widgetbid="14" widgetaid="16" documentation="" type="501" >
       <linepath>
        <startpoint startx="153" starty="708" />

-       <endpoint endx="315" endy="676" />
+       <endpoint endx="338" endy="676" />

       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="15" widgetaid="16" documentation="" type="500" >
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="15" widgetaid="16" documentation="" type="500" >

diff --git a/marco/php/marco/Menu.php b/marco/php/marco/Menu.php
index b5f9ab93fd4504fd4936c57f2a89a01febebc1f2..e73223c52d5f94293c2c6aab47d33c5400975072 100644 (file)
--- a/marco/php/marco/Menu.php
+++ b/marco/php/marco/Menu.php
@@ -92,12 +92,14 @@ class Menu {
      *
      * @access public
      */
      *
      * @access public
      */

-    function Menu($directorio, $nombre = null, $link = null) // ~X2C
+    function Menu($directorio = null, $nombre = null, $link = null) // ~X2C

     {
     {

-        $this->_directorio = $directorio;
-        $this->_obtenerConfSecciones();
-        $this->_armarArraySecciones();
-
+        if (!is_null($directorio)) {
+            $this->_directorio = $directorio;
+            $this->_obtenerConfSecciones();
+            $this->_armarArraySecciones();
+        }
+        

         if (!is_null($nombre)) {
             $this->_nombre = $nombre;
         }
         if (!is_null($nombre)) {
             $this->_nombre = $nombre;
         }

diff --git a/marco/php/marco/Seccion.php b/marco/php/marco/Seccion.php
index 1d3e4099588cbfcb140714fb7194678e9bfbbfa6..2e9a208965f29eb7d349f9da40b22ef9ce82a69c 100644 (file)
--- a/marco/php/marco/Seccion.php
+++ b/marco/php/marco/Seccion.php
@@ -33,6 +33,7 @@ require_once 'Pagina.php';
 
 //Require Agregados por MMARRE, no pasan por el xmi2code
 require_once 'ImagenAnimada.php';
 
 //Require Agregados por MMARRE, no pasan por el xmi2code
 require_once 'ImagenAnimada.php';

+require_once 'Menu.php';

 
 // +X2C Class 16 :Seccion
 /**
 
 // +X2C Class 16 :Seccion
 /**


@@ -116,7 +117,11 @@ class Seccion extends Pagina {
      */
     function _cargarHijos($hijos) // ~X2C
     {
      */
     function _cargarHijos($hijos) // ~X2C
     {

-        var_dump($hijos);
+        $this->_hijos = array ();
+        foreach ($hijos as $hijo$) {
+            $tmp = new Menu (null, $hijo['nombre'],$hijo['link']);
+            array_push($this->_hijos, $tmp);
+        }

     }
     // -X2C
 
     }
     // -X2C