Download as
Browse Code »

Commit 6e2c29aec1afb884fb6460a4ec1b3a4aea9f594a

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

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

Showing 7 changed files with 20 additions and 25 deletions   Show diff stats
ferramentas/imprimir/aggpng.php
  Diff comments   View file @6e2c29a
... ... @@ -136,7 +136,9 @@ $imgo->saveImage($nomer);
136 136 $nomeescala = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
137 137 //referencia
138 138 $o = $map->reference->outlinecolor;
139   -$o->setrgb(255,0,0);
  139 +if($o->red == -1){
  140 + $o->setrgb(255,0,0);
  141 +}
140 142 $map->preparequery();
141 143 $imgo = $map->drawreferencemap();
142 144 $nomer = ($imgo->imagepath)."ref".$nomes.".png";
... ...
ferramentas/imprimir/geotif.php
  Diff comments   View file @6e2c29a
... ... @@ -131,7 +131,9 @@ $imgo->saveImage($nomer);
131 131 $nomeescala = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
132 132 //referência
133 133 $o = $map->reference->outlinecolor;
134   -$o->setrgb(255,0,0);
  134 +if($o->red == -1){
  135 + $o->setrgb(255,0,0);
  136 +}
135 137 $map->preparequery();
136 138 $imgo = $map->drawreferencemap();
137 139 $nomer = ($imgo->imagepath)."ref".$nomes.".tif";
... ...
ferramentas/imprimir/jpeg.php
  Diff comments   View file @6e2c29a
... ... @@ -134,7 +134,9 @@ $imgo->saveImage($nomer);
134 134 $nomeescala = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
135 135 //referência
136 136 $o = $map->reference->outlinecolor;
137   -$o->setrgb(255,0,0);
  137 +if($o->red == -1){
  138 + $o->setrgb(255,0,0);
  139 +}
138 140 $map->preparequery();
139 141 $imgo = $map->drawreferencemap();
140 142 $nomer = ($imgo->imagepath)."ref".$nomes.".jpg";
... ...
ferramentas/opcoes_maparef/dicionario.js
  Diff comments   View file @6e2c29a
1 1 //+$trad(1,i3GEOF.opcoesTamanho.dicionario)+
2 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 8 'testa' : [ {
19 9 pt : "Testar",
... ...
ferramentas/opcoes_maparef/exec.php
  Diff comments   View file @6e2c29a
... ... @@ -11,7 +11,10 @@ switch (strtoupper($funcao))
11 11 copiaSeguranca($map_file);
12 12 $map = ms_newMapObj($map_file);
13 13 $r = $map->reference;
14   - $r->updateFromString("REFERENCE SIZE " . $_POST["width"] . " " . $_POST["height"] . " END");
  14 + //$r->updateFromString("REFERENCE SIZE " . $_POST["width"] . " " . $_POST["height"] . " END");
  15 + $ocor = explode(",",$_POST["outlinecolor"]);
  16 + $o = $r->outlinecolor;
  17 + $o->setrgb($ocor[0],$ocor[1],$ocor[2]);
15 18 $salvo = $map->save($map_file);
16 19 $retorno = "ok";
17 20 $_SESSION["contadorsalva"]++;
... ...
ferramentas/opcoes_maparef/index.js
  Diff comments   View file @6e2c29a
... ... @@ -50,6 +50,7 @@ i3GEOF.opcoesMaparef = {
50 50 var b,box;
51 51 try{
52 52 $i(iddiv).innerHTML = i3GEOF.opcoesMaparef.html();
  53 + i3GEO.util.aplicaAquarela('form-opcoesMaparef');
53 54 i3GEO.janela.tempoMsg($trad('msg',i3GEOF.opcoesMaparef.dicionario));
54 55 }
55 56 catch(erro){i3GEO.janela.tempoMsg(erro);}
... ...
ferramentas/opcoes_maparef/template_mst.html
  Diff comments   View file @6e2c29a
1 1 <div class='container-fluid customScrollBar'>
2 2 <form id="form-opcoesMaparef" style="" action="#" onsubmit="i3GEOF.opcoesMaparef.executa();return false;" class="form-horizontal" role="form" method="post">
3 3 <div class='form-group label-fixed condensed'>
4   - <label class="control-label" for="i3GEOopcoesMaparefl">{{{largura}}}</label>
5   - <input required class="form-control input-lg " type='text' name='width' value='{{{Tamanhol}}}' />
  4 + <label class="control-label" for="i3GEOopcoesMaparefl">{{{outlinecolor}}}</label>
  5 + <input id='opcoesMaparefoutlinecolor' name='outlinecolor' class='form-control i3geoFormIconeAquarela' type='text' value='-1,-1,-1'>
6 6 </div>
7   - <div class='form-group label-fixed condensed'>
8   - <label class="control-label" for="i3GEOopcoesMaparefa">{{{altura}}}</label>
9   - <input required class="form-control input-lg " type='text' name='height' value='{{{Tamanhoa}}}' />
10   - </div>
11   - <h5>{{{valor}}}</h5>
12 7 <button type="submit" role="button" class='btn btn-primary btn-sm btn-raised'>{{{aplica}}}</button>
13 8 </form>
14 9 </div>
15 10 \ No newline at end of file
... ...