From 4e6dbbc6077f36484c4a221610c91184c61ca5fd Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Tue, 19 Jun 2018 18:34:06 -0300
Subject: [PATCH] Inclusão das opções de mudar nome e opacidade na árvore de camadas

---
 interface/templates/camada.html | 17 +++++++++++------
 js/interface.js                 | 13 +++++++++++++
 js/tema.js                      |  3 +++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/interface/templates/camada.html b/interface/templates/camada.html
index c6dde4f..e8d0fd5 100755
--- a/interface/templates/camada.html
+++ b/interface/templates/camada.html
@@ -5,10 +5,15 @@
             <span style="vertical-align: middle" class="material-icons">playlist_add_check</span>
         </button>
         <ul class="dropdown-menu I3GEOpropCamadas">
-            <li><a onclick="i3GEO.temaAtivo='{{{name}}}';i3GEO.mapa.dialogo.opacidade()" href="javascript:void(0)">
-                    <span class="glyphicon glyphicon-adjust"></span> {{{opacidade}}}
-                </a></li>
-
+            <li class="container-fluid form-group">
+                <form onsubmit="console.log(this);i3GEO.tema.mudanome('{{{name}}}',this[0].value);return false;" action="">
+                    <input style="color: black;" class="form-control" type='text' value='{{{nomeCamada}}}' />
+                </form>
+            </li>
+            <li style="margin-top:0px;" class="container-fluid form-group">
+                <label class="control-label"> {{{opacidade}}}</label>
+                <input style="background:none;" onChange="i3GEO.Interface.aplicaOpacidade(this.value,'{{{name}}}')" type="range" min="1" max="100" value="{{opaCamada}}" class="slider" >
+            </li>
             <li><a href="javascript:void(0)" onclick="i3GEO.tema.exclui('{{{name}}}',true)" title="{{{removerTitle}}}">
                     <span class="glyphicon glyphicon-trash"></span> {{{removerTexto}}}
                 </a></li>
@@ -77,10 +82,10 @@
         <label class="rangeScale{{{rangeScale}}} {{{classeCss}}}" style="width: calc(100% - 50px)">
             <input class="noprint" type="checkbox" value="{{{name}}}" name="{{{name}}}"
                 {{{checked}}} onclick="i3GEO.Interface.ligaDesliga(this);i3GEO.eventos.executaEventos(i3GEO.eventos.ATUALIZAARVORECAMADAS);">
-            <span class="checkbox-material noprint"><span class="check"></span></span> {{{iconetema}}} <span style="cursor:move;">{{{tema}}}</span>
+            <span class="checkbox-material noprint"><span class="check"></span></span> {{{iconetema}}} <span style="cursor: move;">{{{tema}}}</span>
             <!-- icones que trazem informacoes sobre o tema -->
             <!-- farol que indica a relacao com a escala do mapa -->
-            <span id="farol{{name}}" title="{{{farolTitle}}}" class="glyphicon glyphicon-certificate {{{farol}}}" style="color: {{{farol}}}"></span>
+            <span id="farol{{name}}" title="{{{farolTitle}}}" class="glyphicon glyphicon-certificate {{{farol}}}" style="color: {{{farol"></span>
             <!-- indica se os elementos da camada sao dependentes da escala do mapa -->
             <span title="{{{contextoescalaTitle}}}" class="glyphicon glyphicon-alert {{{contextoescala}}}" style="color: orange;"></span>
             <!-- links para formularios que sao especificos de cada plugin do i3Geo  e de ferramentas salvas na camada-->
diff --git a/js/interface.js b/js/interface.js
index ed56d38..6b70ce3 100755
--- a/js/interface.js
+++ b/js/interface.js
@@ -951,6 +951,19 @@ i3GEO.Interface =
 	     * Aplica um valor de opacidade aos layers do mapa
 	     */
 	    aplicaOpacidade : function(opacidade, layer) {
+		if (typeof (console) !== 'undefined')
+			console.info("i3GEO.Interface.aplicaOpacidade");
+
+		if(opacidade > 1){
+		    opacidade = opacidade / 100;
+		}
+
+		if(layer){
+		    i3geoOL.getLayersByName(layer)[0].setOpacity(opacidade*1);
+		    return;
+		} else {
+		    layer = "";
+		}
 		var nlayers = i3GEO.arvoreDeCamadas.CAMADAS.length, l, i, camada;
 		if (!layer) {
 		    layer = "";
diff --git a/js/tema.js b/js/tema.js
index 441e576..6d1d010 100755
--- a/js/tema.js
+++ b/js/tema.js
@@ -303,6 +303,9 @@ i3GEO.tema =
 	 * {string} - codigo do tema
 	 */
 	mudanome : function(idtema,valor) {
+	    if (typeof (console) !== 'undefined')
+		console.info("i3GEO.tema.mudanome() " + valor);
+
 	    i3GEO.mapa.ativaTema(idtema);
 	    if (!valor) {
 		return;
--
libgit2 0.21.2