Bug Fix en MLIB_PDF_Tabla. Faltaba inicializar una variable, lo que hacia fallar...

[mecon/meconlib.git] / lib / MLIB / PDF / Marco.php

diff --git a/lib/MLIB/PDF/Marco.php b/lib/MLIB/PDF/Marco.php
index 0005392fb34f549e0a9f9e92faf32220a3bce97d..83e18a735b04530f220186854ba7967aa90fc297 100644 (file)
--- a/lib/MLIB/PDF/Marco.php
+++ b/lib/MLIB/PDF/Marco.php
@@ -1,16 +1,15 @@
 <?php /* vim: set binary expandtab tabstop=4 shiftwidth=4 textwidth=80:
 -------------------------------------------------------------------------------
-                             Ministerio de Economía
-                                    meconlib
+                                    mlib
 -------------------------------------------------------------------------------
-This file is part of meconlib.
+This file is part of mlib.
 
-meconlib is free software; you can redistribute it and/or modify it under
+mlib is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2 of the License, or (at your option)
 any later version.
 
-meconlib is distributed in the hope that it will be useful, but WITHOUT
+mlib is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  
@@ -24,24 +23,24 @@ Autor:  Martin Marrese <mmarre@mecon.gov.ar>
 $Id$
 -----------------------------------------------------------------------------*/
 
-require_once 'MECON/PDF.php';
-require_once 'MECON/PDF/Separador.php';
-require_once 'MECON/PDF/HeaderDefecto.php';
+require_once 'MLIB/PDF.php';
+require_once 'MLIB/PDF/Separador.php';
+require_once 'MLIB/PDF/HeaderDefecto.php';
 
 /**
  * Libreria que crea un marco estandar para los pdfs.
  */
-class MECON_PDF_Marco extends MECON_PDF {
+class MLIB_PDF_Marco extends MLIB_PDF {
 
     /**
-     * Objeto MECON_PDF_Separador que se utilizara por defecto.
+     * Objeto MLIB_PDF_Separador que se utilizara por defecto.
      * @var Object $separador
      * @access protected
      */
     var $_separador_defecto;
 
     /**
-     * Array de objetos MECON_PDF_Contenido
+     * Array de objetos MLIB_PDF_Contenido
      * @var array $contenido
      * @access protected
      */
@@ -113,7 +112,7 @@ class MECON_PDF_Marco extends MECON_PDF {
     var $_excepciones = array ();
 
     /**
-     * MECON_PDF_Header. Objeto que hay que utilizar como enzabezado. Si hay
+     * MLIB_PDF_Header. Objeto que hay que utilizar como enzabezado. Si hay
      * algo aqui se desecha el encabezado por defecto.
      * @var Object $header
      * @access public
@@ -130,11 +129,11 @@ class MECON_PDF_Marco extends MECON_PDF {
      * @return void
      * @access public
      */
-    function MECON_PDF_Marco($tam = "a4", $ori = "portrait", $nom = 'Doc.pdf') {
-        $this->MECON_PDF($tam, $ori, $nom);
+    function MLIB_PDF_Marco($tam = "a4", $ori = "portrait", $nom = 'Doc.pdf') {
+        $this->MLIB_PDF($tam, $ori, $nom);
         $this->tamanio = $tam;
         $this->_resetConf();
-        $this->_separador_defecto =& new MECON_PDF_Separador();
+        $this->_separador_defecto =& new MLIB_PDF_Separador();
     }
 
     /**
@@ -148,7 +147,7 @@ class MECON_PDF_Marco extends MECON_PDF {
     {
         if(is_null($pagina));
             $pagina = $this->numPage();
-        $tmp = include 'MECON/PDF/Marco/medidas.php' ; 
+        $tmp = include 'MLIB/PDF/Marco/medidas.php' ; 
         $tmp = $tmp[$this->tamanio][$this->getOrientation($pagina)];
         $tmp['Xi'] = $this->_config['Xi'];
         $tmp['Yi'] = $this->_config['Yi'];
@@ -190,7 +189,7 @@ class MECON_PDF_Marco extends MECON_PDF {
             }
         }
         else {
-            $this->espacioDisponible = $this->_config['Yf'];
+            $this->espacioDisponible = $this->header->getAltura();
             $this->_excepciones[$this->countPages()]['nova'] = true;
             
         }
@@ -269,7 +268,7 @@ class MECON_PDF_Marco extends MECON_PDF {
      * @access protected
      */
     function _crearHeaderDefecto() {
-        $this->header =& new MECON_PDF_HeaderDefecto($this->tamanio,
+        $this->header =& new MLIB_PDF_HeaderDefecto($this->tamanio,
                 $this->getOrientation($this->numPage()));
         if (@$this->logo) {
             $this->header->logo = $this->logo;
@@ -291,7 +290,7 @@ class MECON_PDF_Marco extends MECON_PDF {
         if ($this->_contenido) {
             foreach ($this->_contenido as $cont) {
                 $cont->toPDF($this); 
-                //MECON_PDF_Marco se pasa por referencia para que se agregen las
+                //MLIB_PDF_Marco se pasa por referencia para que se agregen las
                 //paginas a medida que se van necesitando. Esto permite que varie el
                 //tipo de contenido que se agrega.
             }