Commit aa0c784b3982c26acded36e02532c61385856726
1 parent
2783d0ed
Exists in
master
and in
7 other branches
Conversão da ferramenta Dissolve para Bootstrap
Showing
5 changed files
with
54 additions
and
36 deletions
Show diff stats
classesphp/classe_analise.php
... | ... | @@ -2468,11 +2468,12 @@ class Analise { |
2468 | 2468 | if ($this->dbaseExiste == false) { |
2469 | 2469 | include_once dirname ( __FILE__ ) . "/../pacotes/phpxbase/api_conversion.php"; |
2470 | 2470 | } |
2471 | + error_reporting(E_ALL); | |
2471 | 2472 | $shapes = retornaShapesSelecionados ( $this->layer, $this->arquivo, $this->mapa ); |
2472 | 2473 | $indices = array (); |
2473 | 2474 | foreach ( $shapes as $shape ) { |
2474 | 2475 | if ($item != "") { |
2475 | - $valor = $shape->values [$item]; | |
2476 | + $valor = "V" . $shape->values [$item]; | |
2476 | 2477 | } else { |
2477 | 2478 | $valor = "nenhum"; |
2478 | 2479 | } |
... | ... | @@ -2480,18 +2481,20 @@ class Analise { |
2480 | 2481 | $indices [$valor] = array ( |
2481 | 2482 | $shape |
2482 | 2483 | ); |
2483 | - } else | |
2484 | - $indices [$valor] = array_merge ( $indices [$valor], array ( | |
2485 | - $shape | |
2486 | - ) ); | |
2484 | + } else { | |
2485 | + array_push ( $indices [$valor], $shape ); | |
2486 | + } | |
2487 | 2487 | } |
2488 | 2488 | $dissolve = array (); |
2489 | + | |
2489 | 2490 | foreach ( $indices as $shapes ) { |
2490 | 2491 | foreach ( $shapes as $shape ) { |
2491 | - if ($item != "") | |
2492 | - $valor = $shape->values [$item]; | |
2493 | - else | |
2492 | + if ($item != ""){ | |
2493 | + $valor = "V".$shape->values [$item]; | |
2494 | + } | |
2495 | + else{ | |
2494 | 2496 | $valor = "nenhum"; |
2497 | + } | |
2495 | 2498 | if (! isset ( $dissolve [$valor] )) { |
2496 | 2499 | $dissolve [$valor] = $shape; |
2497 | 2500 | } else { |
... | ... | @@ -2508,6 +2511,7 @@ class Analise { |
2508 | 2511 | } |
2509 | 2512 | } |
2510 | 2513 | } |
2514 | + | |
2511 | 2515 | // |
2512 | 2516 | // cria o novo shapefile |
2513 | 2517 | // | ... | ... |
classesphp/funcoes_gerais.php
... | ... | @@ -2561,11 +2561,9 @@ $a {string} |
2561 | 2561 | */ |
2562 | 2562 | function echojson($a) |
2563 | 2563 | { |
2564 | - //ob_clean(); | |
2565 | - //error_reporting(0); | |
2566 | - ob_end_clean(); | |
2567 | - //if(extension_loaded('zlib')) | |
2568 | - //{ob_start('ob_gzhandler');} | |
2564 | + if(ob_get_contents ()){ | |
2565 | + ob_end_clean(); | |
2566 | + } | |
2569 | 2567 | header("Content-type: text/html"); |
2570 | 2568 | echo $a; |
2571 | 2569 | //if(extension_loaded('zlib')) | ... | ... |
ferramentas/dissolve/dicionario.js
... | ... | @@ -29,5 +29,10 @@ i3GEOF.dissolve.dicionario = { |
29 | 29 | pt : "Erro. A operação demorou muito.", |
30 | 30 | en : "", |
31 | 31 | es : "Error. La operación demoro mucho" |
32 | + } ], | |
33 | + 'escolhaTema' : [ { | |
34 | + pt : "Escolha um tema", | |
35 | + en : "", | |
36 | + es : "" | |
32 | 37 | } ] |
33 | 38 | }; |
34 | 39 | \ No newline at end of file | ... | ... |
ferramentas/dissolve/index.js
... | ... | @@ -110,7 +110,7 @@ i3GEOF.dissolve = { |
110 | 110 | }; |
111 | 111 | janela = i3GEO.janela.cria( |
112 | 112 | "400px", |
113 | - "160px", | |
113 | + "250px", | |
114 | 114 | "", |
115 | 115 | "", |
116 | 116 | "", |
... | ... | @@ -148,17 +148,11 @@ i3GEOF.dissolve = { |
148 | 148 | i3GEOF.dissolve.comboTemasSel(); |
149 | 149 | }, |
150 | 150 | t2: function(){ |
151 | - | |
152 | 151 | i3GEO.util.proximoAnterior("i3GEOF.dissolve.t1()","i3GEOF.dissolve.t3()","","i3GEOF.dissolve.t2","i3GEOdissolveresultado",true,"i3GEOF.dissolve_rodape"); |
153 | 152 | i3GEOF.dissolve.comboItem(); |
154 | 153 | }, |
155 | 154 | t3: function(){ |
156 | 155 | i3GEO.util.proximoAnterior("i3GEOF.dissolve.t2()","","","i3GEOF.dissolve.t3","i3GEOdissolveresultado",true,"i3GEOF.dissolve_rodape"); |
157 | - var b = new YAHOO.widget.Button( | |
158 | - "i3GEOdissolvebotao1", | |
159 | - {onclick:{fn: i3GEOF.dissolve.criadissolve}} | |
160 | - ); | |
161 | - b.addClass("rodar"); | |
162 | 156 | }, |
163 | 157 | /* |
164 | 158 | Function: criadissolve |
... | ... | @@ -170,6 +164,10 @@ i3GEOF.dissolve = { |
170 | 164 | <DISSOLVEPOLIGONO> |
171 | 165 | */ |
172 | 166 | criadissolve: function(){ |
167 | + if($i("i3GEOdissolvetemasComSel").value == ""){ | |
168 | + i3GEO.janela.tempoMsg($trad("escolhaTema",i3GEOF.dissolve.dicionario)); | |
169 | + return; | |
170 | + } | |
173 | 171 | try{ |
174 | 172 | if(i3GEOF.dissolve.aguarde.visibility === "visible") |
175 | 173 | {return;} |
... | ... | @@ -222,7 +220,10 @@ i3GEOF.dissolve = { |
222 | 220 | "", |
223 | 221 | false, |
224 | 222 | "poligonosSelecionados", |
225 | - " " | |
223 | + " ", | |
224 | + false, | |
225 | + true, | |
226 | + "form-control comboTema" | |
226 | 227 | ); |
227 | 228 | }, |
228 | 229 | /* |
... | ... | @@ -243,7 +244,11 @@ i3GEOF.dissolve = { |
243 | 244 | $i("i3GEOdissolveDivItem").innerHTML = retorno.dados; |
244 | 245 | $i("i3GEOdissolveDivItem").style.display = "block"; |
245 | 246 | }, |
246 | - "i3GEOdissolveDivItem" | |
247 | + "i3GEOdissolveDivItem", | |
248 | + "", | |
249 | + "", | |
250 | + "", | |
251 | + "form-control comboTema" | |
247 | 252 | ); |
248 | 253 | } |
249 | 254 | }; |
250 | 255 | \ No newline at end of file | ... | ... |
ferramentas/dissolve/template_mst.html
1 | -<div style='padding: 5px; background-color: #F2F2F2; top: 0px; left: 0px; display: block; width: 98%;' id='i3GEOdissolveresultado'> | |
1 | +<div class='container-fluid' id='i3GEOdissolveresultado'> | |
2 | 2 | <div id='i3GEOFgradeDePontost0'> |
3 | - <img class='i3GeoExemploImg' | |
4 | - src='{{{locaplic}}}/ferramentas/dissolve/exemplo.png' /> | |
5 | - <p class='paragrafo'>{{{descricao}}} | |
3 | + <img class="img-rounded pull-left" style="margin: 5px; width: 40px;" src='{{{locaplic}}}/ferramentas/dissolve/exemplo.png' /> | |
4 | + <h5>{{{descricao}}}</h5> | |
6 | 5 | </div> |
7 | 6 | <div id='i3GEOF.dissolve.t1'> |
8 | - <p class='paragrafo'>{{{selecionaTema}}}</p> | |
9 | - <div id='i3GEOdissolveSelTemas' class='styled-select'></div> | |
7 | + <div style="width: 100%;" class='form-group label-fixed condensed'> | |
8 | + <label class="control-label" for="">{{{selecionaTema}}}</label> | |
9 | + <div style="width: 100%;" class="input-group"> | |
10 | + <div id='i3GEOdissolveSelTemas'></div> | |
11 | + </div> | |
12 | + </div> | |
10 | 13 | </div> |
11 | 14 | <div id='i3GEOF.dissolve.t2'> |
12 | - <p class='paragrafo'>{{{selecionaItem}}}</p> | |
13 | - <div class='styled-select' id='i3GEOdissolveDivItem'>{{{aguarde}}}</div> | |
15 | + <div style="width: 100%;" class='form-group label-fixed condensed'> | |
16 | + <label class="control-label" for="">{{{selecionaItem}}}</label> | |
17 | + <div style="width: 100%;" class="input-group"> | |
18 | + <div id='i3GEOdissolveDivItem'></div> | |
19 | + </div> | |
20 | + </div> | |
14 | 21 | </div> |
15 | 22 | <div id='i3GEOF.dissolve.t3'> |
16 | - <p class='paragrafo'> | |
17 | - {{{adicionaTema}}} <br> | |
18 | - <br> | |
19 | - <input id='i3GEOdissolvebotao1' type='button' value='{{{dissolve}}}' /> | |
23 | + <h5>{{{adicionaTema}}}</h5> | |
24 | + <button onclick="i3GEOF.dissolve.criadissolve()" class='btn btn-primary btn-sm btn-raised'>{{{dissolve}}}</button> | |
25 | + <h5 id='i3GEOdissolvefim'></h5> | |
26 | + | |
20 | 27 | </div> |
21 | -</div> | |
22 | -<div style='top: 10px; left: 0px; display: block; width: 98%; color: red' id='i3GEOdissolvefim'></div> | |
23 | 28 | \ No newline at end of file |
29 | +</div> | |
24 | 30 | \ No newline at end of file | ... | ... |