Download as
Browse Code »

Commit c02804398932b923b82a1c78dc31c1bddd41e694

Authored by Edmar Moretti
1 parent 1ce67100
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Correção na impressão em SVG

Showing 2 changed files with 21 additions and 11 deletions   Show diff stats
admin/admin.db
View file @c028043
No preview for this file type
ferramentas/imprimir/svg.php
  Diff comments   View file @c028043
@@ -61,6 +61,7 @@ if (array_search( "MapScript", $exts) != TRUE) @@ -61,6 +61,7 @@ if (array_search( "MapScript", $exts) != TRUE)
61 require(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php"); 61 require(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php");
62 error_reporting(0); 62 error_reporting(0);
63 $nomes = nomeRandomico(); 63 $nomes = nomeRandomico();
  64 +
64 $map = ms_newMapObj($map_file); 65 $map = ms_newMapObj($map_file);
65 $temp = str_replace(".map","xxx.map",$map_file); 66 $temp = str_replace(".map","xxx.map",$map_file);
66 $map->save($temp); 67 $map->save($temp);
@@ -68,8 +69,10 @@ substituiCon($temp,$postgis_mapa); @@ -68,8 +69,10 @@ substituiCon($temp,$postgis_mapa);
68 $map = ms_newMapObj($temp); 69 $map = ms_newMapObj($temp);
69 if($interface == "googlemaps") 70 if($interface == "googlemaps")
70 {$map->setProjection("init=epsg:4618,a=6378137,b=6378137");} 71 {$map->setProjection("init=epsg:4618,a=6378137,b=6378137");}
71 -$eb = $map->scalebar; 72 +$v = versao();
  73 +
72 $leb = $eb->label; 74 $leb = $eb->label;
  75 +
73 if($leb->type == "MS_BITMAP"){ 76 if($leb->type == "MS_BITMAP"){
74 $leb->set("type",MS_TRUETYPE); 77 $leb->set("type",MS_TRUETYPE);
75 $leb->set("font","Arial"); 78 $leb->set("font","Arial");
@@ -93,21 +96,28 @@ for ($i=0;$i < $numlayers;$i++) @@ -93,21 +96,28 @@ for ($i=0;$i < $numlayers;$i++)
93 $nclasses = $layer->numclasses; 96 $nclasses = $layer->numclasses;
94 if ($nclasses > 0) 97 if ($nclasses > 0)
95 { 98 {
96 - for($i=0;$i<$nclasses;$i++) 99 + for($j=0;$j<$nclasses;$j++)
97 { 100 {
98 - $classe = $layer->getclass($i); 101 + $classe = $layer->getclass($j);
99 $classe->set("name","classeNula"); 102 $classe->set("name","classeNula");
100 } 103 }
101 } 104 }
102 } 105 }
  106 +
103 $nclasses = $layer->numclasses; 107 $nclasses = $layer->numclasses;
104 - if ($nclasses > 0)  
105 - {  
106 - for($i=0;$i<$nclasses;$i++)  
107 - {  
108 - $classe = $layer->getclass($i);  
109 - $leb = $classe->label;  
110 - if($leb->type == MS_BITMAP){ 108 + if ($nclasses > 0){
  109 + for($j=0;$j<$nclasses;$j++){
  110 + $classe = $layer->getclass($j);
  111 + $leb = false;
  112 + if($v["inteiro"] >= 60200){
  113 + if($classe->numlabels > 0){
  114 + $leb = $classe->getLabel(0);
  115 + }
  116 + }
  117 + else{
  118 + $leb = $classe->label;
  119 + }
  120 + if($leb != false && $leb->type == MS_BITMAP){
111 $leb->set("type",MS_TRUETYPE); 121 $leb->set("type",MS_TRUETYPE);
112 $leb->set("font","Arial"); 122 $leb->set("font","Arial");
113 } 123 }
@@ -136,4 +146,4 @@ $nomemapa = strtolower($protocolo[0]).&quot;://&quot;.$_SERVER[&#39;HTTP_HOST&#39;].($imgo-&gt;imageu @@ -136,4 +146,4 @@ $nomemapa = strtolower($protocolo[0]).&quot;://&quot;.$_SERVER[&#39;HTTP_HOST&#39;].($imgo-&gt;imageu
136 echo "<p>Utilize a op&ccedil;&atilde;o de altera&ccedil;&atilde;o das propriedades do mapa para ajustar a legenda, tamanho e outras caracter&iacute;sticas antes de gerar os arquivos.</p>"; 146 echo "<p>Utilize a op&ccedil;&atilde;o de altera&ccedil;&atilde;o das propriedades do mapa para ajustar a legenda, tamanho e outras caracter&iacute;sticas antes de gerar os arquivos.</p>";
137 echo "<p>Arquivos gerados:</p>"; 147 echo "<p>Arquivos gerados:</p>";
138 echo "<a style=font-family:Verdana,Arial,Helvetica,sans-serif; href='$nomemapa' target=_blank >Mapa</a><br><br>"; 148 echo "<a style=font-family:Verdana,Arial,Helvetica,sans-serif; href='$nomemapa' target=_blank >Mapa</a><br><br>";
139 -?>  
140 \ No newline at end of file 149 \ No newline at end of file
  150 +?>