diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope index b0601cd..5843876 100644 --- a/.settings/.jsdtscope +++ b/.settings/.jsdtscope @@ -1,97 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ferramentas/metaestat/index.js b/ferramentas/metaestat/index.js index fdccc45..5568cec 100644 --- a/ferramentas/metaestat/index.js +++ b/ferramentas/metaestat/index.js @@ -51,7 +51,7 @@ i3GEOF.metaestat = { }, analise: { inicia: function(iddiv){ - if(!iddiv){ + if(!iddiv || !$i(iddiv)){ iddiv = "i3geoCartoAnalise_corpo"; } if(i3GEOF.metaestat.INTERFACE == "flutuante"){ @@ -103,7 +103,7 @@ i3GEOF.metaestat = { alert("erro: i3geoCartoComboMedidasVariavel???"); return; } - if(!iddiv){ + if(!iddiv || !$i(iddiv)){ iddiv = "i3geoCartoClasses_corpo"; } if(i3GEOF.metaestat.INTERFACE == "flutuante"){ @@ -154,6 +154,13 @@ i3GEOF.metaestat = { ''; return ins; }, + botaoAdicionarCamada: function(){ + new YAHOO.widget.Button( + "i3GEOcartoBotaoAdicionarCamada", + {onclick:{fn: i3GEOF.metaestat.comum.adicionaCamada}} + ); + $i("i3GEOcartoBotaoAdicionarCamada-button").style.width = i3GEOF.metaestat.LARGURA - 25 + "px"; + }, comboTipoRep: function(){ var onde = $i("i3geoCartoTipoRep"), ins,i, @@ -171,11 +178,7 @@ i3GEOF.metaestat = { ins += ""; if(onde){ onde.innerHTML = ins; - new YAHOO.widget.Button( - "i3GEOcartoBotaoAdicionarCamada", - {onclick:{fn: i3GEOF.metaestat.comum.adicionaCamada}} - ); - $i("i3GEOcartoBotaoAdicionarCamada-button").style.width = i3GEOF.metaestat.LARGURA - 25 + "px"; + i3GEOF.metaestat.classes.botaoAdicionarCamada(); } return ins; }, @@ -590,7 +593,7 @@ i3GEOF.metaestat = { }, principal: { inicia: function(iddiv){ - if(!iddiv){ + if(!iddiv || !$i(iddiv)){ iddiv = "i3geoCartoParametros_corpo"; } if(i3GEOF.metaestat.INTERFACE == "flutuante"){ @@ -696,6 +699,34 @@ i3GEOF.metaestat = { ins += ""; return ins; }, + botaoInfo: function(){ + new YAHOO.widget.Button( + "i3GEOcartoBotaoInfo", + {onclick:{fn: i3GEOF.metaestat.principal.maisInfo}} + ); + $i("i3GEOcartoBotaoInfo-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px"; + }, + botaoJanelaEditor: function(){ + new YAHOO.widget.Button( + "i3GEOcartoBotaoEditor", + {onclick:{fn: i3GEOF.metaestat.editor.inicia}} + ); + $i("i3GEOcartoBotaoEditor-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px"; + }, + botaoJanelaClasses: function(){ + new YAHOO.widget.Button( + "i3GEOcartoBotaoClasses", + {onclick:{fn: i3GEOF.metaestat.classes.inicia}} + ); + $i("i3GEOcartoBotaoClasses-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px"; + }, + botaoJanelaAnalise: function(){ + new YAHOO.widget.Button( + "i3GEOcartoBotaoAnalise", + {onclick:{fn: i3GEOF.metaestat.analise.inicia}} + ); + $i("i3GEOcartoBotaoAnalise-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px"; + }, opcoesVariaveis: function(){ var onde = $i("i3geoCartoVariaveis"), temp = function(dados){ @@ -709,26 +740,10 @@ i3GEOF.metaestat = { ins += i3GEOF.metaestat.principal.comboVariaveis(dados,"i3geoCartoComboVariavel","i3GEOF.metaestat.principal.comboVariaveisOnchange"); if(onde){ onde.innerHTML = ins; - new YAHOO.widget.Button( - "i3GEOcartoBotaoInfo", - {onclick:{fn: i3GEOF.metaestat.principal.maisInfo}} - ); - $i("i3GEOcartoBotaoInfo-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px"; - new YAHOO.widget.Button( - "i3GEOcartoBotaoEditor", - {onclick:{fn: i3GEOF.metaestat.editor.inicia}} - ); - $i("i3GEOcartoBotaoEditor-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px"; - new YAHOO.widget.Button( - "i3GEOcartoBotaoClasses", - {onclick:{fn: i3GEOF.metaestat.classes.inicia}} - ); - $i("i3GEOcartoBotaoClasses-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px"; - new YAHOO.widget.Button( - "i3GEOcartoBotaoAnalise", - {onclick:{fn: i3GEOF.metaestat.analise.inicia}} - ); - $i("i3GEOcartoBotaoAnalise-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px"; + i3GEOF.metaestat.principal.botaoInfo(); + i3GEOF.metaestat.principal.botaoJanelaEditor(); + i3GEOF.metaestat.principal.botaoJanelaClasses(); + i3GEOF.metaestat.principal.botaoJanelaAnalise(); } return ins; }; diff --git a/interface/carto_ol.htm b/interface/carto_ol.htm index 0eb6dc2..cc861cd 100644 --- a/interface/carto_ol.htm +++ b/interface/carto_ol.htm @@ -201,10 +201,11 @@ i3GEO.finaliza = function(){ if($i("i3GEOlogoMarca")) {$i("i3GEOlogoMarca").style.display = "none";} i3GEO.mapa.insereDobraPagina("googlemaps","../imagens/dobragooglemaps.png"); -} +}; i3GEO.arvoreDeTemas.OPCOESADICIONAIS.navegacaoDir = true; i3GEO.inicia(); //parametros especificos dos cartogramas +//ver i3geo/ferramentas/metaestat i3GEOF.metaestat.INTERFACE = "flutuante"; i3GEOF.metaestat.TOP = 50; i3GEOF.metaestat.LEFT = 100; -- libgit2 0.21.2