diff --git a/classesphp/classe_analise.php b/classesphp/classe_analise.php index e385e17..3f48461 100755 --- a/classesphp/classe_analise.php +++ b/classesphp/classe_analise.php @@ -2468,11 +2468,12 @@ class Analise { if ($this->dbaseExiste == false) { include_once dirname ( __FILE__ ) . "/../pacotes/phpxbase/api_conversion.php"; } + error_reporting(E_ALL); $shapes = retornaShapesSelecionados ( $this->layer, $this->arquivo, $this->mapa ); $indices = array (); foreach ( $shapes as $shape ) { if ($item != "") { - $valor = $shape->values [$item]; + $valor = "V" . $shape->values [$item]; } else { $valor = "nenhum"; } @@ -2480,18 +2481,20 @@ class Analise { $indices [$valor] = array ( $shape ); - } else - $indices [$valor] = array_merge ( $indices [$valor], array ( - $shape - ) ); + } else { + array_push ( $indices [$valor], $shape ); + } } $dissolve = array (); + foreach ( $indices as $shapes ) { foreach ( $shapes as $shape ) { - if ($item != "") - $valor = $shape->values [$item]; - else + if ($item != ""){ + $valor = "V".$shape->values [$item]; + } + else{ $valor = "nenhum"; + } if (! isset ( $dissolve [$valor] )) { $dissolve [$valor] = $shape; } else { @@ -2508,6 +2511,7 @@ class Analise { } } } + // // cria o novo shapefile // diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php index 2a40025..6d13db7 100755 --- a/classesphp/funcoes_gerais.php +++ b/classesphp/funcoes_gerais.php @@ -2561,11 +2561,9 @@ $a {string} */ function echojson($a) { - //ob_clean(); - //error_reporting(0); - ob_end_clean(); - //if(extension_loaded('zlib')) - //{ob_start('ob_gzhandler');} + if(ob_get_contents ()){ + ob_end_clean(); + } header("Content-type: text/html"); echo $a; //if(extension_loaded('zlib')) diff --git a/ferramentas/dissolve/dicionario.js b/ferramentas/dissolve/dicionario.js index 19d798a..692e999 100755 --- a/ferramentas/dissolve/dicionario.js +++ b/ferramentas/dissolve/dicionario.js @@ -29,5 +29,10 @@ i3GEOF.dissolve.dicionario = { pt : "Erro. A operação demorou muito.", en : "", es : "Error. La operación demoro mucho" + } ], + 'escolhaTema' : [ { + pt : "Escolha um tema", + en : "", + es : "" } ] }; \ No newline at end of file diff --git a/ferramentas/dissolve/index.js b/ferramentas/dissolve/index.js index 82eeb60..bec7046 100755 --- a/ferramentas/dissolve/index.js +++ b/ferramentas/dissolve/index.js @@ -110,7 +110,7 @@ i3GEOF.dissolve = { }; janela = i3GEO.janela.cria( "400px", - "160px", + "250px", "", "", "", @@ -148,17 +148,11 @@ i3GEOF.dissolve = { i3GEOF.dissolve.comboTemasSel(); }, t2: function(){ - i3GEO.util.proximoAnterior("i3GEOF.dissolve.t1()","i3GEOF.dissolve.t3()","","i3GEOF.dissolve.t2","i3GEOdissolveresultado",true,"i3GEOF.dissolve_rodape"); i3GEOF.dissolve.comboItem(); }, t3: function(){ i3GEO.util.proximoAnterior("i3GEOF.dissolve.t2()","","","i3GEOF.dissolve.t3","i3GEOdissolveresultado",true,"i3GEOF.dissolve_rodape"); - var b = new YAHOO.widget.Button( - "i3GEOdissolvebotao1", - {onclick:{fn: i3GEOF.dissolve.criadissolve}} - ); - b.addClass("rodar"); }, /* Function: criadissolve @@ -170,6 +164,10 @@ i3GEOF.dissolve = { */ criadissolve: function(){ + if($i("i3GEOdissolvetemasComSel").value == ""){ + i3GEO.janela.tempoMsg($trad("escolhaTema",i3GEOF.dissolve.dicionario)); + return; + } try{ if(i3GEOF.dissolve.aguarde.visibility === "visible") {return;} @@ -222,7 +220,10 @@ i3GEOF.dissolve = { "", false, "poligonosSelecionados", - " " + " ", + false, + true, + "form-control comboTema" ); }, /* @@ -243,7 +244,11 @@ i3GEOF.dissolve = { $i("i3GEOdissolveDivItem").innerHTML = retorno.dados; $i("i3GEOdissolveDivItem").style.display = "block"; }, - "i3GEOdissolveDivItem" + "i3GEOdissolveDivItem", + "", + "", + "", + "form-control comboTema" ); } }; \ No newline at end of file diff --git a/ferramentas/dissolve/template_mst.html b/ferramentas/dissolve/template_mst.html index 8c9048c..9cc1cd8 100755 --- a/ferramentas/dissolve/template_mst.html +++ b/ferramentas/dissolve/template_mst.html @@ -1,22 +1,28 @@ -
+
- -

{{{descricao}}} + +

{{{descricao}}}
-

{{{selecionaTema}}}

-
+
+ +
+
+
+
-

{{{selecionaItem}}}

-
{{{aguarde}}}
+
+ +
+
+
+
-

- {{{adicionaTema}}}
-
- +

{{{adicionaTema}}}
+ +
+
-
-
\ No newline at end of file +
\ No newline at end of file -- libgit2 0.21.2