Download as
Browse Code »

Commit 0fe7bf8e1159bc29f67c62e731a860ddc804c116

Authored by Edmar Moretti
1 parent 03a35c9b
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Correções finais na versão TABLET

Showing 6 changed files with 74 additions and 51 deletions   Show diff stats
classesjs/classe_barradebotoes.js
  Diff comments   View file @0fe7bf8
... ... @@ -68,6 +68,18 @@ i3GEO.barraDeBotoes = {
68 68 */
69 69 ORIENTACAO: "vertical",
70 70 /*
  71 + Propriedade: HORIZONTALW
  72 +
  73 + Largura da barra quando ORIENTACAO = "horizontal"
  74 +
  75 + Tipo:
  76 + {numeric}
  77 +
  78 + Default:
  79 + {350}
  80 + */
  81 + HORIZONTALW: 350,
  82 + /*
71 83 Propriedade: TIPOAJUDA
72 84  
73 85 Tipo do balão de ajuda que é mostrado colado ao ícone da ferramenta
... ... @@ -252,9 +264,9 @@ i3GEO.barraDeBotoes = {
252 264 {JSON}
253 265 */
254 266 INCLUIBOTAO: {
255   - zoomli: false,
256   - pan: false,
257   - zoomtot:false,
  267 + zoomli: true,
  268 + pan: true,
  269 + zoomtot:true,
258 270 identifica: true,
259 271 identificaBalao: true,
260 272 mede: true,
... ... @@ -583,8 +595,8 @@ i3GEO.barraDeBotoes = {
583 595 chaves = i3GEO.util.listaChaves(i3GEO.barraDeBotoes.INCLUIBOTAO);
584 596 n = chaves.length;
585 597 for(i=0;i<n;i+=1){
586   - if(this.INCLUIBOTAO[chaves[i]] === true){
587   - temp += this.TEMPLATEBOTAO.replace("$$",chaves[i]);
  598 + if(i3GEO.barraDeBotoes.INCLUIBOTAO[chaves[i]] === true){
  599 + temp += i3GEO.barraDeBotoes.TEMPLATEBOTAO.replace("$$",chaves[i]);
588 600 }
589 601 }
590 602 if(typeof(onde) === 'undefined'){
... ... @@ -694,7 +706,7 @@ i3GEO.barraDeBotoes = {
694 706 }
695 707 YAHOO.namespace("janelaBotoes.xp");
696 708 if(i3GEO.barraDeBotoes.ORIENTACAO === "horizontal"){
697   - 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 } );
  709 + 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 } );
698 710 }
699 711 else{
700 712 if(this.AUTOALTURA === false || barraZoom === true || (elementos.length > numerobotoes))
... ... @@ -790,7 +802,7 @@ i3GEO.barraDeBotoes = {
790 802 this.BARRAS.push(YAHOO.janelaBotoes.xp.panel);
791 803 YAHOO.janelaBotoes.xp.panel.show();
792 804 if(i3GEO.Interface.TABLET === true){
793   - YAHOO.janelaBotoes.xp.panel.moveTo((i3GEO.parametros.w / 2) - 150,"");
  805 + YAHOO.janelaBotoes.xp.panel.moveTo((i3GEO.parametros.w / 2) - (i3GEO.barraDeBotoes.HORIZONTALW / 2),"");
794 806 }
795 807 //
796 808 //menu de contexto
... ...
classesjs/classe_coordenadas.js
  Diff comments   View file @0fe7bf8
... ... @@ -316,8 +316,14 @@ i3GEO.coordenadas = {
316 316 if(temp && temp.style.display === "block")
317 317 {i3GEO.coordenadas.atualizaGeo(objposicaocursor.dmsx,objposicaocursor.dmsy,"coordgeotabela");}
318 318 };
319   - if(i3GEO.eventos.MOUSEMOVE.toString().search("atualizaLocalizarGeo()") < 0)
320   - {i3GEO.eventos.MOUSEMOVE.push("atualizaLocalizarGeo()");}
  319 + if(i3GEO.Interface.TABLET === true){
  320 + if(i3GEO.eventos.MOUSECLIQUE.toString().search("atualizaLocalizarGeo()") < 0)
  321 + {i3GEO.eventos.MOUSECLIQUE.push("atualizaLocalizarGeo()");}
  322 + }
  323 + else{
  324 + if(i3GEO.eventos.MOUSEMOVE.toString().search("atualizaLocalizarGeo()") < 0)
  325 + {i3GEO.eventos.MOUSEMOVE.push("atualizaLocalizarGeo()");}
  326 + }
321 327 }
322 328 }
323 329 }
... ... @@ -661,9 +667,15 @@ i3GEO.coordenadas = {
661 667 temp = i3GEO.coordenadas.config[tipos[i]];
662 668 if(temp.ativo === true){
663 669 if(temp.tipo === "geo"){
664   - if(ativaMovimento === true){
665   - if(i3GEO.eventos.MOUSEMOVE.toString().search("atualizaLocalizarGeo('"+onde+tipos[i]+"')") < 0)
666   - {i3GEO.eventos.MOUSEMOVE.push("atualizaLocalizarGeo('"+onde+tipos[i]+"')");}
  670 + if(ativaMovimento === true){
  671 + if(i3GEO.Interface.TABLET === true){
  672 + if(i3GEO.eventos.MOUSECLIQUE.toString().search("atualizaLocalizarGeo('"+onde+tipos[i]+"')") < 0)
  673 + {i3GEO.eventos.MOUSECLIQUE.push("atualizaLocalizarGeo('"+onde+tipos[i]+"')");}
  674 + }
  675 + else{
  676 + if(i3GEO.eventos.MOUSEMOVE.toString().search("atualizaLocalizarGeo('"+onde+tipos[i]+"')") < 0)
  677 + {i3GEO.eventos.MOUSEMOVE.push("atualizaLocalizarGeo('"+onde+tipos[i]+"')");}
  678 + }
667 679 }
668 680 if(typeof(x) !== 'undefined'){
669 681 atualizaLocalizarGeo(onde+tipos[i],i3GEO.calculo.dd2dms(x)[0],i3GEO.calculo.dd2dms(y)[0]);
... ... @@ -671,8 +683,14 @@ i3GEO.coordenadas = {
671 683 }
672 684 else{
673 685 if(ativaMovimento === true){
674   - if(i3GEO.eventos.MOUSEMOVE.toString().search("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')") < 0)
675   - {i3GEO.eventos.MOUSEMOVE.push("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')");}
  686 + if(i3GEO.Interface.TABLET === true){
  687 + if(i3GEO.eventos.MOUSECLIQUE.toString().search("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')") < 0)
  688 + {i3GEO.eventos.MOUSECLIQUE.push("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')");}
  689 + }
  690 + else{
  691 + if(i3GEO.eventos.MOUSEMOVE.toString().search("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')") < 0)
  692 + {i3GEO.eventos.MOUSEMOVE.push("i3GEO.coordenadas.atualizaProj4('"+onde+"','"+tipos[i]+"')");}
  693 + }
676 694 }
677 695 if(typeof(x) !== 'undefined'){
678 696 i3GEO.coordenadas.atualizaProj4(onde,tipos[i],x,y);
... ... @@ -681,8 +699,14 @@ i3GEO.coordenadas = {
681 699 }
682 700 }
683 701 if(ativaMovimento === true){
684   - if(i3GEO.eventos.MOUSEMOVE.toString().search("i3GEO.coordenadas.limpaModoTexto()") < 0)
685   - {i3GEO.eventos.MOUSEMOVE.push("i3GEO.coordenadas.limpaModoTexto()");}
  702 + if(i3GEO.Interface.TABLET === true){
  703 + if(i3GEO.eventos.MOUSECLIQUE.toString().search("i3GEO.coordenadas.limpaModoTexto()") < 0)
  704 + {i3GEO.eventos.MOUSECLIQUE.push("i3GEO.coordenadas.limpaModoTexto()");}
  705 + }
  706 + else{
  707 + if(i3GEO.eventos.MOUSEMOVE.toString().search("i3GEO.coordenadas.limpaModoTexto()") < 0)
  708 + {i3GEO.eventos.MOUSEMOVE.push("i3GEO.coordenadas.limpaModoTexto()");}
  709 + }
686 710 }
687 711 if(i3GEO.coordenadas.formato === "bloco")
688 712 {i3GEO.coordenadas.ativaBloco(onde);}
... ...
classesjs/classe_guias.js
  Diff comments   View file @0fe7bf8
... ... @@ -293,9 +293,6 @@ i3GEO.guias = {
293 293 //
294 294 if(i3GEO.guias.TIPO === "guia" || i3GEO.guias.TIPO === "tablet"){
295 295 ins = '<ul class="yui-nav" style="border-width:0pt 0pt 0px;border-color:rgb(240,240,240);border-bottom-color:white;text-align:center;">';
296   - if(i3GEO.guias.TIPO === "tablet"){
297   - ins += '<li><a alt="" title=""><em><div id="i3GEOguiaEsconde" onclick=i3GEO.guias.escondeGuias(); >x</div></em></a></li>';
298   - }
299 296 for(ng=0;ng<nguias;ng++){
300 297 if($i(i3GEO.guias.CONFIGURA[guias[ng]].id)){
301 298 if($i(i3GEO.guias.CONFIGURA[guias[ng]].idconteudo))
... ... @@ -400,12 +397,6 @@ i3GEO.guias = {
400 397 if(i3GEO.guias.TIPO !== "tablet"){
401 398 i3GEO.guias.mostra(i3GEO.guias.ATUAL);
402 399 i3GEO.guias.ativa(i3GEO.guias.ATUAL);
403   - temp = $i("i3GEOguiaEsconde");
404   - YAHOO.util.Event.addListener(temp, "click", YAHOO.util.Event.preventDefault);
405   - YAHOO.util.Event.addListener(temp, "click", YAHOO.util.Event.stopPropagation);
406   - YAHOO.util.Event.addFocusListener(temp, YAHOO.util.Event.preventDefault);
407   - temp.onmouseover = onf;
408   - temp.onmouseout = outf;
409 400 }
410 401 else
411 402 {i3GEO.guias.escondeGuias();}
... ... @@ -441,14 +432,6 @@ i3GEO.guias = {
441 432 var guias,nguias,g,temp,attributes,anim;
442 433 guias = i3GEO.util.listaChaves(i3GEO.guias.CONFIGURA);
443 434 nguias = guias.length;
444   - temp = $i("i3GEOguiaEsconde");
445   - if(temp){
446   - if(!navm){
447   - temp.style.height = "0px";
448   - temp.style.visibility = "hidden";
449   - }
450   - temp.parentNode.parentNode.style.background="transparent";
451   - }
452 435 for(g=0;g<nguias;g++){
453 436 temp = $i(this.CONFIGURA[guias[g]].idconteudo);
454 437 if(temp){
... ... @@ -486,6 +469,13 @@ i3GEO.guias = {
486 469 var guias,nguias,g,temp,temp1,attributes,anim;
487 470 guias = i3GEO.util.listaChaves(i3GEO.guias.CONFIGURA);
488 471 nguias = guias.length;
  472 + //
  473 + //se a guia clicada já estiver aberta na interface com TABLET
  474 + //
  475 + if($i(this.CONFIGURA[guia].idconteudo).style.display === "block" && i3GEO.guias.TIPO === "tablet"){
  476 + i3GEO.guias.escondeGuias();
  477 + return;
  478 + }
489 479 for(g=0;g<nguias;g++){
490 480 if($i(this.CONFIGURA[guias[g]].idconteudo))
491 481 {$i(this.CONFIGURA[guias[g]].idconteudo).style.display="none";}
... ... @@ -511,12 +501,6 @@ i3GEO.guias = {
511 501 temp.style.display = "block";
512 502 temp.style.zIndex = 9000;
513 503 temp.style.overflow = "hidden";
514   - temp1 = $i("i3GEOguiaEsconde");
515   - if(!navm){
516   - temp1.style.height = "15px";
517   - temp1.style.visibility = "visible";
518   - }
519   - temp1.parentNode.parentNode.style.background="transparent";
520 504 attributes = {
521 505 height: { to: i3GEO.parametros.h - 10 }
522 506 };
... ...
classesjs/classe_interface.js
  Diff comments   View file @0fe7bf8
... ... @@ -719,9 +719,6 @@ i3GEO.Interface = {
719 719 f.style.height = h;
720 720 }
721 721 i3GEO.Interface.IDMAPA = "openlayers";
722   - bb.INCLUIBOTAO.zoomli = true;
723   - bb.INCLUIBOTAO.pan = true;
724   - bb.INCLUIBOTAO.zoomtot = true;
725 722 if(i3GEO.Interface.TABLET === true){
726 723 i3geoOL = new OpenLayers.Map({
727 724 div: "openlayers",
... ... @@ -739,6 +736,9 @@ i3GEO.Interface = {
739 736 });
740 737 }
741 738 else{
  739 + bb.INCLUIBOTAO.zoomli = true;
  740 + bb.INCLUIBOTAO.pan = true;
  741 + bb.INCLUIBOTAO.zoomtot = true;
742 742 i3geoOL = new OpenLayers.Map('openlayers', {
743 743 controls: [],
744 744 fractionalZoom: true,
... ...
interface/openlayers.htm
  Diff comments   View file @0fe7bf8
... ... @@ -145,7 +145,7 @@
145 145 </td>
146 146 </tr>
147 147 </table>
148   -<script src="../classesjs/i3geonaocompacto.js"></script>
  148 +<script src="../classesjs/i3geo.js"></script>
149 149 <script src="../pacotes/openlayers/OpenLayers29.js.php"></script>
150 150 <script>
151 151 /*
... ...
interface/openlayers_t.htm
  Diff comments   View file @0fe7bf8
... ... @@ -150,27 +150,29 @@ i3GEO.Interface.openlayers.GADGETS = {
150 150 i3GEO.Interface.openlayers.TILES = true;
151 151  
152 152 i3GEO.barraDeBotoes.INCLUIBOTAO = {
153   - zoomli: true,
  153 + zoomiauto: true,
  154 + zoomoauto: true,
  155 + zoomli: false,
154 156 pan: true,
155   - zoomtot:false,
  157 + zoomtot:true,
156 158 identifica: true,
157   - identificaBalao: true,
  159 + identificaBalao: false,
158 160 mede: true,
159 161 area: true,
160 162 imprimir: true,
161 163 reinicia: false,
162   - exten: true,
  164 + exten: false,
163 165 referencia: true,
164   - inserexy: true,
165   - textofid: true,
  166 + inserexy: false,
  167 + textofid: false,
166 168 selecao: true,
167 169 google: true,
168   - buscafotos: true,
  170 + buscafotos: false,
169 171 wiki: false,
170 172 metar: false,
171 173 lentei: false,
172 174 confluence: false,
173   - inseregrafico: true,
  175 + inseregrafico: false,
174 176 v3d: false
175 177 };
176 178 i3GEO.Interface.TABLET = true;
... ... @@ -196,6 +198,7 @@ i3GEO.Interface.BARRABOTOESLEFT = 5;
196 198 i3GEO.Interface.BARRABOTOESTOP = 0;
197 199 i3GEO.Interface.BARRADEZOOMTOP = 2;
198 200 i3GEO.Interface.BARRADEZOOMLEFT = 5;
  201 +i3GEO.barraDeBotoes.HORIZONTALW = 360;
199 202 i3GEO.Interface.ATIVAMENUCONTEXTO = false;
200 203  
201 204 i3GEO.arvoreDeTemas.TIPOBOTAO = "radio";
... ...