From 10e466dd9ac520985d44bb6cffea59c3ffddbe3a Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Thu, 4 Mar 2010 14:03:47 +0000
Subject: [PATCH] 

---
 aplicmap/openlayers.htm                 | 13 ++++---------
 ferramentas/imprimir/a4lpaisagempdf.htm |  2 +-
 ferramentas/imprimir/a4lpaisagempdf.php |  8 ++++++++
 ferramentas/imprimir/aggpng.php         | 14 ++++++++++----
 ferramentas/imprimir/geotif.php         | 14 +++++++++++---
 ferramentas/imprimir/geraimagens.php    |  6 ++++++
 ferramentas/imprimir/index.js.php       | 13 ++++++++-----
 7 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/aplicmap/openlayers.htm b/aplicmap/openlayers.htm
index 9e7e385..579572c 100644
--- a/aplicmap/openlayers.htm
+++ b/aplicmap/openlayers.htm
@@ -163,23 +163,14 @@
 		<p style='font-size:2px;'>&nbsp;</p>
 		<img title="geral" alt="" src="../imagens/branco.gif" id='zoomtot'/>
 	</div>
-
-
 	<div style='display:inline;background-color:rgb(250,250,250);'>
 		<p style='font-size:2px;'>&nbsp;</p>
 		<img title="mede" alt="" src="../imagens/branco.gif" id='mede'/>
 	</div>
-
-	<div style='display:inline;background-color:rgb(250,250,250);'>
-		<p style='font-size:2px;'>&nbsp;</p>
-		<img title="reinicia" alt="" src="../imagens/branco.gif" id='reinicia'/>
-	</div>
-	
 	<div style='display:inline;background-color:rgb(250,250,250);'>
 		<p style='font-size:2px;'>&nbsp;</p>
 		<img title="extensao" alt="" src="../imagens/branco.gif" id='exten'/>
 	</div>        
-
 	<div style='display:inline;background-color:rgb(250,250,250);'>
 		<p style='font-size:2px;'>&nbsp;</p>
 		<img title="insere xy" alt="" src="../imagens/branco.gif" id='inserexy'/>
@@ -194,6 +185,10 @@
 
 	</div>
 	<div style='display:inline;background-color:rgb(250,250,250);'>
+		<p style='font-size:4px;'>&nbsp;</p>
+		<img title='imprimir' alt='imprimir' src='../imagens/branco.gif' id='imprimir'/>
+	</div>
+	<div style='display:inline;background-color:rgb(250,250,250);'>
 		<p style='font-size:2px;'>&nbsp;</p>
 		<img  title="google" alt="" src="../imagens/branco.gif" id='google'/>
 	</div>
diff --git a/ferramentas/imprimir/a4lpaisagempdf.htm b/ferramentas/imprimir/a4lpaisagempdf.htm
index 371f383..9213010 100644
--- a/ferramentas/imprimir/a4lpaisagempdf.htm
+++ b/ferramentas/imprimir/a4lpaisagempdf.htm
@@ -9,6 +9,6 @@
 </body>
 <script type="text/javascript" >
 var titulo=window.prompt("Digite o título do mapa:")
-window.location="a4lpaisagempdf.php?titulo="+titulo
+window.location="a4lpaisagempdf.php?titulo="+titulo+"&interface="+window.opener.i3GEO.Interface.ATUAL+"&mapexten="+window.opener.i3GEO.parametros.mapexten
 </script>
 </html>
\ No newline at end of file
diff --git a/ferramentas/imprimir/a4lpaisagempdf.php b/ferramentas/imprimir/a4lpaisagempdf.php
index 6eeedbe..896049c 100644
--- a/ferramentas/imprimir/a4lpaisagempdf.php
+++ b/ferramentas/imprimir/a4lpaisagempdf.php
@@ -52,6 +52,14 @@ foreach ($temas as $tema)
 		}
 	}
 }
+if($interface == "openlayers"){
+	$ext = explode(" ",$mapexten);
+	$extatual = $map->extent;
+	$extatual->setextent($ext[0],$ext[1],$ext[2],$ext[3]);
+	$legenda = $map->legend;
+	$legenda->set("status",MS_EMBED);
+}
+
 $imgo = $map->draw();
 $nomer = ($imgo->imagepath)."mapa".$nomes.".png";
 $imgo->saveImage($nomer);
diff --git a/ferramentas/imprimir/aggpng.php b/ferramentas/imprimir/aggpng.php
index d3e88b0..044a11c 100644
--- a/ferramentas/imprimir/aggpng.php
+++ b/ferramentas/imprimir/aggpng.php
@@ -56,6 +56,9 @@ $map = ms_newMapObj($map_file);
 $temp = str_replace(".map","xxx.map",$map_file);
 $map->save($temp);
 substituiCon($temp,$postgis_mapa);
+$of = $map->outputformat;
+$of->set("driver","AGG/PNG");
+$of->set("imagemode","RGB");
 $map = ms_newMapObj($temp);
 //$legenda =$map->legend;
 //$legenda->set("status",MS_EMBED);
@@ -74,10 +77,13 @@ foreach ($temas as $tema)
 		}
 	}
 }
-$of = $map->outputformat;
-$of->set("driver","AGG/PNG");
-$of->set("imagemode","RGB");
-
+if($interface == "openlayers"){
+	$ext = explode(" ",$mapexten);
+	$extatual = $map->extent;
+	$extatual->setextent($ext[0],$ext[1],$ext[2],$ext[3]);
+	$legenda = $map->legend;
+	$legenda->set("status",MS_EMBED);
+}
 $imgo = $map->draw();
 $nomer = ($imgo->imagepath)."mapa".$nomes.".png";
 $imgo->saveImage($nomer);
diff --git a/ferramentas/imprimir/geotif.php b/ferramentas/imprimir/geotif.php
index 0092918..2daa572 100644
--- a/ferramentas/imprimir/geotif.php
+++ b/ferramentas/imprimir/geotif.php
@@ -56,6 +56,9 @@ $map = ms_newMapObj($map_file);
 $temp = str_replace(".map","xxx.map",$map_file);
 $map->save($temp);
 substituiCon($temp,$postgis_mapa);
+$of = $map->outputformat;
+$of->set("driver","GDAL/GTiff");
+$of->set("imagemode","RGB");
 $map = ms_newMapObj($temp);
 //$legenda =$map->legend;
 //$legenda->set("status",MS_EMBED);
@@ -74,9 +77,14 @@ foreach ($temas as $tema)
 		}
 	}
 }
-$of = $map->outputformat;
-$of->set("driver","GDAL/GTiff");
-$of->set("imagemode","RGB");
+if($interface == "openlayers"){
+	$ext = explode(" ",$mapexten);
+	$extatual = $map->extent;
+	$extatual->setextent($ext[0],$ext[1],$ext[2],$ext[3]);
+	$legenda = $map->legend;
+	$legenda->set("status",MS_EMBED);
+}
+
 
 $imgo = $map->draw();
 $nomer = ($imgo->imagepath)."mapa".$nomes.".tif";
diff --git a/ferramentas/imprimir/geraimagens.php b/ferramentas/imprimir/geraimagens.php
index 47948f6..afc2085 100644
--- a/ferramentas/imprimir/geraimagens.php
+++ b/ferramentas/imprimir/geraimagens.php
@@ -56,6 +56,12 @@ foreach ($temas as $tema)
 		}
 	}
 }
+if($interface == "openlayers"){
+	$ext = explode(" ",$mapexten);
+	$extatual = $map->extent;
+	$extatual->setextent($ext[0],$ext[1],$ext[2],$ext[3]);
+}
+
 $imgo = $map->draw();
 $nomer = ($imgo->imagepath)."mapa".$nomes.".png";
 $imgo->saveImage($nomer);
diff --git a/ferramentas/imprimir/index.js.php b/ferramentas/imprimir/index.js.php
index dda855a..3efa0d5 100644
--- a/ferramentas/imprimir/index.js.php
+++ b/ferramentas/imprimir/index.js.php
@@ -67,16 +67,18 @@ i3GEOF.imprimir = {
 	*/
 	html:function(){
 		var ins = '<p class=paragrafo > Escolha o modelo:</p>' +
-			'<table class=lista6 width="200px">' +
-			'	<tr>' +
+			'<table class=lista6 width="200px">';
+			if(i3GEO.Interface.ATUAL == "padrao"){
+			ins += '	<tr>' +
 			'		<td><input style="cursor:pointer" onclick=i3GEOF.imprimir.abreI(this) type=radio value="a4l.htm" name=cmodelo /></td>' +
 			'		<td>A4 paisagem</td>' +
 			'	</tr>' +
 			'	<tr>' +
 			'		<td ><input style="cursor:pointer" onclick=i3GEOF.imprimir.abreI(this) type=radio value="a4p.htm" name=cmodelo  /></td>' +
 			'		<td >A4 retrato</td>' +
-			'	</tr>' +
-			'	<tr>' +
+			'	</tr>';
+			}
+			ins += '	<tr>' +
 			'		<td><input style="cursor:pointer" onclick=i3GEOF.imprimir.abreI(this) type=radio value="a4lpaisagempdf.htm" name=cmodelo /></td>' +
 			'		<td>A4 com margens pdf</td>' +
 			'	</tr>' +
@@ -133,7 +135,8 @@ i3GEOF.imprimir = {
 	Abre uma nova janela com o resultado da impressão.
 	*/
 	abreI: function(obj){
-		window.open(i3GEO.configura.locaplic+"/ferramentas/imprimir/"+obj.value+"?g_sid="+i3GEO.configura.sid);
+		
+		window.open(i3GEO.configura.locaplic+"/ferramentas/imprimir/"+obj.value+"?g_sid="+i3GEO.configura.sid+"&interface="+i3GEO.Interface.ATUAL+"&mapexten="+i3GEO.parametros.mapexten);
 	}
 };
 <?php error_reporting(0);if(extension_loaded('zlib')){ob_end_flush();}?>
\ No newline at end of file
--
libgit2 0.21.2