Inclusão da opção outlinecolor na escolha de parâmetros para o mapa de referência

Edmar Moretti
1 parent d485a4e1
Showing 7 changed files with 20 additions and 25 deletions Show diff stats
ferramentas/imprimir/aggpng.php
ferramentas/imprimir/geotif.php
ferramentas/imprimir/jpeg.php
ferramentas/opcoes_maparef/dicionario.js
ferramentas/opcoes_maparef/exec.php
ferramentas/opcoes_maparef/index.js
ferramentas/opcoes_maparef/template_mst.html
@@ -136,7 +136,9 @@ $imgo-&gt;saveImage($nomer);
 $nomeescala = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
 //referencia
 $o = $map->reference->outlinecolor;
-$o->setrgb(255,0,0);
+if($o->red == -1){
+    $o->setrgb(255,0,0);
+}
 $map->preparequery();
 $imgo = $map->drawreferencemap();
 $nomer = ($imgo->imagepath)."ref".$nomes.".png";
@@ -131,7 +131,9 @@ $imgo-&gt;saveImage($nomer);
 $nomeescala = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
 //refer&ecirc;ncia
 $o = $map->reference->outlinecolor;
-$o->setrgb(255,0,0);
+if($o->red == -1){
+    $o->setrgb(255,0,0);
+}
 $map->preparequery();
 $imgo = $map->drawreferencemap();
 $nomer = ($imgo->imagepath)."ref".$nomes.".tif";
@@ -134,7 +134,9 @@ $imgo-&gt;saveImage($nomer);
 $nomeescala = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
 //refer&ecirc;ncia
 $o = $map->reference->outlinecolor;
-$o->setrgb(255,0,0);
+if($o->red == -1){
+    $o->setrgb(255,0,0);
+}
 $map->preparequery();
 $imgo = $map->drawreferencemap();
 $nomer = ($imgo->imagepath)."ref".$nomes.".jpg";
 //+$trad(1,i3GEOF.opcoesTamanho.dicionario)+
 i3GEOF.opcoesMaparef.dicionario = {
-	'largura' : [ {
-		pt : "Largura",
-		en : "Width",
-		es : "Ancho"
-	} ],
-	'altura' : [ {
-		pt : "Altura",
-		en : "Height",
-		es : "Altura"
-	} ],
-	'valor' : [ {
-		pt : "Valores em pixels",
-		en : "Values in pixels",
-		es : "Valores en p&iacute;xeles"
+	'outlinecolor' : [ {
+		pt : "Cor do contorno",
+		en : "",
+		es : ""
 	} ],
 	'testa' : [ {
 		pt : "Testar",
@@ -11,7 +11,10 @@ switch (strtoupper($funcao))
 	    copiaSeguranca($map_file);
 		$map = ms_newMapObj($map_file);
 		$r = $map->reference;
-		$r->updateFromString("REFERENCE SIZE " . $_POST["width"] . " " . $_POST["height"] . " END");
+		//$r->updateFromString("REFERENCE SIZE " . $_POST["width"] . " " . $_POST["height"] . " END");
+		$ocor = explode(",",$_POST["outlinecolor"]);
+		$o = $r->outlinecolor;
+		$o->setrgb($ocor[0],$ocor[1],$ocor[2]);
 		$salvo = $map->save($map_file);
 		$retorno = "ok";
 		$_SESSION["contadorsalva"]++;
@@ -50,6 +50,7 @@ i3GEOF.opcoesMaparef = {
             var b,box;
             try{
                 $i(iddiv).innerHTML = i3GEOF.opcoesMaparef.html();
+                i3GEO.util.aplicaAquarela('form-opcoesMaparef');
                 i3GEO.janela.tempoMsg($trad('msg',i3GEOF.opcoesMaparef.dicionario));
             }
             catch(erro){i3GEO.janela.tempoMsg(erro);}
 <div class='container-fluid customScrollBar'>
     <form id="form-opcoesMaparef" style="" action="#" onsubmit="i3GEOF.opcoesMaparef.executa();return false;" class="form-horizontal" role="form" method="post">
         <div class='form-group label-fixed condensed'>
-            <label class="control-label" for="i3GEOopcoesMaparefl">{{{largura}}}</label>
-            <input required class="form-control input-lg " type='text' name='width' value='{{{Tamanhol}}}' />
+            <label class="control-label" for="i3GEOopcoesMaparefl">{{{outlinecolor}}}</label>
+            <input id='opcoesMaparefoutlinecolor' name='outlinecolor' class='form-control i3geoFormIconeAquarela' type='text' value='-1,-1,-1'>
         </div>
-        <div class='form-group label-fixed condensed'>
-            <label class="control-label" for="i3GEOopcoesMaparefa">{{{altura}}}</label>
-            <input required class="form-control input-lg " type='text' name='height' value='{{{Tamanhoa}}}' />
-        </div>
-        <h5>{{{valor}}}</h5>
         <button type="submit" role="button" class='btn btn-primary btn-sm btn-raised'>{{{aplica}}}</button>
     </form>
 </div>
 \ No newline at end of file
1	//+$trad(1,i3GEOF.opcoesTamanho.dicionario)+	1	//+$trad(1,i3GEOF.opcoesTamanho.dicionario)+
2	i3GEOF.opcoesMaparef.dicionario = {	2	i3GEOF.opcoesMaparef.dicionario = {
3	- 'largura' : [ {
4	- pt : "Largura",
5	- en : "Width",
6	- es : "Ancho"
7	- } ],
8	- 'altura' : [ {
9	- pt : "Altura",
10	- en : "Height",
11	- es : "Altura"
12	- } ],
13	- 'valor' : [ {
14	- pt : "Valores em pixels",
15	- en : "Values in pixels",
16	- es : "Valores en píxeles"	3	+ 'outlinecolor' : [ {
		4	+ pt : "Cor do contorno",
		5	+ en : "",
		6	+ es : ""
17	} ],	7	} ],
18	'testa' : [ {	8	'testa' : [ {
19	pt : "Testar",	9	pt : "Testar",