Correções finais na versão TABLET

Edmar Moretti
1 parent 03a35c9b
Showing 6 changed files with 74 additions and 51 deletions Show diff stats
classesjs/classe_barradebotoes.js
classesjs/classe_coordenadas.js
classesjs/classe_guias.js
classesjs/classe_interface.js
interface/openlayers.htm
interface/openlayers_t.htm
@@ -68,6 +68,18 @@ i3GEO.barraDeBotoes = {
 	*/
 	ORIENTACAO: "vertical",
 	/*
+	Propriedade: HORIZONTALW
+
+	Largura da barra quando ORIENTACAO = "horizontal"
+
+	Tipo:
+	{numeric}
+	
+	Default:
+	{350}
+	*/
+	HORIZONTALW: 350,	
+	/*
 	Propriedade: TIPOAJUDA
 	Tipo do balão de ajuda que é mostrado colado ao ícone da ferramenta
@@ -252,9 +264,9 @@ i3GEO.barraDeBotoes = {
 	{JSON}
 	*/
 	INCLUIBOTAO: {
-		zoomli: false,
-		pan: false,
-		zoomtot:false,
+		zoomli: true,
+		pan: true,
+		zoomtot:true,
 		identifica: true,
 		identificaBalao: true,
 		mede: true,
@@ -583,8 +595,8 @@ i3GEO.barraDeBotoes = {
 				chaves = i3GEO.util.listaChaves(i3GEO.barraDeBotoes.INCLUIBOTAO);
 				n = chaves.length;
 				for(i=0;i<n;i+=1){
-					if(this.INCLUIBOTAO[chaves[i]] === true){
-						temp += this.TEMPLATEBOTAO.replace("$$",chaves[i]);
+					if(i3GEO.barraDeBotoes.INCLUIBOTAO[chaves[i]] === true){
+						temp += i3GEO.barraDeBotoes.TEMPLATEBOTAO.replace("$$",chaves[i]);
 					}
 				}
 				if(typeof(onde) === 'undefined'){
@@ -694,7 +706,7 @@ i3GEO.barraDeBotoes = {
 		}
 		YAHOO.namespace("janelaBotoes.xp");
 		if(i3GEO.barraDeBotoes.ORIENTACAO === "horizontal"){
-			YAHOO.janelaBotoes.xp.panel = new YAHOO.widget.Panel(idconteudonovo, {zIndex:20000,width:300, fixedcenter: false, constraintoviewport: false, underlay:"none", close:i3GEO.barraDeBotoes.PERMITEFECHAR, visible:true, draggable:i3GEO.barraDeBotoes.PERMITEDESLOCAR, modal:false,iframe:false } );
+			YAHOO.janelaBotoes.xp.panel = new YAHOO.widget.Panel(idconteudonovo, {zIndex:20000,width:i3GEO.barraDeBotoes.HORIZONTALW, fixedcenter: false, constraintoviewport: false, underlay:"none", close:i3GEO.barraDeBotoes.PERMITEFECHAR, visible:true, draggable:i3GEO.barraDeBotoes.PERMITEDESLOCAR, modal:false,iframe:false } );
 		}
 		else{
 			if(this.AUTOALTURA === false || barraZoom === true || (elementos.length > numerobotoes))
@@ -790,7 +802,7 @@ i3GEO.barraDeBotoes = {
 		this.BARRAS.push(YAHOO.janelaBotoes.xp.panel);
 		YAHOO.janelaBotoes.xp.panel.show();
 		if(i3GEO.Interface.TABLET === true){
-			YAHOO.janelaBotoes.xp.panel.moveTo((i3GEO.parametros.w / 2) - 150,"");
+			YAHOO.janelaBotoes.xp.panel.moveTo((i3GEO.parametros.w / 2) - (i3GEO.barraDeBotoes.HORIZONTALW / 2),"");
 		}
 		//
 		//menu de contexto
@@ -316,8 +316,14 @@ i3GEO.coordenadas = {
 						if(temp && temp.style.display === "block")
 						{i3GEO.coordenadas.atualizaGeo(objposicaocursor.dmsx,objposicaocursor.dmsy,"coordgeotabela");}
 					};
-					if(i3GEO.eventos.MOUSEMOVE.toString().search("atualizaLocalizarGeo()") < 0)
-					{i3GEO.eventos.MOUSEMOVE.push("atualizaLocalizarGeo()");}
+					if(i3GEO.Interface.TABLET === true){
+						if(i3GEO.eventos.MOUSECLIQUE.toString().search("atualizaLocalizarGeo()") < 0)
+						{i3GEO.eventos.MOUSECLIQUE.push("atualizaLocalizarGeo()");}
+					}
+					else{
+						if(i3GEO.eventos.MOUSEMOVE.toString().search("atualizaLocalizarGeo()") < 0)
+						{i3GEO.eventos.MOUSEMOVE.push("atualizaLocalizarGeo()");}
+					}
 				}
 			}
 		}
@@ -661,9 +667,15 @@ i3GEO.coordenadas = {
 				temp = i3GEO.coordenadas.config[tipos[i]];
 				if(temp.ativo === true){
 					if(temp.tipo === "geo"){
-						if(ativaMovimento === true){
-							if(i3GEO.eventos.MOUSEMOVE.toString().search("atualizaLocalizarGeo('"+onde+tipos[i]+"')") < 0)
-							{i3GEO.eventos.MOUSEMOVE.push("atualizaLocalizarGeo('"+onde+tipos[i]+"')");}
+						if(ativaMovimento === true){	
+							if(i3GEO.Interface.TABLET === true){
+								if(i3GEO.eventos.MOUSECLIQUE.toString().search("atualizaLocalizarGeo('"+onde+tipos[i]+"')") < 0)
+								{i3GEO.eventos.MOUSECLIQUE.push("atualizaLocalizarGeo('"+onde+tipos[i]+"')");}
+							}
+							else{
+								if(i3GEO.eventos.MOUSEMOVE.toString().search("atualizaLocalizarGeo('"+onde+tipos[i]+"')") < 0)
+								{i3GEO.eventos.MOUSEMOVE.push("atualizaLocalizarGeo('"+onde+tipos[i]+"')");}
+							}								
 						}
 						if(typeof(x) !== 'undefined'){
 							atualizaLocalizarGeo(onde+tipos[i],i3GEO.calculo.dd2dms(x)[0],i3GEO.calculo.dd2dms(y)[0]);
@@ -671,8 +683,14 @@ i3GEO.coordenadas = {
 					}
 					else{
 						if(ativaMovimento === true){
-							if(i3GEO.eventos.MOUSEMOVE.toString().search("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')") < 0)
-							{i3GEO.eventos.MOUSEMOVE.push("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')");}
+							if(i3GEO.Interface.TABLET === true){
+								if(i3GEO.eventos.MOUSECLIQUE.toString().search("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')") < 0)
+								{i3GEO.eventos.MOUSECLIQUE.push("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')");}
+							}
+							else{
+								if(i3GEO.eventos.MOUSEMOVE.toString().search("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')") < 0)
+								{i3GEO.eventos.MOUSEMOVE.push("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')");}
+							}								
 						}
 						if(typeof(x) !== 'undefined'){
 							i3GEO.coordenadas.atualizaProj4(onde,tipos[i],x,y);
@@ -681,8 +699,14 @@ i3GEO.coordenadas = {
 				}
 			}
 			if(ativaMovimento === true){
-				if(i3GEO.eventos.MOUSEMOVE.toString().search("i3GEO.coordenadas.limpaModoTexto()") < 0)
-				{i3GEO.eventos.MOUSEMOVE.push("i3GEO.coordenadas.limpaModoTexto()");}
+				if(i3GEO.Interface.TABLET === true){
+					if(i3GEO.eventos.MOUSECLIQUE.toString().search("i3GEO.coordenadas.limpaModoTexto()") < 0)
+					{i3GEO.eventos.MOUSECLIQUE.push("i3GEO.coordenadas.limpaModoTexto()");}
+				}
+				else{
+					if(i3GEO.eventos.MOUSEMOVE.toString().search("i3GEO.coordenadas.limpaModoTexto()") < 0)
+					{i3GEO.eventos.MOUSEMOVE.push("i3GEO.coordenadas.limpaModoTexto()");}
+				}											
 			}
 			if(i3GEO.coordenadas.formato === "bloco")
 			{i3GEO.coordenadas.ativaBloco(onde);}
@@ -293,9 +293,6 @@ i3GEO.guias = {
 			//
 			if(i3GEO.guias.TIPO === "guia" || i3GEO.guias.TIPO === "tablet"){
 				ins = '<ul class="yui-nav" style="border-width:0pt 0pt 0px;border-color:rgb(240,240,240);border-bottom-color:white;text-align:center;">';
-				if(i3GEO.guias.TIPO === "tablet"){
-					ins += '<li><a alt="" title=""><em><div id="i3GEOguiaEsconde" onclick=i3GEO.guias.escondeGuias();  >x</div></em></a></li>';
-				}
 				for(ng=0;ng<nguias;ng++){
 					if($i(i3GEO.guias.CONFIGURA[guias[ng]].id)){
 						if($i(i3GEO.guias.CONFIGURA[guias[ng]].idconteudo))
@@ -400,12 +397,6 @@ i3GEO.guias = {
 		if(i3GEO.guias.TIPO !== "tablet"){
 			i3GEO.guias.mostra(i3GEO.guias.ATUAL);
 			i3GEO.guias.ativa(i3GEO.guias.ATUAL);
-			temp = $i("i3GEOguiaEsconde");
-			YAHOO.util.Event.addListener(temp, "click", YAHOO.util.Event.preventDefault);
-			YAHOO.util.Event.addListener(temp, "click", YAHOO.util.Event.stopPropagation);
-			YAHOO.util.Event.addFocusListener(temp, YAHOO.util.Event.preventDefault);
-			temp.onmouseover = onf;
-			temp.onmouseout = outf;
 		}
 		else
 		{i3GEO.guias.escondeGuias();}
@@ -441,14 +432,6 @@ i3GEO.guias = {
 		var guias,nguias,g,temp,attributes,anim;
 		guias = i3GEO.util.listaChaves(i3GEO.guias.CONFIGURA);
 		nguias = guias.length;
-		temp = $i("i3GEOguiaEsconde");
-		if(temp){
-			if(!navm){
-				temp.style.height = "0px";	
-				temp.style.visibility = "hidden";
-			}
-			temp.parentNode.parentNode.style.background="transparent";
-		}
 		for(g=0;g<nguias;g++){
 			temp = $i(this.CONFIGURA[guias[g]].idconteudo);
 			if(temp){
@@ -486,6 +469,13 @@ i3GEO.guias = {
 		var guias,nguias,g,temp,temp1,attributes,anim;
 		guias = i3GEO.util.listaChaves(i3GEO.guias.CONFIGURA);
 		nguias = guias.length;
+		//
+		//se a guia clicada já estiver aberta na interface com TABLET
+		//
+		if($i(this.CONFIGURA[guia].idconteudo).style.display === "block" && i3GEO.guias.TIPO === "tablet"){
+			i3GEO.guias.escondeGuias();
+			return;
+		}
 		for(g=0;g<nguias;g++){
 			if($i(this.CONFIGURA[guias[g]].idconteudo))
 			{$i(this.CONFIGURA[guias[g]].idconteudo).style.display="none";}
@@ -511,12 +501,6 @@ i3GEO.guias = {
 					temp.style.display = "block";
 					temp.style.zIndex = 9000;
 					temp.style.overflow = "hidden";
-					temp1 = $i("i3GEOguiaEsconde");
-					if(!navm){
-						temp1.style.height = "15px";
-						temp1.style.visibility = "visible";
-					}
-					temp1.parentNode.parentNode.style.background="transparent";
 					attributes = {
 						height: { to: i3GEO.parametros.h - 10 }
 					};
@@ -719,9 +719,6 @@ i3GEO.Interface = {
 				f.style.height = h;
 			}
 			i3GEO.Interface.IDMAPA = "openlayers";
-			bb.INCLUIBOTAO.zoomli = true;
-			bb.INCLUIBOTAO.pan = true;
-			bb.INCLUIBOTAO.zoomtot = true;
 			if(i3GEO.Interface.TABLET === true){
 				i3geoOL = new OpenLayers.Map({
 					div: "openlayers",
@@ -739,6 +736,9 @@ i3GEO.Interface = {
 				});			
 			}
 			else{
+				bb.INCLUIBOTAO.zoomli = true;
+				bb.INCLUIBOTAO.pan = true;
+				bb.INCLUIBOTAO.zoomtot = true;
 				i3geoOL = new OpenLayers.Map('openlayers', {
 					controls: [],
 					fractionalZoom: true,
@@ -145,7 +145,7 @@
 	</td>
 </tr>
 </table>
-<script src="../classesjs/i3geonaocompacto.js"></script>
+<script src="../classesjs/i3geo.js"></script>
 <script src="../pacotes/openlayers/OpenLayers29.js.php"></script>
 <script>
 /*
@@ -150,27 +150,29 @@ i3GEO.Interface.openlayers.GADGETS = {
 i3GEO.Interface.openlayers.TILES = true;
 i3GEO.barraDeBotoes.INCLUIBOTAO = {
-	zoomli: true,
+	zoomiauto: true,
+	zoomoauto: true,
+	zoomli: false,
 	pan: true,
-	zoomtot:false,
+	zoomtot:true,
 	identifica: true,
-	identificaBalao: true,
+	identificaBalao: false,
 	mede: true,
 	area: true,
 	imprimir: true,
 	reinicia: false,
-	exten: true,
+	exten: false,
 	referencia: true,
-	inserexy: true,
-	textofid: true,
+	inserexy: false,
+	textofid: false,
 	selecao: true,
 	google: true,
-	buscafotos: true,
+	buscafotos: false,
 	wiki: false,
 	metar: false,
 	lentei: false,
 	confluence: false,
-	inseregrafico: true,
+	inseregrafico: false,
 	v3d: false
 };
 i3GEO.Interface.TABLET = true;
@@ -196,6 +198,7 @@ i3GEO.Interface.BARRABOTOESLEFT = 5;
 i3GEO.Interface.BARRABOTOESTOP = 0;
 i3GEO.Interface.BARRADEZOOMTOP = 2;
 i3GEO.Interface.BARRADEZOOMLEFT = 5;
+i3GEO.barraDeBotoes.HORIZONTALW = 360;
 i3GEO.Interface.ATIVAMENUCONTEXTO = false;
 i3GEO.arvoreDeTemas.TIPOBOTAO = "radio";
	@@ -145,7 +145,7 @@		@@ -145,7 +145,7 @@
145	</td>	145	</td>
146	</tr>	146	</tr>
147	</table>	147	</table>
148	-<script src="../classesjs/i3geonaocompacto.js"></script>	148	+<script src="../classesjs/i3geo.js"></script>
149	<script src="../pacotes/openlayers/OpenLayers29.js.php"></script>	149	<script src="../pacotes/openlayers/OpenLayers29.js.php"></script>
150	<script>	150	<script>
151	/*	151	/*