Download as
Browse Code »

Commit 45224a0a4c447dc48791deaecdb44f555f7085ee

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

Ferramenta de cálculo de custo

Showing 4 changed files with 28 additions and 2 deletions   Show diff stats
classesjs/classe_analise.js
  Diff comments   View file @45224a0
@@ -189,6 +189,14 @@ i3GEO.analise = @@ -189,6 +189,14 @@ i3GEO.analise =
189 i3GEO.util.dialogoFerramenta("i3GEO.analise.dialogo.perfil()", "perfil", "perfil"); 189 i3GEO.util.dialogoFerramenta("i3GEO.analise.dialogo.perfil()", "perfil", "perfil");
190 }, 190 },
191 /** 191 /**
  192 + * Function: melhorcaminho
  193 + *
  194 + * Ferramenta melhor caminho
  195 + */
  196 + melhorcaminho : function() {
  197 + i3GEO.util.dialogoFerramenta("i3GEO.analise.dialogo.melhorcaminho()", "melhorcaminho", "melhorcaminho");
  198 + },
  199 + /**
192 * Function: gradePontos 200 * Function: gradePontos
193 * 201 *
194 * Ferramenta grade de pontos 202 * Ferramenta grade de pontos
classesjs/classe_util.js
  Diff comments   View file @45224a0
@@ -1585,6 +1585,17 @@ i3GEO.util = @@ -1585,6 +1585,17 @@ i3GEO.util =
1585 i3GEO.janela.tempoMsg($trad("x13")); 1585 i3GEO.janela.tempoMsg($trad("x13"));
1586 } 1586 }
1587 } 1587 }
  1588 + if (tipoCombo === "naoraster") {
  1589 + if (i3GEO.arvoreDeCamadas.CAMADAS !== "") {
  1590 + temp = i3GEO.arvoreDeCamadas.filtraCamadas("type", 4, "diferente", i3GEO.arvoreDeCamadas.CAMADAS);
  1591 + temp = i3GEO.arvoreDeCamadas.filtraCamadas("type", 5, "diferente", temp);
  1592 + temp = i3GEO.arvoreDeCamadas.filtraCamadas("type", 6, "diferente", temp);
  1593 + temp = i3GEO.arvoreDeCamadas.filtraCamadas("type", 7, "diferente", temp);
  1594 + monta(i3GEO.arvoreDeCamadas.filtraCamadas("type", 8, "diferente", temp));
  1595 + } else {
  1596 + i3GEO.janela.tempoMsg($trad("x13"));
  1597 + }
  1598 + }
1588 if (tipoCombo === "poligonosSelecionados") { 1599 if (tipoCombo === "poligonosSelecionados") {
1589 if (i3GEO.arvoreDeCamadas.CAMADAS !== "") { 1600 if (i3GEO.arvoreDeCamadas.CAMADAS !== "") {
1590 temp = i3GEO.arvoreDeCamadas.filtraCamadas("type", 2, "igual", i3GEO.arvoreDeCamadas.CAMADAS); 1601 temp = i3GEO.arvoreDeCamadas.filtraCamadas("type", 2, "igual", i3GEO.arvoreDeCamadas.CAMADAS);
classesjs/dicionario.js
  Diff comments   View file @45224a0
@@ -2294,6 +2294,12 @@ g_traducao = { @@ -2294,6 +2294,12 @@ g_traducao = {
2294 pt: "Operacao nao autorizada para esse usuario", 2294 pt: "Operacao nao autorizada para esse usuario",
2295 en:"", 2295 en:"",
2296 es:"" 2296 es:""
  2297 +}],
  2298 +"melhorcaminho": [
  2299 +{
  2300 + pt: "Melhor caminho (raster)",
  2301 + en:"",
  2302 + es:""
2297 }] 2303 }]
2298 }; 2304 };
2299 //YAHOO.log("carregou dicionario", "Classes i3geo"); 2305 //YAHOO.log("carregou dicionario", "Classes i3geo");
classesphp/funcoes_gerais.php
  Diff comments   View file @45224a0
@@ -2460,8 +2460,9 @@ function retornaShapesMapext($objLayer,$objMapa){ @@ -2460,8 +2460,9 @@ function retornaShapesMapext($objLayer,$objMapa){
2460 $shapes = array(); 2460 $shapes = array();
2461 $status = $objLayer->open(); 2461 $status = $objLayer->open();
2462 $status = $objLayer->whichShapes($objMapa->extent); 2462 $status = $objLayer->whichShapes($objMapa->extent);
2463 - while ($shape = $objLayer->nextShape())  
2464 - {$shapes[] = $shape;} 2463 + while ($shape = $objLayer->nextShape()){
  2464 + $shapes[] = $shape;
  2465 + }
2465 $objLayer->close(); 2466 $objLayer->close();
2466 return $shapes; 2467 return $shapes;
2467 } 2468 }