Download as
Browse Code »

Commit 0f77942f5864ea7feea5a45466d1ed4aa7ab19ce

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

Correção de erros da ferramenta inserir pontos e gerar perfil do relevo

Showing 60 changed files with 89 additions and 82 deletions   Show diff stats
css/i3geo7.css.php 100644 → 100755
  Diff comments   View file @0f77942
ferramentas/editorgm/editorgm_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
ferramentas/editorol/editorol_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
ferramentas/graficointerativo1/index.js
  Diff comments   View file @0f77942
... ... @@ -492,14 +492,7 @@ i3GEOF.graficointerativo1 =
492 492  
493 493 i3GEOF.graficointerativo1.ativaFoco(idjanela);
494 494 i3GEOF.graficointerativo1.comboTemas(idjanela);
495   - b = new YAHOO.widget.Button(idjanela + "i3GEOgraficointerativo1botao1", {
496   - onclick : {
497   - fn : function() {
498   - i3GEOF.graficointerativo1.obterDados(idjanela);
499   - }
500   - }
501   - });
502   - b.addClass("rodar");
  495 +
503 496 if (i3GEOF.graficointerativo1.propJanelas[idjanela].dados != "") {
504 497 i3GEOF.graficointerativo1.montaTabelaDados(idjanela, i3GEOF.graficointerativo1.propJanelas[idjanela].dados);
505 498 $i(idjanela + "i3GEOgraficointerativo1guia4").onclick.call();
... ... @@ -596,7 +589,7 @@ i3GEOF.graficointerativo1 =
596 589 cabecalho,
597 590 minimiza,
598 591 mudaTamanhoGrafico,
599   - true,
  592 + false,
600 593 "",
601 594 duplica,
602 595 "nao",
... ...
ferramentas/graficointerativo1/template_mst.html
  Diff comments   View file @0f77942
... ... @@ -52,10 +52,10 @@
52 52 </li>
53 53 </ul>
54 54 </div>
55   -<div class='container-fluid customScrollBar' style="height: calc(100% - 39px); overflow: auto;">
  55 +<div class='container-fluid ' style="height: calc(100% - 39px); overflow: auto;">
56 56  
57 57 <!-- Guia com a lista de tipos de graficos -->
58   -<div class='guiaobj' id='{{{idjanela}}}i3GEOgraficointerativo1guia1obj' style='left: 1px; display: none;'>
  58 +<div class='guiaobj' id='{{{idjanela}}}i3GEOgraficointerativo1guia1obj' style='left: 1px;'>
59 59 <p class='paragrafo'>
60 60 <b>{{{escolhatipo}}} :</b>
61 61 </p>
... ... @@ -187,7 +187,7 @@
187 187 <label>{{{geracor}}}</label>
188 188 </p>
189 189 <p class='paragrafo'>
190   - <input id='{{{idjanela}}}i3GEOgraficointerativo1botao1' type='button' value='{{{obterdados}}}' />
  190 + <input onclick='i3GEOF.graficointerativo1.obterDados("{{{idjanela}}}")' id='{{{idjanela}}}i3GEOgraficointerativo1botao1' type='button' value='{{{obterdados}}}' />
191 191 </p>
192 192 <div id='{{{idjanela}}}i3GEOgraficointerativo1Dados'></div>
193 193 <div class='paragrafo' id='{{{idjanela}}}i3GEOgraficointerativo1AjudaPizza'>{{{seescolher}}}</div>
... ...
ferramentas/inserexy2/index.js
  Diff comments   View file @0f77942
... ... @@ -159,7 +159,7 @@ i3GEOF.inserexy = {
159 159 cabecalho,
160 160 minimiza,
161 161 "",
162   - false,
  162 + true,
163 163 "",
164 164 "",
165 165 "",
... ... @@ -278,7 +278,7 @@ i3GEOF.inserexy = {
278 278 if (retorno.data != undefined){
279 279 var ins = [],i;
280 280 for (i=0;i<retorno.data.length; i++)
281   - {ins.push("<div style='font-size:12px'>"+retorno.data[i].x+" "+retorno.data[i].y+"</div><br>");}
  281 + {ins.push("<div class='pontosInseridos' style='font-size:12px'>"+retorno.data[i].x+" "+retorno.data[i].y+"</div><br>");}
282 282 $i("i3GEOinserexyguia6obj").innerHTML = ins.join("");
283 283 }
284 284 else
... ... @@ -338,7 +338,7 @@ i3GEOF.inserexy = {
338 338 xsv = xsv.replace(regv,".");
339 339 direcao = i3GEO.calculo.dms2dd(xgv,xmv,xsv);
340 340 //pega o &uacute;ltimo ponto
341   - divs = $i("i3GEOinserexyguia6obj").getElementsByTagName("div");
  341 + divs = $i("i3GEOinserexyguia6obj").getElementsByClassName("i3GEOinserexyguia6obj");
342 342 divs = divs[divs.length - 1];
343 343 divs = divs.innerHTML.split(" ");
344 344 x = divs[0];
... ... @@ -453,8 +453,9 @@ i3GEOF.inserexy = {
453 453 <i3GEO.php.insereSHP>
454 454 */
455 455 adiciona: function(xy,fonte){
456   - if(i3GEOF.inserexy.aguarde.visibility === "visible")
457   - {return;}
  456 + if(i3GEOF.inserexy.aguarde.visibility === "visible"){
  457 + return;
  458 + }
458 459 var tema,
459 460 item = "",
460 461 valoritem = "",
... ... @@ -472,7 +473,7 @@ i3GEOF.inserexy = {
472 473 n = xyn.length;
473 474 temp = "";
474 475 for(i=0;i<n;i = i + 2){
475   - temp += "<div style='font-size:12px' >" + xyn[i]+" "+xyn[i+1] + "</div><br>";
  476 + temp += "<div class='pontosInseridos' style='font-size:12px' >" + xyn[i]+" "+xyn[i+1] + "</div><br>";
476 477 }
477 478 $i("i3GEOinserexyguia6obj").innerHTML += temp;
478 479 if($i("i3GEOinserexyItem") && $i("i3GEOinserexyvalorItem")){
... ... @@ -554,7 +555,7 @@ i3GEOF.inserexy = {
554 555 {return;}
555 556 i3GEOF.inserexy.aguarde.visibility = "visible";
556 557 try{
557   - var divs = $i("i3GEOinserexyguia6obj").getElementsByTagName("div"),
  558 + var divs = $i("i3GEOinserexyguia6obj").getElementsByClassName("pontosInseridos"),
558 559 n = divs.length,
559 560 xy = [],
560 561 cp = new cpaint(),
... ... @@ -562,9 +563,9 @@ i3GEOF.inserexy = {
562 563 mostra = function(retorno){
563 564 i3GEOF.inserexy.aguarde.visibility = "hidden";
564 565 if (retorno.data !== undefined){
565   - var ins = "<textarea style=width:470px;height:80px >"+retorno.data[0]+"</textarea><br>";
566   - ins += "<textarea style=width:470px;height:80px >"+retorno.data[1]+"</textarea><br>";
567   - ins += "<textarea style=width:470px;height:80px >"+retorno.data[2]+"</textarea><br>";
  566 + var ins = "<textarea class='form-control input-lg' style=height:80px >"+retorno.data[0]+"</textarea><br>";
  567 + ins += "<textarea class='form-control input-lg' style=height:80px >"+retorno.data[1]+"</textarea><br>";
  568 + ins += "<textarea class='form-control input-lg' style=height:80px >"+retorno.data[2]+"</textarea><br>";
568 569 $i("i3GEOinserexywktres").innerHTML = "<p class=paragrafo >"+ins+"</p>";
569 570 }
570 571 else
... ... @@ -584,28 +585,26 @@ i3GEOF.inserexy = {
584 585 Cria um gr&aacute;fico de perfil com base nos dados inseridos
585 586 */
586 587 graficoPerfil: function(){
587   - try{
588   - var divs = $i("i3GEOinserexyguia6obj").getElementsByTagName("div"),
589   - js = i3GEO.configura.locaplic+"/ferramentas/perfil/index.js.php",
590   - n = divs.length,
591   - x = [],
592   - y = [],
593   - xy,
594   - i;
595   - for (i=0;i<n;i++){
596   - xy = divs[i].innerHTML.split(" ");
597   - x.push(xy[0]);
598   - y.push(xy[1]);
599   - }
600   - if(x.length == 0)
601   - {i3GEO.janela.tempoMsg($trad('msgNenhumPontoEncontrado',i3GEOF.inserexy.dicionario));return;}
602   - pontosdistobj = {
603   - xpt: x,
604   - ypt: y
605   - };
606   - i3GEO.util.scriptTag(js,"i3GEOF.perfil.criaJanelaFlutuante(pontosdistobj)","i3GEOF.perfil_script");
607   -
  588 + var divs = $i("i3GEOinserexyguia6obj").getElementsByClassName("pontosInseridos"),
  589 + js = i3GEO.configura.locaplic+"/ferramentas/perfil/dependencias.php",
  590 + n = divs.length,
  591 + x = [],
  592 + y = [],
  593 + xy,
  594 + i;
  595 + for (i=0;i<n;i++){
  596 + xy = divs[i].innerHTML.split(" ");
  597 + x.push(xy[0]);
  598 + y.push(xy[1]);
608 599 }
609   - catch(e){i3GEO.janela.tempoMsg("Erro: "+e);}
  600 + if(x.length == 0){
  601 + i3GEO.janela.tempoMsg($trad('msgNenhumPontoEncontrado',i3GEOF.inserexy.dicionario));
  602 + return;
  603 + }
  604 + pontosdistobj = {
  605 + xpt: x,
  606 + ypt: y
  607 + };
  608 + i3GEO.util.scriptTag(js,"i3GEOF.perfil.iniciaJanelaFlutuante(pontosdistobj)","i3GEOF.perfil_script");
610 609 }
611 610 };
... ...
ferramentas/perfil/index.js
  Diff comments   View file @0f77942
... ... @@ -89,11 +89,6 @@ i3GEOF.perfil = {
89 89 }
90 90 $i(iddiv).innerHTML = i3GEOF.perfil.html();
91 91 i3GEOF.perfil.comboTemas();
92   - var b = new YAHOO.widget.Button(
93   - "i3GEOperfilbotao1",
94   - {onclick:{fn: i3GEOF.perfil.criaPerfil}}
95   - );
96   - b.addClass("rodar");
97 92 },
98 93 /*
99 94 Function: html
... ... @@ -167,16 +162,20 @@ i3GEOF.perfil = {
167 162 <DADOSPERFILRELEVO>
168 163 */
169 164 criaPerfil: function(){
170   - try{
171   - if(i3GEOF.perfil.aguarde.visibility === "visible")
172   - {return;}
  165 + if(i3GEOF.perfil.aguarde.visibility === "visible"){
  166 + return;
  167 + }
173 168 var fim = function(retorno){
174 169 i3GEOF.perfil.aguarde.visibility = "hidden";
175   - if (retorno.data === undefined )
176   - {$i("i3GEOperfilfim").innerHTML = "Erro.";return;}
  170 + if (retorno.data === undefined ){
  171 + //$i("i3GEOperfilfim").innerHTML = "Erro.";
  172 + return;
  173 + }
177 174 else{
178   - if(retorno.data.status != "OK")
179   - {$i("i3GEOperfilfim").innerHTML = $trad('erroServico',i3GEOF.perfil.dicionario);return;}
  175 + if(retorno.data.status != "OK"){
  176 + $i("i3GEOperfilfim").innerHTML = $trad('erroServico',i3GEOF.perfil.dicionario);
  177 + return;
  178 + }
180 179 i3GEOF.perfil.converteDados(retorno.data.results);
181 180 if(!$i("i3GEOF.graficointerativo1_script")){
182 181 var js = i3GEO.configura.locaplic+"/ferramentas/graficointerativo1/dependencias.php";
... ... @@ -189,7 +188,6 @@ i3GEOF.perfil = {
189 188 if($i("i3GEOFperfilFonteGoogle").checked === true && i3GEO.Interface.ATUAL !== "googlemaps"){
190 189 i3GEO.navega.dialogo.google(i3GEOF.perfil.listaPontos(true).split(","));
191 190 }
192   -
193 191 }
194 192 };
195 193 if($i("i3GEOFperfilFonteGoogle").checked === true){
... ... @@ -206,9 +204,6 @@ i3GEOF.perfil = {
206 204 i3GEOF.perfil.aguarde.visibility = "visible";
207 205 i3GEO.php.dadosPerfilRelevo(fim,$i("i3GEOFperfilTemasSel").value,pontos,$i("i3GEOFperfilAmostragem").value,$i("i3GEOFperfilComboItens").value);
208 206 }
209   -
210   - }
211   - catch(e){$i("i3GEOperfilfim").innerHTML = "<p class='paragrafo' >Erro. "+e;i3GEO.janela.fechaAguarde();i3GEOF.perfil.aguarde.visibility = "hidden";}
212 207 },
213 208 /*
214 209 Function: iniciaGrafico
... ... @@ -291,8 +286,13 @@ i3GEOF.perfil = {
291 286 "i3GEOFperfilComboItens",
292 287 i3GEO.temaAtivo,
293 288 function(retorno){
294   - $i("i3GEOFperfilDivComboItens").innerHTML = "<p class=paragrafo >"+$trad('itemValores',i3GEOF.perfil.dicionario)+"</p><div class=styled-select >"+retorno.dados+"</div>";
295   - }
  289 + $i("i3GEOFperfilDivComboItens").innerHTML = retorno.dados;
  290 + },
  291 + "",
  292 + "",
  293 + "",
  294 + "",
  295 + "form-control"
296 296 );
297 297 }
298 298 else
... ... @@ -308,7 +308,10 @@ i3GEOF.perfil = {
308 308 "",
309 309 false,
310 310 "ligados",
311   - "display:block"
  311 + "",
  312 + false,
  313 + true,
  314 + "form-control"
312 315 );
313 316 }
314 317 };
... ...
ferramentas/perfil/template_mst.html
  Diff comments   View file @0f77942
1   -<p class='paragrafo'>{{{fonteDadosZ}}}
2   -<p class='paragrafo'>
3   - <input onclick='if(this.checked == true){$i({{{asp}}}i3GEOFperfilTemasSel{{{asp}}}).value = {{{asp}}}{{{asp}}};$i({{{asp}}}i3GEOFperfilDivComboItens{{{asp}}}).innerHTML = {{{asp}}}{{{asp}}};}' style='cursor: pointer' checked type='radio' name='i3GEOFperfilFonte' id='i3GEOFperfilFonteGoogle' />
4   - <label style='position:relative;top:-2px;'>Google</label> <br>
5   -<p class='paragrafo'>{{{ouTemaMapa}}}</p>
6   -<div class='styled-select' id='i3GEOFperfilTemas'></div>
7   -<br>
8   -<div id='i3GEOFperfilDivComboItens'></div>
9   -<br>
10   -<br>
11   -<p class='paragrafo'>{{{numeroPontosLinha}}}</p>
12   -<div class='i3geoForm i3geoFormIconeEdita'>
13   - <input type='text' id='i3GEOFperfilAmostragem' value='20' />
14   -</div>
15   -<br>
16   -<p class='paragrafo'>
17   - <input id='i3GEOperfilbotao1' type='button' value='{{{criaGrafico}}}' />
18   - <br> <br>
19   -<div style='text-align:left' id='i3GEOperfilfim' ></div>
20 1 \ No newline at end of file
  2 +<div class='container-fluid customScrollBar'>
  3 + <h5>{{{fonteDadosZ}}}</h5>
  4 + <div class="radio radio-primary condensed">
  5 + <label>
  6 + <input onclick='if(this.checked == true){$i({{{asp}}}i3GEOFperfilTemasSel{{{asp}}}).value = {{{asp}}}{{{asp}}};$i({{{asp}}}i3GEOFperfilDivComboItens{{{asp}}}).innerHTML = {{{asp}}}{{{asp}}};}'
  7 + type='radio' value="" name='i3GEOFperfilFonte' id='i3GEOFperfilFonteGoogle' />
  8 + <span class="circle"></span>
  9 + <span class="check"></span>
  10 + Google
  11 + </label>
  12 + </div>
  13 + <div style="width: 100%;" class='form-group label-fixed condensed'>
  14 + <label class="control-label" for="">{{{ouTemaMapa}}}</label>
  15 + <div style="width: 100%;" class="input-group">
  16 + <div id='i3GEOFperfilTemas'></div>
  17 + </div>
  18 + </div>
  19 + <div style="width: 100%;" class='form-group label-fixed condensed'>
  20 + <label class="control-label" for="">{{{itemValores}}}</label>
  21 + <div style="width: 100%;" class="input-group">
  22 + <div id='i3GEOFperfilDivComboItens'></div>
  23 + </div>
  24 + </div>
  25 + <div class='form-group label-fixed condensed'>
  26 + <label class="control-label" for="i3GEOFperfilAmostragem">{{{numeroPontosLinha}}}</label>
  27 + <input class="form-control input-lg" type='text' id='i3GEOFperfilAmostragem' value='20' />
  28 + </div>
  29 + <button onclick="i3GEOF.perfil.criaPerfil()" class='btn btn-primary btn-sm btn-raised'>{{{criaGrafico}}}</button>
  30 +
  31 + <div style='text-align: left' id='i3GEOperfilfim'></div>
  32 +</div>
21 33 \ No newline at end of file
... ...
js/compactados/ajuda_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/analise_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/arvoredecamadas_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/arvoredetemas_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/base64_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/busca_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/caixaDeFerramentas_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/calculo_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/catalogoDir_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/catalogoEstrelas_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/catalogoInde_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/catalogoMapas_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/catalogoMenus_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/catalogoMetaestat_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/catalogoOgc_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/catalogoRegioes_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/catalogoSistemas_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/configura_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/coordenadas_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/desenho_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/dicionario_ajuda_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/dicionario_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/editor_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/eventos_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/guias_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/idioma_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/ini_i3geo_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/interface_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/janela_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/legenda_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/login_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/mapa_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/maparef_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/marcador_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/mustache.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/navega_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/php_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/plugini3geo_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/proj4js.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/social_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/tema_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/util_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
js/compactados/wicket.js 100644 → 100755
  Diff comments   View file @0f77942
js/i3geo_tudo_compacto7.js.php 100644 → 100755
  Diff comments   View file @0f77942
pacotes/cpaint/cpaint2_compacto.inc.js 100644 → 100755
  Diff comments   View file @0f77942
pacotes/mobileesp/mdetect_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
pacotes/yui290/build/carousel/carousel_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
pacotes/yui290/build/container/container_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
pacotes/yui290/build/container/container_core_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
pacotes/yui290/build/resize/resize_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
pacotes/yui290/build/treeview/treeview_compacto.js 100644 → 100755
  Diff comments   View file @0f77942
pacotes/yui290/build/utilities/utilities_compacto.js 100644 → 100755
  Diff comments   View file @0f77942