Download as
Browse Code »

Commit f587489b9c4c5b07d143af40b1ecca60285cd067

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

--no commit message

Showing 5 changed files with 13 additions and 1 deletions   Show diff stats
ferramentas/editorol/editorol.js
  Diff comments   View file @f587489
... ... @@ -1106,12 +1106,14 @@ i3GEO.editorOL =
1106 1106 temp.className = "editorOLlinhaItemInactive olButton";
1107 1107 temp.title = $trad("dlinha");
1108 1108 temp.onclick = function(){
  1109 + i3GEO.eventos.cliquePerm.desativa();
1109 1110 i3GEO.editorOL.marcaBotao("editorOLlinha");
1110 1111 var draw = new ol.interaction.Draw({
1111 1112 type : "LineString"
1112 1113 });
1113 1114 //adiciona a interacao para poder ser removida
1114 1115 i3GEO.editorOL.interacoes.push(draw);
  1116 + //desativa ol.interaction.DoubleClickZoom
1115 1117 i3GEO.Interface.openlayers.interacoes[0].setActive(false);
1116 1118 draw.on("drawend", function(evt) {
1117 1119 evt.feature.setStyle(
... ... @@ -1138,10 +1140,12 @@ i3GEO.editorOL =
1138 1140 }
1139 1141 //TODO falta definir imagem
1140 1142 if (botoes.ponto === true) {
  1143 + i3GEO.eventos.cliquePerm.desativa();
1141 1144 temp = document.createElement("div");
1142 1145 temp.className = "editorOLpontoItemInactive olButton";
1143 1146 temp.title = $trad("dponto");
1144 1147 temp.onclick = function(){
  1148 + i3GEO.eventos.cliquePerm.desativa();
1145 1149 i3GEO.editorOL.marcaBotao("editorOLponto");
1146 1150 var draw = new ol.interaction.Draw({
1147 1151 type : "Point"
... ... @@ -1176,6 +1180,7 @@ i3GEO.editorOL =
1176 1180 i3GEOpanelEditor.appendChild(temp);
1177 1181 }
1178 1182 if (botoes.poligono === true) {
  1183 + i3GEO.eventos.cliquePerm.desativa();
1179 1184 temp = document.createElement("div");
1180 1185 temp.className = "editorOLpoligonoItemInactive olButton";
1181 1186 temp.title = $trad("dpoligono");
... ...
ferramentas/identifica/index.js
  Diff comments   View file @f587489
... ... @@ -434,7 +434,7 @@ i3GEOF.identifica =
434 434 */
435 435 ativaFoco : function(id) {
436 436 i3GEOF.identifica.listaTemas("ligados");
437   - i3GEO.util.mudaCursor(i3GEO.configura.cursores, temp, i3GEO.Interface.IDMAPA, i3GEO.configura.locaplic);
  437 + i3GEO.util.mudaCursor(i3GEO.configura.cursores, "identifica", i3GEO.Interface.IDMAPA, i3GEO.configura.locaplic);
438 438 // i3GEOF.identifica.mostraImagemPonto(id);
439 439 },
440 440 mostraImagemPonto : function(id) {
... ...
js/analise.js
  Diff comments   View file @f587489
... ... @@ -713,6 +713,7 @@ i3GEO.analise =
713 713 * atributo "origem" Os raios e pontos sao sempre removidos
714 714 */
715 715 fechaJanela : function() {
  716 + i3GEO.Interface.openlayers.interacoes[0].setActive(false);
716 717 var m = i3GEO.analise.medeDistancia.openlayers;
717 718 ol.Observable.unByKey(m.featureListener);
718 719 m.featureListener = null;
... ... @@ -1300,6 +1301,7 @@ i3GEO.analise =
1300 1301 * atributo "origem" Os raios e pontos sao sempre removidos
1301 1302 */
1302 1303 fechaJanela : function() {
  1304 + i3GEO.Interface.openlayers.interacoes[0].setActive(true);
1303 1305 var m = i3GEO.analise.medeArea.openlayers;
1304 1306 ol.Observable.unByKey(m.featureListener);
1305 1307 m.featureListener = null;
... ...
js/configura.js
  Diff comments   View file @f587489
... ... @@ -1382,6 +1382,7 @@ i3GEO.configura =
1382 1382 i3GEO.util.mudaCursor(i3GEO.configura.cursores, temp, i3GEO.Interface.IDMAPA, i3GEO.configura.locaplic);
1383 1383 }
1384 1384 i3GEO.barraDeBotoes.ativaIcone("identifica");
  1385 + i3GEO.eventos.cliquePerm.desativa();
1385 1386 if (i3GEO.eventos.cliquePerm.ativo === false) {
1386 1387 // caso seja um clique para desativar
1387 1388 if (i3GEO.eventos.MOUSECLIQUE.toString().search(i3GEO.configura.funcaoIdentifica) >= 0) {
... ... @@ -1428,6 +1429,7 @@ i3GEO.configura =
1428 1429 i3GEO.eventos.removeEventos("MOUSECLIQUEPERM",[i3GEO.configura.funcaoIdentifica]);
1429 1430 i3GEO.eventos.adicionaEventos("MOUSECLIQUEPERM",[i3GEO.configura.funcaoTip]);
1430 1431 }
  1432 + i3GEO.eventos.cliquePerm.ativa();
1431 1433 }
1432 1434 },
1433 1435 {
... ...
js/interface.js
  Diff comments   View file @f587489
... ... @@ -751,6 +751,9 @@ i3GEO.Interface =
751 751 if (p.classeCadeado === "i3GEOiconeAberto") {
752 752 removeBaloes();
753 753 }
  754 + if (i3GEO.eventos.cliquePerm.ativo === false) {
  755 + return;
  756 + }
754 757 painel = document.createElement("div");
755 758 painel.style.minWidth = p.minWidth;
756 759 painel.className = "ol-popup";
... ...