From 3c4002061c293129bd2a1ed44ca4b40a079630ee Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 23 Feb 2015 03:17:26 +0000
Subject: [PATCH] 

---
 classesjs/classe_interface.js     |   1 +
 classesjs/classe_tema.js          |   2 +-
 css/botoes2.css                   |   4 ++++
 ferramentas/legenda/dicionario.js |   6 +++---
 ferramentas/legenda/index.js      | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------
 5 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/classesjs/classe_interface.js b/classesjs/classe_interface.js
index 7161df5..55b661b 100644
--- a/classesjs/classe_interface.js
+++ b/classesjs/classe_interface.js
@@ -49,6 +49,7 @@ if (typeof (i3GEO) === 'undefined') {
 	var i3GEO = {};
 }
 //TODO incluir opcao para usar o modo notile no googlemaps e openlayers conforme for definido na configuracao do LAYER
+//TODO integrar Cesium http://cesiumjs.org/2013/04/12/Cesium-up-and-running/
 i3GEO.Interface =
 	{
 		/**
diff --git a/classesjs/classe_tema.js b/classesjs/classe_tema.js
index d8b41e2..5f6800f 100644
--- a/classesjs/classe_tema.js
+++ b/classesjs/classe_tema.js
@@ -34,7 +34,7 @@
 if (typeof (i3GEO) === 'undefined') {
 	var i3GEO = {};
 }
-//XODO nova ferramenta para definir GEOMTRANSFORM, SYMBOLSCALEDENOM 
+//XODO nova ferramenta para definir GEOMTRANSFORM 
 i3GEO.tema =
 	{
 		/**
diff --git a/css/botoes2.css b/css/botoes2.css
index 1850a6a..84b7c1c 100644
--- a/css/botoes2.css
+++ b/css/botoes2.css
@@ -1125,6 +1125,10 @@ button { //
     height: 16px;
     float: left;
 }
+.i3GEOiconeXis {
+  background-image: url("../imagens/oxygen/16x16/edit-delete.png");
+  cursor: pointer;
+}
 .i3GEOiconemmscale{
 	background-image: URL('../imagens/oxygen/16x16/graphics-viewer-document.png');
 }
diff --git a/ferramentas/legenda/dicionario.js b/ferramentas/legenda/dicionario.js
index e88a95e..6ea41ea 100644
--- a/ferramentas/legenda/dicionario.js
+++ b/ferramentas/legenda/dicionario.js
@@ -266,7 +266,7 @@ i3GEOF.legenda.dicionario = {
 		es : ""
 	} ],
 	'aplicaAlteracoes' : [ {
-		pt : "Aplicar as altera&ccedil;&otilde;es",
+		pt : "Aplicar todas as altera&ccedil;&otilde;es",
 		en : "",
 		es : ""
 	} ],
@@ -421,7 +421,7 @@ i3GEOF.legenda.dicionario = {
 		es : ""
 	} ],
 	'tamanhoEspacamento' : [ {
-		pt : "Tamanho/espa&ccedil;amento",
+		pt : "Tamanho / espa&ccedil;amento",
 		en : "",
 		es : ""
 	} ],
@@ -446,7 +446,7 @@ i3GEOF.legenda.dicionario = {
 		es : ""
 	} ],
 	'simbolo' : [ {
-		pt : "S&iacute;mbolo<br>(Voc&ecirc; pode usar o caminho absoluto de uma imagem PNG existente no servidor)",
+		pt : "S&iacute;mbolo (Voc&ecirc; pode usar o caminho absoluto de uma imagem PNG existente no servidor ou clicar em um dos s&iacute;mbolos mostrados abaixo)",
 		en : "",
 		es : ""
 	} ],
diff --git a/ferramentas/legenda/index.js b/ferramentas/legenda/index.js
index 4663347..2c8b0d7 100644
--- a/ferramentas/legenda/index.js
+++ b/ferramentas/legenda/index.js
@@ -41,6 +41,8 @@ if (typeof (i3GEOF) === 'undefined') {
  * Classe: i3GEOF.legenda
  */
 //XODO incluir um construtor de expressao na legenda
+//XODO incluir SYMBOLSCALEDENOM
+//XODO incluir link para ferramenta de definicao da escala
 i3GEOF.legenda =
 	{
 		/*
@@ -512,9 +514,9 @@ i3GEOF.legenda =
 							exp = (retorno.data[i].expressao).replace(re, '"');
 
 							ins.push("<tr>");
-							ins.push("<td><img style='cursor:pointer' title='" + $trad('cliqueExclui', i3GEOF.legenda.dicionario)
+							ins.push("<td><div style='cursor:pointer' title='" + $trad('cliqueExclui', i3GEOF.legenda.dicionario)
 								+ "' onclick='i3GEOF.legenda.excluilinhaf(this)' src='" + i3GEO.configura.locaplic
-								+ "/imagens/x.gif' title='excluir' /></td>");
+								+ "/imagens/x.gif' title='excluir' class='i3GEOiconeXis' >&nbsp;</div></td>");
 
 							ins.push("<td><img width='30px' height='15px' style='cursor:pointer' title='"
 								+ $trad('cliqueAltera', i3GEOF.legenda.dicionario) + "' src='" + retorno.data[i].imagem
@@ -1448,104 +1450,100 @@ i3GEOF.legenda =
 				linha = i3GEOF.legenda.estilos[i3GEOF.legenda.estilo];
 				linha = linha.split("#");
 				tipoLayer = linha[0];
-				d =
-					"<table class=lista6 >"
-					+ "<tr><td>"
-					+ "<img onclick='i3GEOF.legenda.aplicaTodasClasses(\"outlinecolor\",\"i3GEOlegendaoutlinecolor\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
-					+ "</td><td style='text-align:left;'>Cor do contorno:</td><td>"
-					+ "<div class='i3geoForm100 i3geoFormIconeAquarela' >"
-						+ "<input type=text value='"
-						+ linha[2]
-						+ "' id='i3GEOlegendaoutlinecolor' />"
-						+ "</div>"
-					+ "</td></tr>"
-					+ "<tr><td>"
-					+ "<img onclick='i3GEOF.legenda.aplicaTodasClasses(\"backgroundcolor\",\"i3GEOlegendabackgroundcolor\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
-					+ "</td><td style='text-align:left;'>"
-						+ $trad('corFundo', i3GEOF.legenda.dicionario)
-						+ ":</td><td>"
-						+ "<div class='i3geoForm100 i3geoFormIconeAquarela' >"
-						+ "<input type=text value='"
-						+ linha[3]
-						+ "' id='i3GEOlegendabackgroundcolor' />"
-						+ "</div>"
-					+ "</td></tr>"
-					+ "<tr><td>"
-					+ "<img onclick='i3GEOF.legenda.aplicaTodasClasses(\"color\",\"i3GEOlegendacolor\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
-					+ "</td><td style='text-align:left;'>"
-						+ $trad('corFrente', i3GEOF.legenda.dicionario)
-						+ ":</td><td>"
-						+ "<div class='i3geoForm100 i3geoFormIconeAquarela' >"
-						+ "<input type=text value='"
-						+ linha[4]
-						+ "' id='i3GEOlegendacolor' />"
-						+ "</div>"
-					+ "</td></tr>"
-					+ "<tr><td>"
-					+ "<img onclick='i3GEOF.legenda.aplicaTodasClasses(\"size\",\"i3GEOlegendasizes\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
-					+ "</td><td style='text-align:left;'>"
-						+ $trad('tamanhoEspacamento', i3GEOF.legenda.dicionario)
-						+ ":</td><td>"
-						+ "<div class='i3geoForm i3geoFormIconeEdita' >"
-						+ "<input type=text value='"
-						+ linha[6]
-						+ "' id='i3GEOlegendasizes' />"
-						+ "</div>"
-					+ "</td><td></td></tr>"
-					+ "<tr><td>"
-					+ "<img onclick='i3GEOF.legenda.aplicaTodasClasses(\"width\",\"i3GEOlegendawidth\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
-					+ "</td><td style='text-align:left;'>"
-						+ $trad('espessura', i3GEOF.legenda.dicionario)
-						+ ":</td><td>"
-						+ "<div class='i3geoForm i3geoFormIconeEdita' >"
-						+ "<input type=text value='"
-						+ linha[8]
-						+ "' id='i3GEOlegendawidth' />"
-						+ "</div>"
-					+ "</td><td></td></tr>"
-					+ "<tr><td>"
-					+ "<img onclick='i3GEOF.legenda.aplicaTodasClasses(\"pattern\",\"i3GEOlegendapattern\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
-					+ "</td><td style='text-align:left;'>"
-						+ $trad('padraoRepeticao', i3GEOF.legenda.dicionario)
-						+ ":</td><td>"
-						+ "<div class='i3geoForm i3geoFormIconeEdita' >"
-						+ "<input type=text value='"
-						+ linha[9]
-						+ "' id='i3GEOlegendapattern' />"
-						+ "</div>"
-					+ "</td><td></td></tr>"
-					+ "<tr><td>"
-					+ "<img onclick='i3GEOF.legenda.aplicaTodasClasses(\"opacity\",\"i3GEOlegendaopacidade\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
-					+ "</td><td style='text-align:left;'>"
-						+ $trad('opacidade', i3GEOF.legenda.dicionario)
-						+ ":</td><td>"
-						+ "<div class='i3geoForm i3geoFormIconeEdita' >"
-						+ "<input type=text value='"
-						+ linha[7]
-						+ "' id='i3GEOlegendaopacidade' />"
-						+ "</div>"
-					+ "</td><td></td></tr>"
-					+ "<tr><td>"
-					+ "<img onclick='i3GEOF.legenda.aplicaTodasClasses(\"angle\",\"i3GEOlegendaangulo\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
-					+ "</td><td style='text-align:left;'>"
-						+ $trad('angulo', i3GEOF.legenda.dicionario)
-						+ ":</td><td>"
-						+ "<div class='i3geoForm i3geoFormIconeEdita' >"
-						+ "<input type=text value='"
-						+ linha[10]
-						+ "' id='i3GEOlegendaangulo' />"
-						+ "</div>"
-					+ "</td><td></td></tr>"
-					+ "<tr><td>"
-					+ "<img onclick='i3GEOF.legenda.aplicaTodasClasses(\"symbolname\",\"i3GEOlegendasymbolname\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
-					+ "</td><td style='text-align:left;'>"
-						+ $trad('simbolo', i3GEOF.legenda.dicionario)
-						+ ":</td><td>"
-						+ "<div class='i3geoForm i3geoFormIconeEdita' >"
-						+ "<input type=text value='"
-						+ linha[5]
-						+ "' id='i3GEOlegendasymbolname' />"
-						+ "</div>" + "</td><td></td></tr></table>";
+				d = 
+					"<img style='float:left;' onclick='i3GEOF.legenda.aplicaTodasClasses(\"outlinecolor\",\"i3GEOlegendaoutlinecolor\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
+					+ "<p class='paragrafo'>Cor do contorno:</p>"
+					+ "<form onsubmit='i3GEOF.legenda.aplicaEstilo();return false;'>"
+					+ "<div class='i3geoForm i3geoFormIconeAquarela' >"
+					+ "<input type=text value='"
+					+ linha[2]
+					+ "' id='i3GEOlegendaoutlinecolor' />"
+					+ "</div></form>"
+				
+					+ "<br><img style='float:left;' onclick='i3GEOF.legenda.aplicaTodasClasses(\"color\",\"i3GEOlegendacolor\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
+					+ "<p class='paragrafo'>" + $trad('corFrente', i3GEOF.legenda.dicionario) + ":</p>"
+					+ "<form onsubmit='i3GEOF.legenda.aplicaEstilo();return false;'>"
+					+ "<div class='i3geoForm i3geoFormIconeAquarela' >"
+					+ "<input type=text value='"
+					+ linha[4]
+					+ "' id='i3GEOlegendacolor' />"
+					+ "</div></form>"
+
+					+ "<br><img style='float:left;' onclick='i3GEOF.legenda.aplicaTodasClasses(\"backgroundcolor\",\"i3GEOlegendabackgroundcolor\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
+					+ "<p class='paragrafo'>" + $trad('corFundo', i3GEOF.legenda.dicionario) + ":</p>"
+					+ "<form onsubmit='i3GEOF.legenda.aplicaEstilo();return false;'>"
+					+ "<div class='i3geoForm i3geoFormIconeAquarela' >"
+					+ "<input type=text value='"
+					+ linha[3]
+					+ "' id='i3GEOlegendabackgroundcolor' />"
+					+ "</div></form>"
+
+					+ "<br><img style='float:left;' onclick='i3GEOF.legenda.aplicaTodasClasses(\"size\",\"i3GEOlegendasizes\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
+					+ "<p class='paragrafo'>"
+					+ $trad('tamanhoEspacamento', i3GEOF.legenda.dicionario)
+					+ ":</p>"
+					+ "<div class='i3geoForm i3geoFormIconeEdita' >"
+					+ "<form onsubmit='i3GEOF.legenda.aplicaEstilo();return false;'>"
+					+ "<input type=text value='"
+					+ linha[6]
+					+ "' id='i3GEOlegendasizes' />"
+					+ "</form></div>"
+					
+					+ "<br><img style='float:left;' onclick='i3GEOF.legenda.aplicaTodasClasses(\"width\",\"i3GEOlegendawidth\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
+					+ "<p class='paragrafo'>"
+					+ $trad('espessura', i3GEOF.legenda.dicionario)
+					+ ":<p>"
+					+ "<div class='i3geoForm i3geoFormIconeEdita' >"
+					+ "<form onsubmit='i3GEOF.legenda.aplicaEstilo();return false;'>"
+					+ "<input type=text value='"
+					+ linha[8]
+					+ "' id='i3GEOlegendawidth' />"
+					+ "</form></div>"
+					
+					+ "<br><img style='float:left;' onclick='i3GEOF.legenda.aplicaTodasClasses(\"pattern\",\"i3GEOlegendapattern\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
+					+ "<p class='paragrafo'>"
+					+ $trad('padraoRepeticao', i3GEOF.legenda.dicionario)
+					+ ":</p>"
+					+ "<div class='i3geoForm i3geoFormIconeEdita' >"
+					+ "<form onsubmit='i3GEOF.legenda.aplicaEstilo();return false;'>"
+					+ "<input type=text value='"
+					+ linha[9]
+					+ "' id='i3GEOlegendapattern' />"
+					+ "</form></div>"
+					
+					+ "<br><img style='float:left;' onclick='i3GEOF.legenda.aplicaTodasClasses(\"opacity\",\"i3GEOlegendaopacidade\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
+					+ "<p class='paragrafo'>"
+					+ $trad('opacidade', i3GEOF.legenda.dicionario)
+					+ ":</p>"
+					+ "<div class='i3geoForm i3geoFormIconeEdita' >"
+					+ "<form onsubmit='i3GEOF.legenda.aplicaEstilo();return false;'>"
+					+ "<input type=text value='"
+					+ linha[7]
+					+ "' id='i3GEOlegendaopacidade' />"
+					+ "</form></div>"
+					
+					+ "<br><img style='float:left;' onclick='i3GEOF.legenda.aplicaTodasClasses(\"angle\",\"i3GEOlegendaangulo\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
+					+ "<p class='paragrafo'>"
+					+ $trad('angulo', i3GEOF.legenda.dicionario)
+					+ ":</p>"
+					+ "<div class='i3geoForm i3geoFormIconeEdita' >"
+					+ "<form onsubmit='i3GEOF.legenda.aplicaEstilo();return false;'>"
+					+ "<input type=text value='"
+					+ linha[10]
+					+ "' id='i3GEOlegendaangulo' />"
+					+ "</form></div>"
+
+					+ "<br><img style='float:left;' onclick='i3GEOF.legenda.aplicaTodasClasses(\"symbolname\",\"i3GEOlegendasymbolname\")' title='"+$trad('aplicatodos', i3GEOF.legenda.dicionario)+"' src='"+i3GEO.configura.locaplic+"/imagens/oxygen/16x16/tools-wizard.png'  />"
+					+ "<p class='paragrafo'>"
+					+ $trad('simbolo', i3GEOF.legenda.dicionario)
+					+ ":</p>"
+					+ "<div class='i3geoForm i3geoFormIconeEdita' >"
+					+ "<form onsubmit='i3GEOF.legenda.aplicaEstilo();return false;'>"
+					+ "<input type=text value='"
+					+ linha[5]
+					+ "' id='i3GEOlegendasymbolname' />"
+					+ "</form></div>";
+				
 				$i("i3GEOlegendaParametrosEstilos").innerHTML = d;
 				i3GEO.util.aplicaAquarela("i3GEOlegendaParametrosEstilos");
 				p =
--
libgit2 0.21.2