diff --git a/classesjs/funcoes.js b/classesjs/funcoes.js
index aee3ec9..05c3047 100644
--- a/classesjs/funcoes.js
+++ b/classesjs/funcoes.js
@@ -1157,9 +1157,9 @@ function ativaClicks(docMapa)
pontosdistobj.yimg[n] = objposicaocursor.imgy
pontosdistobj.dist[n] = 0;
if (navn)
- {pontosdistobj.linhas[n] = richdraw.renderer.create(richdraw.mode, richdraw.fillColor, richdraw.lineColor, richdraw.lineWidth, objposicaocursor.imgx,objposicaocursor.imgy,objposicaocursor.imgx,objposicaocursor.imgy);}
+ {pontosdistobj.linhas[n] = richdraw.renderer.create(richdraw.mode, richdraw.fillColor, richdraw.lineColor, richdraw.lineWidth, pontosdistobj.ximg[n],pontosdistobj.yimg[n],pontosdistobj.ximg[n],pontosdistobj.yimg[n]);}
else
- {pontosdistobj.linhas[n] = richdraw.renderer.create(richdraw.mode, richdraw.fillColor, richdraw.lineColor, richdraw.lineWidth, (objposicaocursor.imgx)-(objmapa.w/2),objposicaocursor.imgy,(objposicaocursor.imgx)-(objmapa.w/2),objposicaocursor.imgy);}
+ {pontosdistobj.linhas[n] = richdraw.renderer.create(richdraw.mode, richdraw.fillColor, richdraw.lineColor, richdraw.lineWidth, (pontosdistobj.ximg[n])-(objmapa.w/2),pontosdistobj.yimg[n],(pontosdistobj.ximg[n])-(objmapa.w/2),pontosdistobj.yimg[n]);}
if (n > 0)
{
var d = parseInt(calculadistancia(pontosdistobj.xpt[n-1],pontosdistobj.ypt[n-1],objposicaocursor.ddx,objposicaocursor.ddy));
@@ -1167,25 +1167,31 @@ function ativaClicks(docMapa)
if (navn)
{
try
- {richdraw.renderer.resize(pontosdistobj.linhas[n-1], pontosdistobj.xtela[n-1], pontosdistobj.ytela[n-1], objposicaocursor.imgx, objposicaocursor.imgy);}
+ {richdraw.renderer.resize(pontosdistobj.linhas[n-1], pontosdistobj.xtela[n-1], pontosdistobj.ytela[n-1], pontosdistobj.ximg[n], pontosdistobj.yimg[n]);}
catch(e){window.status="erro ao desenhar a linha";}
var dx = Math.pow(((pontosdistobj.xtela[n])*1) - ((pontosdistobj.xtela[n-1])*1),2);
var dy = Math.pow(((pontosdistobj.ytela[n])*1) - ((pontosdistobj.ytela[n-1])*1),2);
var w = Math.sqrt(dx + dy);
try
- {richdraw.renderer.create('circ', '', 'rgb(250,250,250)', richdraw.lineWidth, pontosdistobj.xtela[n-1] - imagemxi,pontosdistobj.ytela[n-1] - imagemyi,w,w);}
+ {
+ if($i("pararraios") && $i("pararraios").checked == true )
+ {richdraw.renderer.create('circ', '', 'rgb(250,250,250)', richdraw.lineWidth, pontosdistobj.xtela[n-1] - imagemxi,pontosdistobj.ytela[n-1] - imagemyi,w,w);}
+ }
catch(e){window.status="erro ao desenhar o raio";}
}
else
{
try
- {richdraw.renderer.resize(pontosdistobj.linhas[n-1], pontosdistobj.xtela[n-1], pontosdistobj.ytela[n-1], (objposicaocursor.imgx)-(objmapa.w/2), objposicaocursor.imgy);}
+ {richdraw.renderer.resize(pontosdistobj.linhas[n-1], pontosdistobj.xtela[n-1], pontosdistobj.ytela[n-1], (pontosdistobj.ximg[n])-(objmapa.w/2), pontosdistobj.yimg[n]);}
catch(e){window.status="erro ao desenhar a linha";}
var dx = Math.pow(((pontosdistobj.xtela[n])*1) - ((pontosdistobj.xtela[n-1])*1),2);
var dy = Math.pow(((pontosdistobj.ytela[n])*1) - ((pontosdistobj.ytela[n-1])*1),2);
var w = Math.sqrt(dx + dy);
try
- {richdraw.renderer.create('circ', '', 'rgb(250,250,250)', richdraw.lineWidth, pontosdistobj.ximg[n-1]-w,pontosdistobj.yimg[n-1]-w,w*2,w*2);}
+ {
+ if($i("pararraios") && $i("pararraios").checked==true )
+ {richdraw.renderer.create('circ', '', 'rgb(250,250,250)', richdraw.lineWidth, pontosdistobj.ximg[n-1]-w,pontosdistobj.yimg[n-1]-w,w*2,w*2);}
+ }
catch(e){window.status="erro ao desenhar o raio";}
}
}
diff --git a/classesjs/iniciamma.js b/classesjs/iniciamma.js
index 1acdeb7..48d0c1c 100644
--- a/classesjs/iniciamma.js
+++ b/classesjs/iniciamma.js
@@ -1576,11 +1576,14 @@ function Mapa(e,m)
novoel.style.height="50px";
novoel.style.border="1px solid black";
novoel.style.padding="5px";
+ novoel.style.textAlign="left";
var calculo = document.createElement("div");
calculo.id = "mostradistancia_calculo";
novoel.appendChild(calculo);
var divin = document.createElement("div");
- divin.innerHTML = "Parar de medir";
+ divin.style.textAlign="left";
+ divin.innerHTML = "Parar de medir
";
+ divin.innerHTML += "
Raios";
novoel.appendChild(divin);
document.body.appendChild(novoel);
}
diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php
index ccb0bac..c40cf81 100644
--- a/classesphp/funcoes_gerais.php
+++ b/classesphp/funcoes_gerais.php
@@ -695,10 +695,11 @@ function testaMapa($map_file)
$objMapa = ms_newMapObj($map_file);
ms_ResetErrorList();
$img = $objMapa->draw();
+ $erros = "";
$error = ms_GetErrorObj();
while($error && $error->code != MS_NOERR)
{
- printf("Erro em %s: %s
\n", $error->routine, $error->message);
+ $erros .= " Erro. ".$error->routine." ".$error->message;
$error = $error->next();
}
$error = ms_GetErrorObj();
@@ -707,7 +708,10 @@ function testaMapa($map_file)
$nmf = str_replace(".map","seguranca.map",$map_file);
$objMapa = ms_newMapObj($nmf);
$objMapa->save($map_file);
+ return $erros;
}
+ else
+ {return "ok";}
}
/*
function: desligamargem
diff --git a/classesphp/mapa_controle.php b/classesphp/mapa_controle.php
index cf119b9..0671b57 100644
--- a/classesphp/mapa_controle.php
+++ b/classesphp/mapa_controle.php
@@ -625,8 +625,9 @@ Include:
case "adtema":
include("classe_mapa.php");
$m = new Mapa($map_file);
- $cp->set_data($m->adicionaTema($temas,$locaplic));
+ $m->adicionaTema($temas,$locaplic);
$m->salva();
+ $cp->set_data(testaMapa($map_file));
break;
/*
Property: excluitema
diff --git a/temas/bioma.map b/temas/bioma.map
index 6f60624..3663071 100644
--- a/temas/bioma.map
+++ b/temas/bioma.map
@@ -6,7 +6,7 @@ LAYER
STATUS OFF
TEMPLATE "none.htm"
CONNECTIONTYPE postgis
- CONNECTION "user=geodados password=geodados dbname=geodados host=10.1.1.36 port=5432"
+ CONNECTION "user=geodadosx password=geodados dbname=geodados host=10.1.1.36 port=5432"
DATA "the_geom FROM (select * FROM brasil.brareg1) as foo USING UNIQUE gid USING SRID=4291"
METADATA
ITENS "cd_legenda"
--
libgit2 0.21.2