Download as
Browse Code »

Commit ea0fb811f1ea4482f643e1ba6d5dd4e5bca21a6e

Authored by Edmar Moretti
1 parent f8b38c6f
Exists in master

Conclusão da reformulação do código da ferramenta de edição de classes e simbologia de uma camada

Showing 7 changed files with 281 additions and 584 deletions   Show diff stats
classesphp/classe_alteraclasse.php
  Diff comments   View file @ea0fb81
... ... @@ -831,7 +831,7 @@ class Alteraclasse
831 831 $classe = $this->layer->getclass(0);
832 832 $c = ms_newClassObj($this->layer, $classe);
833 833 $this->layer->setMetaData("cache", "");
834   - return ("ok");
  834 + return true;
835 835 }
836 836  
837 837 /*
... ...
css/default.css
  Diff comments   View file @ea0fb81
... ... @@ -459,11 +459,16 @@ Botoes material
459 459 height: 40px;
460 460 min-width: 40px;
461 461 width: 40px;
  462 + line-height: 1.5;
462 463 }
463   -
  464 +button>.material-icons {
  465 + vertical-align: text-top;
  466 +}
  467 +/*
464 468 .btn.btn-fab.btn-fab-max>span {
465 469 height: 15px;
466 470 }
  471 +*/
467 472  
468 473 .form-group .form-control {
469 474 font-size: 1.5rem;
... ...
ferramentas/legenda/execclasses.php
  Diff comments   View file @ea0fb81
... ... @@ -59,16 +59,16 @@ switch (strtoupper($_GET["funcao"])) {
59 59 $retorno = $m->valorunico($_POST["item"], $_POST["ignorar"], $_POST["itemNome"]);
60 60 $m->salva();
61 61 break;
62   - case "NCLASSES":
63   - $retorno = $m->intervalosiguais($_POST["item"], $_POST["nclasses"], $_POST["ignorar"]);
64   - $m->salva();
65   - break;
66   - case "QUEBRASNATURAIS":
67   - $retorno = $m->quebrasnaturais($_POST["item"], $_POST["nclasses"], $_POST["ignorar"]);
68   - $m->salva();
69   - break;
70   - case "QUANTIL":
71   - $retorno = $m->quantil($_POST["item"], $_POST["nclasses"], $_POST["ignorar"]);
  62 + case "TIPOCLASSES":
  63 + if($_POST["tipoCalculo"] == "nclasses"){
  64 + $retorno = $m->intervalosiguais($_POST["item"], $_POST["nclasses"], $_POST["ignorar"]);
  65 + }
  66 + if($_POST["tipoCalculo"] == "quebrasnaturais"){
  67 + $retorno = $m->quebrasnaturais($_POST["item"], $_POST["nclasses"], $_POST["ignorar"]);
  68 + }
  69 + if($_POST["tipoCalculo"] == "quantil"){
  70 + $retorno = $m->quantil($_POST["item"], $_POST["nclasses"], $_POST["ignorar"]);
  71 + }
72 72 $m->salva();
73 73 break;
74 74 case "METADE":
... ...
ferramentas/legenda/index.js
  Diff comments   View file @ea0fb81
... ... @@ -4,8 +4,6 @@ if (typeof (i3GEOF) === 'undefined') {
4 4 i3GEOF.legenda =
5 5 {
6 6 parDefault : {position: "MS_UR", partials: 1, offsetx: 0, offsety: 0, minfeaturesize: "auto", mindistance: "auto", force: 0, shadowsizex: 1, shadowsizey: 1, cor: "0 0 0", sombray: 1, sombrax: 1, angulo: 0, tamanho: 8, fonte: "bitmap", fundo: "off", sombra: "off", outlinecolor: "off", shadowcolor: "off", wrap: "" },
7   - aguarde : "",
8   - templateDir : "../ferramentas/legenda",
9 7 aposIniciar : function(){
10 8  
11 9 },
... ... @@ -18,7 +16,6 @@ i3GEOF.legenda =
18 16 "idContainer": "i3GEOlegendaContainer",
19 17 "namespace": "legenda",
20 18 "objdicionario": {},
21   - "aviso": false,
22 19 "dadosGrafico": "",
23 20 "estilos": "",
24 21 "estilo": 0,
... ... @@ -132,7 +129,6 @@ i3GEOF.legenda =
132 129 + "&g_sid="
133 130 + i3GEO.configura.sid);
134 131 },
135   -
136 132 janelaCorRamp: function(){
137 133 i3GEO.util.abreColourRamp("", "listaColourRamp", i3GEO.arvoreDeCamadas.CAMADASINDEXADAS[i3GEOF.legenda._parameters.tema].numclasses, i3GEOF.legenda._parameters.tema);
138 134 },
... ... @@ -150,36 +146,13 @@ i3GEOF.legenda =
150 146 var p = this._parameters,
151 147 i3f = this,
152 148 par = {
153   - g_sid: i3GEO.configura.sid,
154   - funcao: "editalegenda",
155   - opcao: "edita",
156   - tema: p.tema
  149 + funcao: "editalegenda"
157 150 };
158   - i3GEO.janela.abreAguarde();
159   - i3GEO.janela._formModal.block();
160   - $.post(
161   - i3GEO.configura.locaplic+"/ferramentas/" + i3f._parameters.namespace + "/execlegenda.php",
162   - par
163   - )
164   - .done(
165   - function(data, status){
166   - i3GEO.janela._formModal.unblock();
167   - i3GEO.janela.fechaAguarde();
168   - i3GEOF.legenda.montaLegenda(data);
169   - }
170   - )
171   - .fail(
172   - function(data){
173   - i3GEO.janela._formModal.unblock();
174   - i3GEO.janela.fechaAguarde();
175   - i3GEO.janela.snackBar({content: data.statusText, style:'red'});
176   - }
177   - );
  151 + i3f.post({snackbar: false, fn: i3f.montaLegenda, btn: false, par: par, refresh: false, prog: "execlegenda"});
178 152 },
179 153 montaLegenda : function(data) {
180   - var p = this._parameters,
181   - i3f = this;
182   - i3f._parameters.aviso = false;
  154 + var p = i3GEOF.legenda._parameters,
  155 + i3f = i3GEOF.legenda;
183 156 $i("i3GEOlegendaguia1objLegenda").innerHTML = "";
184 157 if (data != undefined) {
185 158 //hidden e utilizado para esconder ou mostrar determinados trechos do template
... ... @@ -257,7 +230,7 @@ i3GEOF.legenda =
257 230 i3GEO.janela.snackBar({content: "erro", style:'red'});
258 231 }
259 232 },
260   - post: function({btn = false, par = {}, refresh = false, prog = "exec", fn = false} = {}){
  233 + post: function({snackbar = true, btn = false, par = {}, refresh = false, prog = "exec", fn = false} = {}){
261 234 var p = this._parameters,
262 235 i3f = this;
263 236 i3GEO.janela.abreAguarde();
... ... @@ -266,6 +239,18 @@ i3GEOF.legenda =
266 239 btn.prop("disabled",true).find("span .glyphicon").removeClass("hidden");
267 240 }
268 241 i3GEO.janela._formModal.block();
  242 + par.g_sid = i3GEO.configura.sid;
  243 + par.tema = p.tema;
  244 + if(!par.ext){
  245 + par.ext = $i("i3GEOFlegendaaplicaextent").checked ? i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten) : i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal);
  246 + }
  247 + if(!par.ignorar){
  248 + par.ignorar = $i("i3GEOlegendaignorar").value;
  249 + }
  250 + //esess parametros sao enviados pela funcao run e nao sao necessarios
  251 + //por isso sao removidos aqui
  252 + delete par["prog"];
  253 + delete par["refresh"];
269 254 $.post(
270 255 i3GEO.configura.locaplic+"/ferramentas/" + i3f._parameters.namespace + "/" + prog + ".php",
271 256 par
... ... @@ -277,7 +262,9 @@ i3GEOF.legenda =
277 262 if(btn){
278 263 btn.prop("disabled",false).find("span .glyphicon").addClass("hidden");
279 264 }
280   - i3GEO.janela.snackBar({content: $trad('feito')});
  265 + if(snackbar){
  266 + i3GEO.janela.snackBar({content: $trad('feito')});
  267 + }
281 268 if(refresh){
282 269 i3GEOF.legenda.aposAlterarLegenda();
283 270 i3GEOF.legenda.mostralegenda();
... ... @@ -298,60 +285,20 @@ i3GEOF.legenda =
298 285 }
299 286 );
300 287 },
301   - adicionaConta : function(btn) {
302   - var p = this._parameters,
303   - i3f = this,
304   - par = {
305   - funcao: "contagemclasse",
306   - g_sid: i3GEO.configura.sid,
307   - tema: p.tema
308   - };
309   - i3f.post({btn: btn, par: par, refresh: false, prog: "exectemas"});
310   - },
311   - adicionaOpacidade : function(btn) {
  288 + run: function(btn){
312 289 var p = this._parameters,
313 290 i3f = this,
314   - par = {
315   - funcao: "adicionaOpacidade",
316   - g_sid: i3GEO.configura.sid,
317   - tema: p.tema,
318   - ext: i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten)
319   - };
320   - i3f.post({btn: btn, par: par, refresh: true, prog: "execclasses"});
321   - },
322   - aplicaLegendaImg : function(btn) {
323   - var p = this._parameters,
324   - i3f = this,
325   - par = {
326   - funcao: "aplicaLegendaImg",
327   - g_sid: i3GEO.configura.sid,
328   - tema: p.tema,
329   - imagem: $i("i3GEOlegendaImg").value
330   - };
331   - i3f.post({btn: btn, par: par, refresh: true, prog: "execlegenda"});
332   - },
333   - aplicarOffsite : function(btn) {
334   - var p = this._parameters,
335   - i3f = this,
336   - par = {
337   - funcao: "aplicaOffsite",
338   - g_sid: i3GEO.configura.sid,
339   - tema: p.tema,
340   - offsite: $i("i3GEOoffsite").value
341   - };
342   - i3f.post({btn: btn, par: par, refresh: true, prog: "exectemas"});
343   - },
344   - paleta : function(btn) {
345   - var p = this._parameters,
346   - i3f = this,
347   - par = {
348   - funcao: "alteraCoresClasses",
349   - g_sid: i3GEO.configura.sid,
350   - tema: p.tema,
351   - cori: $i("i3GEOlegendaacori").value,
352   - corf: $i("i3GEOlegendaacorf").value
353   - };
354   - i3f.post({btn: btn, par: par, refresh: true, prog: "execclasses"});
  291 + options = $.extend(
  292 + {},
  293 + $(btn).data(),
  294 + i3GEO.util.getFormData(btn)
  295 + );
  296 + i3f.post({
  297 + btn: btn,
  298 + par: options,
  299 + refresh: options.refresh,
  300 + prog: options.prog
  301 + });
355 302 },
356 303 getLegendParameters: function(){
357 304 var par = {},tabela = $i("i3GEOlegendalegenda"),
... ... @@ -394,8 +341,6 @@ i3GEOF.legenda =
394 341 exps: exps.join("|"),
395 342 minScales: minScales.join(";"),
396 343 maxScales: maxScales.join("|"),
397   - g_sid: i3GEO.configura.sid,
398   - ext: i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten),
399 344 separador: "|"
400 345 };
401 346 return par;
... ... @@ -408,47 +353,15 @@ i3GEOF.legenda =
408 353 par.tema = p.tema;
409 354 i3f.post({btn: btn, par: par, refresh: true, prog: "execclasses"});
410 355 },
411   - adicionaClasse : function(btn) {
412   - var p = this._parameters,
413   - i3f = this,
414   - par = {
415   - funcao: "adicionaclasse",
416   - tema: p.tema,
417   - g_sid: i3GEO.configura.sid
418   - };
419   - i3f.post({btn: btn, par: par, refresh: true, prog: "execclasses"});
420   - },
421   - inverteCores : function() {
422   - var p = this._parameters,
423   - i3f = this,
424   - par = {
425   - funcao: "inverteCoresClasses",
426   - tema: p.tema,
427   - g_sid: i3GEO.configura.sid
428   - };
429   - i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
430   - },
431 356 calculaTamanho : function() {
432 357 var p = this._parameters,
433 358 i3f = this,
434 359 par = {
435 360 funcao: "calculaTamanhoClasses",
436   - tema: p.tema,
437   - g_sid: i3GEO.configura.sid,
438 361 size: $i("i3GEOlegendaAutoSize").value
439 362 };
440 363 i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
441 364 },
442   - ordenaClasses : function() {
443   - var p = this._parameters,
444   - i3f = this,
445   - par = {
446   - funcao: "ordenaClasses",
447   - tema: p.tema,
448   - g_sid: i3GEO.configura.sid
449   - };
450   - i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
451   - },
452 365 excluilinhaf : function(id) {
453 366 var p = $i(id);
454 367 do {
... ... @@ -493,8 +406,6 @@ i3GEOF.legenda =
493 406 i3f = this,
494 407 par = {
495 408 funcao: "sobeclasse",
496   - tema: p.tema,
497   - g_sid: i3GEO.configura.sid,
498 409 idclasse: idclasse
499 410 };
500 411 i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
... ... @@ -504,8 +415,6 @@ i3GEOF.legenda =
504 415 i3f = this,
505 416 par = {
506 417 funcao: "desceclasse",
507   - tema: p.tema,
508   - g_sid: i3GEO.configura.sid,
509 418 idclasse: idclasse
510 419 };
511 420 i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
... ... @@ -515,8 +424,6 @@ i3GEOF.legenda =
515 424 i3f = this,
516 425 par = {
517 426 funcao: "aplicaProcessos",
518   - tema: p.tema,
519   - g_sid: i3GEO.configura.sid,
520 427 idclasse: idclasse
521 428 },
522 429 lista = [], ipt, i;
... ... @@ -534,247 +441,25 @@ i3GEOF.legenda =
534 441 corj : function(obj) {
535 442 i3GEO.util.abreCor("", obj);
536 443 },
  444 + //utiliza um input do tipo hidden como listener
537 445 aplicaColourRamp : function() {
538 446 if ($i("listaColourRamp").value != "") {
539 447 var p = this._parameters,
540 448 i3f = this,
541 449 par = {
542 450 funcao: "aplicacoresrgb",
543   - tema: p.tema,
544   - g_sid: i3GEO.configura.sid,
545   - cores: $i("listaColourRamp").value,
546   - ext: i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten)
  451 + cores: $i("listaColourRamp").value
547 452 };
548 453 i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
549 454 }
550 455 },
551   - aviso : function() {
552   - if (i3GEOF.legenda._parameters.aviso == true) {
553   - i3GEO.janela.snackBar({content: $trad("msgAplicaAlteracao",i3GEOF.legenda.dicionario),style: "red"});
554   - i3GEOF.legenda._parameters.aviso == false;
555   - }
556   - },
557   - /*
558   - * Function: simbolounico
559   - *
560   - * Altera a leganda do tema para o tipo símbolo único
561   - *
562   - */
563   - simbolounico : function() {
564   - var p = this._parameters,
565   - i3f = this,
566   - par = {
567   - funcao: "simbolounico",
568   - tema: p.tema,
569   - g_sid: i3GEO.configura.sid
570   - };
571   - i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
572   - },
573   - /*
574   - * Function: valorunico
575   - *
576   - * Altera a leganda do tema para o tipo valor único
577   - *
578   - */
579   - valorunico : function() {
580   - var p = this._parameters,
581   - i3f = this,
582   - par = {
583   - funcao: "valorunico",
584   - tema: p.tema,
585   - g_sid: i3GEO.configura.sid,
586   - ignorar: $i("i3GEOlegendaignorar").value,
587   - item: $i("i3GEOlegendaitensValorUnico").getElementsByTagName("select")[0].value,
588   - itemNome: $i("i3GEOlegendaClassesValorUnico").getElementsByTagName("select")[0].value,
589   - ext: $i("i3GEOFlegendaaplicaextent").checked ? i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten) : i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal)
590   - };
591   - i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
592   - },
593   - /*
594   - * Function: nclasses
595   - *
596   - * Altera a legenda do tema com um número específico de classes
597   - *
598   - */
599   - nclasses : function(btn) {
600   - var p = this._parameters,
601   - i3f = this,
602   - par = {
603   - funcao: "nclasses",
604   - tema: p.tema,
605   - g_sid: i3GEO.configura.sid,
606   - ignorar: $i("i3GEOlegendaignorar").value,
607   - item: $i("i3GEOlegendaitensValorClass").getElementsByTagName("select")[0].value,
608   - nclasses: $i("i3GEOlegendanclasses").value,
609   - ext: $i("i3GEOFlegendaaplicaextent").checked ? i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten) : i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal)
610   - };
611   - if(par.item == ""){
612   - i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
613   - } else {
614   - i3f.post({btn: true, par: par, refresh: true, prog: "execclasses"});
615   - }
616   - },
617   - /*
618   - * Function: quebrasnaturais
619   - *
620   - * Altera a legenda do tema por meio do calculo de quebras naturais
621   - *
622   - */
623   - quebrasnaturais : function() {
624   - var p = this._parameters,
625   - i3f = this,
626   - par = {
627   - funcao: "quebrasnaturais",
628   - tema: p.tema,
629   - g_sid: i3GEO.configura.sid,
630   - ignorar: $i("i3GEOlegendaignorar").value,
631   - item: $i("i3GEOlegendaitensValorClass").getElementsByTagName("select")[0].value,
632   - nclasses: $i("i3GEOlegendanclasses").value,
633   - ext: $i("i3GEOFlegendaaplicaextent").checked ? i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten) : i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal)
634   - };
635   - if(par.item == ""){
636   - i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
637   - } else {
638   - i3f.post({btn: true, par: par, refresh: true, prog: "execclasses"});
639   - }
640   - },
641   - /*
642   - * Function: quantis
643   - *
644   - * Altera a leganda do tema por meio do calculo de quantis
645   - *
646   - */
647   - quantil : function() {
648   - var p = this._parameters,
649   - i3f = this,
650   - par = {
651   - funcao: "quantil",
652   - tema: p.tema,
653   - g_sid: i3GEO.configura.sid,
654   - ignorar: $i("i3GEOlegendaignorar").value,
655   - item: $i("i3GEOlegendaitensValorClass").getElementsByTagName("select")[0].value,
656   - nclasses: $i("i3GEOlegendanclasses").value,
657   - ext: $i("i3GEOFlegendaaplicaextent").checked ? i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten) : i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal)
658   - };
659   - if(par.item == ""){
660   - i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
661   - } else {
662   - i3f.post({btn: true, par: par, refresh: true, prog: "execclasses"});
663   - }
664   - },
665   - /*
666   - * Function: metade
667   - *
668   - * Duas classes concentrando a soma das metades
669   - */
670   - metade : function() {
671   - var p = this._parameters,
672   - i3f = this,
673   - par = {
674   - funcao: "metade",
675   - tema: p.tema,
676   - g_sid: i3GEO.configura.sid,
677   - ignorar: $i("i3GEOlegendaignorar").value,
678   - item: $i("i3GEOlegendaitensMetade").getElementsByTagName("select")[0].value,
679   - itemid: $i("i3GEOlegendaitensMetadeId").getElementsByTagName("select")[0].value,
680   - ext: $i("i3GEOFlegendaaplicaextent").checked ? i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten) : i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal)
681   - };
682   - if(par.item == "" || par.itemid == ""){
683   - i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
684   - } else {
685   - i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
686   - }
687   - },
688   - /*
689   - * Function: media
690   - *
691   - * Duas classes considerando a media
692   - */
693   - media : function() {
694   - var p = this._parameters,
695   - i3f = this,
696   - par = {
697   - funcao: "media",
698   - tema: p.tema,
699   - g_sid: i3GEO.configura.sid,
700   - ignorar: $i("i3GEOlegendaignorar").value,
701   - item: $i("i3GEOlegendaitensMedia").getElementsByTagName("select")[0].value,
702   - ext: $i("i3GEOFlegendaaplicaextent").checked ? i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten) : i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal)
703   - };
704   - if(par.item == ""){
705   - i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
706   - } else {
707   - i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
708   - }
709   - },
710   - /*
711   - * Function: quartil
712   - *
713   - * Altera a leganda do tema claculando as classes pelo método quartil
714   - */
715   - quartil : function() {
716   - var p = this._parameters,
717   - i3f = this,
718   - par = {
719   - funcao: "quartil",
720   - tema: p.tema,
721   - g_sid: i3GEO.configura.sid,
722   - tipoLegenda: $i("estiloClassesQuartis").value,
723   - ignorar: $i("i3GEOlegendaignorar").value,
724   - item: $i("i3GEOlegendaitensValorQuartil").getElementsByTagName("select")[0].value,
725   - ext: $i("i3GEOFlegendaaplicaextent").checked ? i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten) : i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal)
726   - };
727   - if(par.item == ""){
728   - i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
729   - } else {
730   - i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
731   - }
732   - },
733   - alteraGeometria : function() {
734   - var p = this._parameters,
735   - i3f = this,
736   - par = {
737   - funcao: "alteraGeometria",
738   - tema: p.tema,
739   - g_sid: i3GEO.configura.sid,
740   - tipo: $i("i3GEOlegentaTipoGeo").value
741   - };
742   - if(par.item == ""){
743   - i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
744   - } else {
745   - i3f.post({btn: false, par: par, refresh: true, prog: "execclasses"});
746   - }
747   - },
748   - /*
749   - * Function: representacao
750   - *
751   - * Altera o tipo de representação do tema (linear ou poligonoal)
752   - *
753   - */
754   - representacao : function() {
755   - var p = this._parameters,
756   - i3f = this,
757   - par = {
758   - funcao: "alterarepresentacao",
759   - tema: p.tema,
760   - g_sid: i3GEO.configura.sid
761   - };
762   - if(par.item == ""){
763   - i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
764   - } else {
765   - i3f.post({btn: false, par: par, refresh: true, prog: "exectemas"});
766   - }
767   - },
768 456 aplicaTodasClasses : function(parametro, id) {
769 457 var p = this._parameters,
770 458 i3f = this,
771 459 par = {
772 460 funcao: "aplicaTodasClasses",
773   - tema: p.tema,
774   - g_sid: i3GEO.configura.sid,
775 461 parametro: parametro,
776 462 valor: $i(id).value
777   -
778 463 };
779 464 i3f.post({btn: false, par: par, refresh: true, prog: "execlegenda"});
780 465 },
... ... @@ -783,8 +468,6 @@ i3GEOF.legenda =
783 468 i3f = this,
784 469 par = {
785 470 funcao: "aplicaParametro",
786   - tema: p.tema,
787   - g_sid: i3GEO.configura.sid,
788 471 outlinecolor: $i("i3GEOlegendaoutlinecolor").value,
789 472 backgroundcolor: $i("i3GEOlegendabackgroundcolor").value,
790 473 color: $i("i3GEOlegendacolor").value,
... ... @@ -816,8 +499,6 @@ i3GEOF.legenda =
816 499 i3f = this,
817 500 par = {
818 501 funcao: "parametros",
819   - tema: p.tema,
820   - g_sid: i3GEO.configura.sid,
821 502 classe: id
822 503 };
823 504 i3f.post({fn: i3GEOF.legenda.montaEditor, btn: false, par: par, refresh: false, prog: "execlegenda"});
... ... @@ -857,11 +538,8 @@ i3GEOF.legenda =
857 538 i3f = this,
858 539 par = {
859 540 funcao: "desceestilo",
860   - tema: p.tema,
861   - g_sid: i3GEO.configura.sid,
862 541 classe: p.classe,
863 542 estilo: p.estilo
864   -
865 543 };
866 544 i3f.post({fn: i3f.reMontaEditor, btn: true, par: par, refresh: false, prog: "execlegenda"});
867 545 },
... ... @@ -870,11 +548,8 @@ i3GEOF.legenda =
870 548 i3f = this,
871 549 par = {
872 550 funcao: "sobeestilo",
873   - tema: p.tema,
874   - g_sid: i3GEO.configura.sid,
875 551 classe: p.classe,
876 552 estilo: p.estilo
877   -
878 553 };
879 554 i3f.post({fn: i3f.reMontaEditor, btn: true, par: par, refresh: false, prog: "execlegenda"});
880 555 },
... ... @@ -883,8 +558,6 @@ i3GEOF.legenda =
883 558 i3f = this,
884 559 par = {
885 560 funcao: "adicionaestilo",
886   - tema: p.tema,
887   - g_sid: i3GEO.configura.sid,
888 561 classe: p.classe,
889 562 estilo: p.estilo
890 563 };
... ... @@ -896,8 +569,6 @@ i3GEOF.legenda =
896 569 i3f = this,
897 570 par = {
898 571 funcao: "excluiestilo",
899   - tema: p.tema,
900   - g_sid: i3GEO.configura.sid,
901 572 classe: p.classe,
902 573 estilo: p.estilo
903 574 };
... ... @@ -921,8 +592,6 @@ i3GEOF.legenda =
921 592 i3f.parDefault = par;
922 593 }
923 594 par.funcao = "adicionaLabelClasse";
924   - par.tema = p.tema;
925   - par.g_sid = i3GEO.configura.sid;
926 595 par.classe = p.classe;
927 596 par.item = $i("i3GEOlegendaSelItemLabel").value;
928 597 i3f.post({btn: btn, par: par, refresh: true, prog: "exectemas"});
... ... @@ -932,8 +601,6 @@ i3GEOF.legenda =
932 601 i3f = this,
933 602 par = {
934 603 funcao: "removeLabelClasse",
935   - tema: p.tema,
936   - g_sid: i3GEO.configura.sid,
937 604 classe: p.classe
938 605 };
939 606 i3f.post({btn: true, par: par, refresh: true, prog: "exectemas"});
... ... @@ -986,7 +653,6 @@ i3GEOF.legenda =
986 653 i3GEO.util.aplicaAquarela("i3GEOlegendaParametrosEstilos");
987 654 i3GEOF.legenda.post({btn: false, par: {
988 655 funcao: "listaSimbolos",
989   - g_sid: i3GEO.configura.sid,
990 656 onclick: 'i3GEOF.legenda.aplicaSimbolo(this)',
991 657 tipo: tipoLayer
992 658 }, refresh: false, prog: "execlegenda", fn: i3GEOF.legenda.listaSimbolos});
... ... @@ -1038,9 +704,7 @@ i3GEOF.legenda =
1038 704 i3GEOF.legenda.post({
1039 705 btn: false,
1040 706 par: {
1041   - funcao: "contagemclasse",
1042   - g_sid: i3GEO.configura.sid,
1043   - tema: i3GEOF.legenda._parameters.tema,
  707 + funcao: "contagemclasse"
1044 708 },
1045 709 refresh: false,
1046 710 prog: "execlegenda",
... ... @@ -1060,8 +724,6 @@ i3GEOF.legenda =
1060 724 i3f = this,
1061 725 par = {
1062 726 funcao: "aplicarCluster",
1063   - tema: p.tema,
1064   - g_sid: i3GEO.configura.sid,
1065 727 maxdistance: $i("i3GEOlegendaClusterMaxdistance").value,
1066 728 buffer: $i("i3GEOlegendaClusterBuffer").value,
1067 729 filter: $i("i3GEOlegendaClusterFilter").value,
... ... @@ -1080,9 +742,7 @@ i3GEOF.legenda =
1080 742 var p = this._parameters,
1081 743 i3f = this,
1082 744 par = {
1083   - funcao: "removerCluster",
1084   - tema: p.tema,
1085   - g_sid: i3GEO.configura.sid
  745 + funcao: "removerCluster"
1086 746 };
1087 747 i3f.post({
1088 748 fn: function() {
... ... @@ -1097,32 +757,32 @@ i3GEOF.legenda =
1097 757 i3GEOF.legenda._parameters.tema,
1098 758 function(retorno) {
1099 759 if ($i("i3GEOlegendaitensValorUnico")) {
1100   - $i("i3GEOlegendaitensValorUnico").innerHTML = retorno.dados ;
  760 + $i("i3GEOlegendaitensValorUnico").innerHTML = retorno.dados.replace("replacename","item") ;
1101 761 }
1102 762 if ($i("i3GEOlegendaClassesValorUnico")) {
1103   - $i("i3GEOlegendaClassesValorUnico").innerHTML = retorno.dados;
  763 + $i("i3GEOlegendaClassesValorUnico").innerHTML = retorno.dados.replace("replacename","itemNome");
1104 764 }
1105 765 if ($i("i3GEOlegendaitensMetade")) {
1106   - $i("i3GEOlegendaitensMetade").innerHTML = retorno.dados;
  766 + $i("i3GEOlegendaitensMetade").innerHTML = retorno.dados.replace("replacename","item");
1107 767 }
1108 768 if ($i("i3GEOlegendaitensMetadeId")) {
1109   - $i("i3GEOlegendaitensMetadeId").innerHTML = retorno.dados;
  769 + $i("i3GEOlegendaitensMetadeId").innerHTML = retorno.dados.replace("replacename","itemid");
1110 770 }
1111 771 if ($i("i3GEOlegendaitensMedia")) {
1112   - $i("i3GEOlegendaitensMedia").innerHTML = retorno.dados;
  772 + $i("i3GEOlegendaitensMedia").innerHTML = retorno.dados.replace("replacename","item");
1113 773 }
1114 774 if ($i("i3GEOlegendaitensValorClass")) {
1115   - $i("i3GEOlegendaitensValorClass").innerHTML = retorno.dados;
  775 + $i("i3GEOlegendaitensValorClass").innerHTML = retorno.dados.replace("replacename","item");
1116 776 }
1117 777 if ($i("i3GEOlegendaitensCluster")) {
1118 778 $i("i3GEOlegendaitensCluster").innerHTML = retorno.dados;
1119 779 }
1120 780 if ($i("i3GEOlegendaitensValorQuartil")) {
1121   - $i("i3GEOlegendaitensValorQuartil").innerHTML = retorno.dados;
  781 + $i("i3GEOlegendaitensValorQuartil").innerHTML = retorno.dados.replace("replacename","item");
1122 782 }
1123 783 },
1124 784 "",
1125   - "",
  785 + "replacename",
1126 786 "",
1127 787 "",
1128 788 "form-control"
... ... @@ -1132,9 +792,7 @@ i3GEOF.legenda =
1132 792 var p = this._parameters,
1133 793 i3f = this,
1134 794 par = {
1135   - funcao: "parametrosauto",
1136   - tema: p.tema,
1137   - g_sid: i3GEO.configura.sid
  795 + funcao: "parametrosauto"
1138 796 };
1139 797 i3f.post({
1140 798 fn: function(data) {
... ... @@ -1154,8 +812,6 @@ i3GEOF.legenda =
1154 812 i3f = this,
1155 813 par = {
1156 814 funcao: "salvaparametrosauto",
1157   - tema: p.tema,
1158   - g_sid: i3GEO.configura.sid,
1159 815 classesitem: $i("i3GEOlegendaAutoclassesitem").value,
1160 816 classesnome: $i("i3GEOlegendaAutoclassesnome").value,
1161 817 classescor: $i("i3GEOlegendaAutoclassescor").value,
... ...
ferramentas/legenda/templateLista_mst.html
  Diff comments   View file @ea0fb81
... ... @@ -3,7 +3,7 @@
3 3 <button onclick="i3GEOF.legenda.mudaLegenda(this)" class='btn btn-primary btn-sm btn-raised'>
4 4 <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{aplicaAlteracao}}}
5 5 </button>
6   - <button onclick="i3GEOF.legenda.adicionaClasse(this)" title='{{{adicionaNovaClasse}}}' class='btn btn-primary btn-sm btn-raised'>
  6 + <button data-refresh="true" data-prog="execclasses" data-funcao="adicionaclasse" onclick="i3GEOF.legenda.run(this)" title='{{{adicionaNovaClasse}}}' class='btn btn-primary btn-sm btn-raised'>
7 7 <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{adicionaClasse}}}
8 8 </button>
9 9 <table id="i3GEOlegendalegenda" class="table-striped table-condensed">
... ... @@ -16,12 +16,12 @@
16 16 </td>
17 17 <td></td>
18 18 <td>
19   - <button title='{{{inverte}}}' onclick='i3GEOF.legenda.inverteCores()' class="btn btn-xs" style="margin: 2px; padding: 2px;">
  19 + <button data-refresh="true" data-prog="execclasses" data-funcao="inverteCoresClasses" title='{{{inverte}}}' onclick='i3GEOF.legenda.run(this)' class="btn btn-xs" style="margin: 2px; padding: 2px;">
20 20 <span class="material-icons">invert_colors</span>
21 21 </button>
22 22 </td>
23 23 <td style="background-color: yellow">
24   - <button onclick='i3GEOF.legenda.ordenaClasses()' class="btn btn-xs" style="margin: 2px; padding: 2px;">
  24 + <button data-refresh="true" data-prog="execclasses" data-funcao="ordenaClasses" onclick='i3GEOF.legenda.run(this)' class="btn btn-xs" style="margin: 2px; padding: 2px;">
25 25 <span class="material-icons">sort</span>
26 26 </button> <span style="vertical-align: super; margin-left: 3px;"><strong>Nome</strong></span>
27 27 </td>
... ...
ferramentas/legenda/template_mst.html
  Diff comments   View file @ea0fb81
... ... @@ -48,13 +48,20 @@
48 48 </div>
49 49 </div>
50 50 </nav>
  51 +<!--
  52 +data-refresh="false" atualiza o mapa apos executar a funcao
  53 +data-prog="execlegenda" nome do programa PHP que sera executado no backend
  54 +data-funcao="contagemclasse" nome da funcao do programa PHP
  55 +
  56 +Outros parametros devem ser enviados via form
  57 + -->
51 58 <div id='{{idContainer}}' class='container-fluid' style='text-align: left; display: block; overflow: auto; height: calc(100% - 50px);'>
52 59 <!--- Propriedades -->
53 60 <div id='i3GEOlegendaguia6obj' class='container-fluid '>
54   - <button onclick="i3GEOF.legenda.adicionaConta(this)" class='btn btn-primary btn-sm btn-raised'>
  61 + <button data-refresh="false" data-prog="execlegenda" data-funcao="contagemclasse" onclick="i3GEOF.legenda.run(this)" class='btn btn-primary btn-sm btn-raised'>
55 62 <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{incluiNumeroOcorrencia}}}
56 63 </button>
57   - <button onclick="i3GEOF.legenda.adicionaOpacidade(this)" title='{{{aplicaOpacidade}}}' class='btn btn-primary btn-sm btn-raised'>
  64 + <button data-refresh="true" data-prog="execclasses" data-funcao="adicionaOpacidade" onclick="i3GEOF.legenda.run(this)" title='{{{aplicaOpacidade}}}' class='btn btn-primary btn-sm btn-raised'>
58 65 <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{aplicaOpacidadeVariavel}}}
59 66 </button>
60 67 <button onclick="i3GEOF.legenda.janelaCorRamp(this)" title='{{{variaCoresExtremos}}}' class='btn btn-primary btn-sm btn-raised'>
... ... @@ -75,7 +82,7 @@
75 82 <div class="form-group condensed">
76 83 <div class="input-group">
77 84 <div style="display: contents;" class="form-group label-fixed">
78   - <input id="i3GEOlegendaAutoSize" class="form-control" type="text" value="5">
  85 + <input id="i3GEOlegendaAutoSize" class="form-control" type="number" value="5">
79 86 </div>
80 87 </div>
81 88 </div>
... ... @@ -86,18 +93,20 @@
86 93 <div class="panel panel-default legenda">
87 94 <div class="panel-heading legenda">{{{legendaImg}}}</div>
88 95 <div class="panel-body">
89   - <div class="form-group condensed">
90   - <div class="input-group">
91   - <div style="display: contents;" class="form-group label-fixed">
92   - <input id="i3GEOlegendaImg" class="form-control" type="text" value="{{{values.img}}}">
  96 + <form data-refresh="true" data-prog="execlegenda" data-funcao="aplicaLegendaImg" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  97 + <div class="form-group condensed">
  98 + <div class="input-group">
  99 + <div style="display: contents;" class="form-group label-fixed">
  100 + <input required name="imagem" class="form-control" type="text" value="{{{values.img}}}">
  101 + </div>
  102 + <span class="input-group-btn">
  103 + <button role="button" type="submit" class="btn btn-primary btn-fab btn-fab-max">
  104 + <span class="material-icons ">send</span>
  105 + </button>
  106 + </span>
93 107 </div>
94   - <span class="input-group-btn"> <a onclick="i3GEOF.legenda.aplicaLegendaImg(this);return false;" role="button" type="button"
95   - class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
96   - <span class="material-icons ">send</span>
97   - </a>
98   - </span>
99 108 </div>
100   - </div>
  109 + </form>
101 110 </div>
102 111 </div>
103 112 </div>
... ... @@ -105,18 +114,20 @@
105 114 <div class="panel panel-default legenda">
106 115 <div class="panel-heading legenda">{{{offsite}}}</div>
107 116 <div class="panel-body">
108   - <div class="form-group condensed">
109   - <div class="input-group">
110   - <div style="display: contents;" class="form-group label-fixed">
111   - <input id="i3GEOoffsite" class="form-control i3geoFormIconeAquarela" type="text" value="{{{values.offsite}}}">
  117 + <form data-refresh="true" data-prog="exectemas" data-funcao="aplicaOffsite" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  118 + <div class="form-group condensed">
  119 + <div class="input-group">
  120 + <div style="display: contents;" class="form-group label-fixed">
  121 + <input required name="offsite" id="i3GEOoffsite" class="form-control i3geoFormIconeAquarela" type="text" value="{{{values.offsite}}}">
  122 + </div>
  123 + <span class="input-group-btn">
  124 + <button role="button" type="submit" class="btn btn-primary btn-fab btn-fab-max">
  125 + <span class="material-icons ">send</span>
  126 + </button>
  127 + </span>
112 128 </div>
113   - <span class="input-group-btn"> <a onclick="i3GEOF.legenda.aplicarOffsite(this);return false;" role="button" type="button"
114   - class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
115   - <span class="material-icons ">send</span>
116   - </a>
117   - </span>
118 129 </div>
119   - </div>
  130 + </form>
120 131 </div>
121 132 </div>
122 133 </div>
... ... @@ -126,22 +137,26 @@
126 137 <div class="panel panel-default legenda">
127 138 <div class="panel-heading legenda">{{{geraCores}}}</div>
128 139 <div class="panel-body">
129   - <div class="form-group condensed">
130   - <div class="input-group">
131   - <div style="display: contents;" class="form-group label-fixed">
132   - {{{de}}} &nbsp;
133   - <input class="form-control i3geoFormIconeAquarela" style="display: inline; width: 100px;" id="i3GEOlegendaacori" size="10" value="0,0,0" type="text">
134   - {{{ate}}} &nbsp;
135   - <input class="form-control i3geoFormIconeAquarela" style="display: inline; width: 100px;" id="i3GEOlegendaacorf" size="10" value="255,255,255" type="text">
136   - &nbsp;
  140 + <form data-refresh="true" data-prog="execclasses" data-funcao="alteraCoresClasses" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  141 + <div class="form-group condensed">
  142 + <div class="input-group">
  143 + <div style="display: contents;" class="form-group label-fixed">
  144 + {{{de}}} &nbsp;
  145 + <input class="form-control i3geoFormIconeAquarela" style="display: inline; width: 100px;" id="i3GEOlegendaacori" name="cori" required size="10" value="0,0,0"
  146 + type="text">
  147 + {{{ate}}} &nbsp;
  148 + <input class="form-control i3geoFormIconeAquarela" style="display: inline; width: 100px;" id="i3GEOlegendaacorf" name="corf" required size="10"
  149 + value="255,255,255" type="text">
  150 + &nbsp;
  151 + </div>
  152 + <span class="input-group-btn">
  153 + <button role="button" type="submit" title='{{{aplicaVariaCores}}}' class="btn btn-primary btn-fab btn-fab-max">
  154 + <span class="material-icons ">send</span>
  155 + </button>
  156 + </span>
137 157 </div>
138   - <span class="input-group-btn"> <a title='{{{aplicaVariaCores}}}' onclick="i3GEOF.legenda.paleta(this);return false;" role="button" type="button"
139   - class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
140   - <span class="material-icons ">send</span>
141   - </a>
142   - </span>
143 158 </div>
144   - </div>
  159 + </form>
145 160 </div>
146 161 </div>
147 162 </div>
... ... @@ -167,16 +182,18 @@
167 182 </div>
168 183 <div id="legendaClassesCollapse4" class="panel-collapse collapse" role="tabpanel" aria-labelledby="legendaClassesAccordion4">
169 184 <div class="panel-body">
170   - <div class='form-group condensed'>
171   - <div class="input-group">
172   - <label class="control-label">{{{todosElementosUnicoSimbolo}}}</label>
173   - <span class="input-group-btn"> <a onclick="i3GEOF.legenda.simbolounico();return false;" role="button" type="button"
174   - class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
175   - <span class="material-icons ">send</span>
176   - </a>
177   - </span>
  185 + <form data-refresh="true" data-prog="execclasses" data-funcao="simbolounico" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  186 + <div class='form-group condensed'>
  187 + <div class="input-group">
  188 + <label class="control-label">{{{todosElementosUnicoSimbolo}}}</label>
  189 + <span class="input-group-btn">
  190 + <button role="button" type="submit" class="btn btn-primary btn-fab btn-fab-max">
  191 + <span class="material-icons ">send</span>
  192 + </button>
  193 + </span>
  194 + </div>
178 195 </div>
179   - </div>
  196 + </form>
180 197 </div>
181 198 </div>
182 199 </div>
... ... @@ -189,30 +206,32 @@
189 206 </div>
190 207 <div id="legendaClassesCollapse9" class="panel-collapse collapse" role="tabpanel" aria-labelledby="legendaClassesAccordion9">
191 208 <div class="panel-body">
192   - <div class='form-group condensed'>
193   - <label class="control-label">{{{cadaOcorrenciaUnicoSimbolo}}}</label>
194   - <div style="width: 100%;" class="input-group">
195   - <div id='i3GEOlegendaitensValorUnico'></div>
  209 + <form data-refresh="true" data-prog="execclasses" data-funcao="valorunico" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  210 + <div class='form-group condensed'>
  211 + <label class="control-label">{{{cadaOcorrenciaUnicoSimbolo}}}</label>
  212 + <div style="width: 100%;" class="input-group">
  213 + <div id='i3GEOlegendaitensValorUnico'></div>
  214 + </div>
196 215 </div>
197   - </div>
198   - <div class='form-group condensed'>
199   - <label class="control-label">{{{nomeClassesUnicoSimbolo}}}</label>
200   - <div style="width: 100%;" class="input-group">
201   - <div id='i3GEOlegendaClassesValorUnico'></div>
202   -
  216 + <div class='form-group condensed'>
  217 + <label class="control-label">{{{nomeClassesUnicoSimbolo}}}</label>
  218 + <div style="width: 100%;" class="input-group">
  219 + <div id='i3GEOlegendaClassesValorUnico'></div>
  220 + </div>
203 221 </div>
204   - </div>
205   - <div class='form-group condensed'>
206   - <div class="input-group">
207   - <label class="control-label">&nbsp;</label>
208   - <span class="input-group-btn"> <a onclick="i3GEOF.legenda.valorunico();return false;" role="button" type="button"
209   - class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
210   - <span class="material-icons ">send</span>
211   - </a>
212   - </span>
  222 + <div class='form-group condensed'>
  223 + <div class="input-group">
  224 + <label class="control-label">&nbsp;</label>
  225 + <span class="input-group-btn">
  226 + <button role="button" type="submit" class="btn btn-primary btn-fab btn-fab-max">
  227 + <span class="material-icons ">send</span>
  228 + </button>
  229 + </span>
  230 + </div>
213 231 </div>
214   - </div>
  232 + </form>
215 233 </div>
  234 +
216 235 </div>
217 236 </div>
218 237 <div class="panel panel-default">
... ... @@ -224,26 +243,38 @@
224 243 </div>
225 244 <div id="legendaClassesCollapse5" class="panel-collapse collapse" role="tabpanel" aria-labelledby="legendaClassesAccordion5">
226 245 <div class="panel-body">
227   - <div class='form-group condensed'>
228   - <label class="control-label">{{{criaClassesItemNumerico}}}</label>
229   - <div style="width: 100%;" class="input-group">
230   - <div id='i3GEOlegendaitensValorClass'></div>
  246 + <form data-refresh="true" data-prog="execclasses" data-funcao="tipoClasses" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  247 + <div class='form-group condensed'>
  248 + <label class="control-label">{{{criaClassesItemNumerico}}}</label>
  249 + <div style="width: 100%;" class="input-group">
  250 + <div id='i3GEOlegendaitensValorClass'></div>
  251 + </div>
231 252 </div>
232   - </div>
233   - <div class='form-group label-floating'>
234   - <label class="control-label" for="i3GEOlegendanclasses">{{{numeroClasses}}}</label>
235   - <input class="form-control input-lg" type='number' id='i3GEOlegendanclasses' value='5' />
236   - </div>
237   - <h5>{{{tipoCalculo}}}</h5>
238   - <button onclick="i3GEOF.legenda.nclasses(this)" class='btn btn-primary btn-sm btn-raised'>
239   - <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{intervalosIguais}}}
240   - </button>
241   - <button onclick="i3GEOF.legenda.quebrasnaturais(this)" class='btn btn-primary btn-sm btn-raised'>
242   - <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{quebrasNaturais}}}
243   - </button>
244   - <button onclick="i3GEOF.legenda.quantil(this)" class='btn btn-primary btn-sm btn-raised'>
245   - <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{calcularQuantil}}}
246   - </button>
  253 + <div class='form-group label-floating'>
  254 + <label class="control-label">{{{numeroClasses}}}</label>
  255 + <input name="nclasses" required class="form-control input-lg" type='number' value='5' />
  256 + </div>
  257 + <div class='form-group condensed'>
  258 + <label class="control-label">{{{tipoCalculo}}}</label>
  259 + <div style="width: 100%;" class="input-group">
  260 + <select required class="form-control" name='tipoCalculo'>
  261 + <option value='nclasses'>{{{intervalosIguais}}}</option>
  262 + <option value='quebrasnaturais'>{{{quebrasNaturais}}}</option>
  263 + <option value='quantil'>{{{calcularQuantil}}}</option>
  264 + </select> <b class="caret careti"></b>
  265 + </div>
  266 + </div>
  267 + <div class='form-group condensed'>
  268 + <div class="input-group">
  269 + <label class="control-label">&nbsp;</label>
  270 + <span class="input-group-btn">
  271 + <button role="button" type="submit" class="btn btn-primary btn-fab btn-fab-max">
  272 + <span class="material-icons ">send</span>
  273 + </button>
  274 + </span>
  275 + </div>
  276 + </div>
  277 + </form>
247 278 </div>
248 279 </div>
249 280 </div>
... ... @@ -256,28 +287,30 @@
256 287 </div>
257 288 <div id="legendaClassesCollapse6" class="panel-collapse collapse" role="tabpanel" aria-labelledby="legendaClassesAccordion6">
258 289 <div class="panel-body">
259   - <div class='form-group condensed'>
260   - <label class="control-label">{{{duasmetades}}}</label>
261   - <div style="width: 100%;" class="input-group">
262   - <div id='i3GEOlegendaitensMetade'></div>
  290 + <form data-refresh="true" data-prog="execclasses" data-funcao="metade" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  291 + <div class='form-group condensed'>
  292 + <label class="control-label">{{{duasmetades}}}</label>
  293 + <div style="width: 100%;" class="input-group">
  294 + <div id='i3GEOlegendaitensMetade'></div>
  295 + </div>
263 296 </div>
264   - </div>
265   - <div class='form-group condensed'>
266   - <label class="control-label">{{{iunico}}}</label>
267   - <div style="width: 100%;" class="input-group">
268   - <div id='i3GEOlegendaitensMetadeId'></div>
  297 + <div class='form-group condensed'>
  298 + <label class="control-label">{{{iunico}}}</label>
  299 + <div style="width: 100%;" class="input-group">
  300 + <div id='i3GEOlegendaitensMetadeId'></div>
  301 + </div>
269 302 </div>
270   - </div>
271   - <div class='form-group condensed'>
272   - <div class="input-group">
273   - <label class="control-label">&nbsp;</label>
274   - <span class="input-group-btn"> <a onclick="i3GEOF.legenda.metade();return false;" role="button" type="button" class="btn btn-primary btn-fab btn-fab-max"
275   - href="javascript:void(0)">
276   - <span class="material-icons ">send</span>
277   - </a>
278   - </span>
  303 + <div class='form-group condensed'>
  304 + <div class="input-group">
  305 + <label class="control-label">&nbsp;</label>
  306 + <span class="input-group-btn">
  307 + <button role="button" type="submit" class="btn btn-primary btn-fab btn-fab-max">
  308 + <span class="material-icons ">send</span>
  309 + </button>
  310 + </span>
  311 + </div>
279 312 </div>
280   - </div>
  313 + </form>
281 314 </div>
282 315 </div>
283 316 </div>
... ... @@ -285,27 +318,29 @@
285 318 <div class="panel-heading" role="tab" id="legendaClassesAccordion7">
286 319 <h4 class="panel-title">
287 320 <a class="collapsed" role="button" data-toggle="collapse" data-parent="#legendaClassesAccordion" href="#legendaClassesCollapse7" aria-expanded="false"
288   - aria-controls="legendaClassesCollapse7"> {{{media}}} </a>
  321 + aria-controls="legendaClassesCollapse7"> {{{media}}} {{{duasmedias}}}</a>
289 322 </h4>
290 323 </div>
291 324 <div id="legendaClassesCollapse7" class="panel-collapse collapse" role="tabpanel" aria-labelledby="legendaClassesAccordion7">
292 325 <div class="panel-body">
293   - <div class='form-group condensed'>
294   - <label class="control-label">{{{duasmedias}}}</label>
295   - <div style="width: 100%;" class="input-group">
296   - <div id='i3GEOlegendaitensMedia'></div>
  326 + <form data-refresh="true" data-prog="execclasses" data-funcao="media" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  327 + <div class='form-group condensed'>
  328 + <label class="control-label">{{{duasmetades}}}</label>
  329 + <div style="width: 100%;" class="input-group">
  330 + <div id='i3GEOlegendaitensMedia'></div>
  331 + </div>
297 332 </div>
298   - </div>
299   - <div class='form-group condensed'>
300   - <div class="input-group">
301   - <label class="control-label">&nbsp;</label>
302   - <span class="input-group-btn"> <a onclick="i3GEOF.legenda.media();return false;" role="button" type="button" class="btn btn-primary btn-fab btn-fab-max"
303   - href="javascript:void(0)">
304   - <span class="material-icons ">send</span>
305   - </a>
306   - </span>
  333 + <div class='form-group condensed'>
  334 + <div class="input-group">
  335 + <label class="control-label">&nbsp;</label>
  336 + <span class="input-group-btn">
  337 + <button role="button" type="submit" class="btn btn-primary btn-fab btn-fab-max">
  338 + <span class="material-icons ">send</span>
  339 + </button>
  340 + </span>
  341 + </div>
307 342 </div>
308   - </div>
  343 + </form>
309 344 </div>
310 345 </div>
311 346 </div>
... ... @@ -318,33 +353,34 @@
318 353 </div>
319 354 <div id="legendaClassesCollapse8" class="panel-collapse collapse" role="tabpanel" aria-labelledby="legendaClassesAccordion8">
320 355 <div class="panel-body">
321   -
322   - <div class='form-group condensed'>
323   - <label class="control-label">{{{criaQuartis}}}</label>
324   - <div style="width: 100%;" class="input-group">
325   - <div id='i3GEOlegendaitensValorQuartil'></div>
  356 + <form data-refresh="true" data-prog="execclasses" data-funcao="quartil" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  357 + <div class='form-group condensed'>
  358 + <label class="control-label">{{{criaQuartis}}}</label>
  359 + <div style="width: 100%;" class="input-group">
  360 + <div id='i3GEOlegendaitensValorQuartil'></div>
  361 + </div>
326 362 </div>
327   - </div>
328   - <div class='form-group condensed'>
329   - <label class="control-label">{{{estiloNomeClasses}}}</label>
330   - <div style="width: 100%;" class="input-group">
331   - <select class="form-control" id='estiloClassesQuartis'>
332   - <option value='minimo'>{{{soValores}}}</option>
333   - <option value='simples'>{{{quartilValores}}}</option>
334   - <option value='completo'>{{{expressaoCompleta}}}</option>
335   - </select> <b class="caret careti"></b>
  363 + <div class='form-group condensed'>
  364 + <label class="control-label">{{{estiloNomeClasses}}}</label>
  365 + <div style="width: 100%;" class="input-group">
  366 + <select class="form-control" name='tipoLegenda'>
  367 + <option value='minimo'>{{{soValores}}}</option>
  368 + <option value='simples'>{{{quartilValores}}}</option>
  369 + <option value='completo'>{{{expressaoCompleta}}}</option>
  370 + </select> <b class="caret careti"></b>
  371 + </div>
336 372 </div>
337   - </div>
338   - <div class='form-group condensed'>
339   - <div class="input-group">
340   - <label class="control-label">&nbsp;</label>
341   - <span class="input-group-btn"> <a onclick="i3GEOF.legenda.quartil();return false;" role="button" type="button"
342   - class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
343   - <span class="material-icons ">send</span>
344   - </a>
345   - </span>
  373 + <div class='form-group condensed'>
  374 + <div class="input-group">
  375 + <label class="control-label">&nbsp;</label>
  376 + <span class="input-group-btn">
  377 + <button role="button" type="submit" class="btn btn-primary btn-fab btn-fab-max">
  378 + <span class="material-icons ">send</span>
  379 + </button>
  380 + </span>
  381 + </div>
346 382 </div>
347   - </div>
  383 + </form>
348 384 </div>
349 385 </div>
350 386 </div>
... ... @@ -385,29 +421,31 @@
385 421 </div>
386 422 <div id="legendaClassesCollapse2" class="panel-collapse collapse" role="tabpanel" aria-labelledby="legendaClassesAccordion2">
387 423 <div class="panel-body">
388   - <div class='form-group condensed'>
389   - <label class="control-label" for="i3GEOlegentaTipoGeo">{{{transformaGeom}}}</label>
390   - <div style="width: 100%;" class="input-group">
391   - <select class="form-control" id='i3GEOlegentaTipoGeo'>
392   - <option value=''>{{{semTransformacao}}}</option>
393   - <option value='centroid'>{{{centroide}}}</option>
394   - <option value='bbox'>box</option>
395   - <option value='vertices'>{{{vertices}}}</option>
396   - <option value='start'>{{{verticeInicial}}}</option>
397   - <option value='end'>{{{verticeFinal}}}</option>
398   - </select> <b class="caret careti"></b>
  424 + <form data-refresh="true" data-prog="execclasses" data-funcao="alteraGeometria" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  425 + <div class='form-group condensed'>
  426 + <label class="control-label" for="i3GEOlegentaTipoGeo">{{{transformaGeom}}}</label>
  427 + <div style="width: 100%;" class="input-group">
  428 + <select name="tipo" class="form-control">
  429 + <option value=''>{{{semTransformacao}}}</option>
  430 + <option value='centroid'>{{{centroide}}}</option>
  431 + <option value='bbox'>box</option>
  432 + <option value='vertices'>{{{vertices}}}</option>
  433 + <option value='start'>{{{verticeInicial}}}</option>
  434 + <option value='end'>{{{verticeFinal}}}</option>
  435 + </select> <b class="caret careti"></b>
  436 + </div>
399 437 </div>
400   - </div>
401   - <div class='form-group condensed'>
402   - <div class="input-group">
403   - <label class="control-label">&nbsp;</label>
404   - <span class="input-group-btn"> <a onclick="i3GEOF.legenda.alteraGeometria();return false;" role="button" type="button"
405   - class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
406   - <span class="material-icons ">send</span>
407   - </a>
408   - </span>
  438 + <div class='form-group condensed'>
  439 + <div class="input-group">
  440 + <label class="control-label">&nbsp;</label>
  441 + <span class="input-group-btn">
  442 + <button role="button" type="submit" class="btn btn-primary btn-fab btn-fab-max">
  443 + <span class="material-icons ">send</span>
  444 + </button>
  445 + </span>
  446 + </div>
409 447 </div>
410   - </div>
  448 + </form>
411 449 </div>
412 450 </div>
413 451 </div>
... ... @@ -420,16 +458,18 @@
420 458 </div>
421 459 <div id="legendaClassesCollapse3" class="panel-collapse collapse" role="tabpanel" aria-labelledby="legendaClassesAccordion3">
422 460 <div class="panel-body">
423   - <div class='form-group condensed'>
424   - <div class="input-group">
425   - <label class="control-label">{{{alteraTipoGeom}}}</label>
426   - <span class="input-group-btn"> <a onclick="i3GEOF.legenda.representacao();return false;" role="button" type="button"
427   - class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
428   - <span class="material-icons ">send</span>
429   - </a>
430   - </span>
  461 + <form data-refresh="true" data-prog="exectemas" data-funcao="alterarepresentacao" style="" action="#" onsubmit="i3GEOF.legenda.run(this);return false;" role="form">
  462 + <div class='form-group condensed'>
  463 + <div class="input-group">
  464 + <label class="control-label">{{{alteraTipoGeom}}}</label>
  465 + <span class="input-group-btn">
  466 + <button role="button" type="submit" class="btn btn-primary btn-fab btn-fab-max">
  467 + <span class="material-icons ">send</span>
  468 + </button>
  469 + </span>
  470 + </div>
431 471 </div>
432   - </div>
  472 + </form>
433 473 </div>
434 474 </div>
435 475 </div>
... ... @@ -619,7 +659,9 @@
619 659 </div>
620 660 </form>
621 661 <div style="text-align: center;">
622   - <button onclick="i3GEOF.legenda.salvaParametrosAuto(this)" class='btn btn-primary btn-sm btn-raised'><span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{aplicar}}}</button>
  662 + <button onclick="i3GEOF.legenda.salvaParametrosAuto(this)" class='btn btn-primary btn-sm btn-raised'>
  663 + <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{aplicar}}}
  664 + </button>
623 665 </div>
624 666 </div>
625 667 <input type='hidden' value='' id='listaColourRamp' onchange='javascript:i3GEOF.legenda.aplicaColourRamp()' />
... ...
ferramentas/saiku/i3geo
View file @f8b38c6
... ... @@ -1,6 +0,0 @@
1   -type=OLAP
2   -name=i3geo
3   -driver=mondrian.olap4j.MondrianOlap4jDriver
4   -location=jdbc:mondrian:Jdbc=jdbc:postgresql://localhost:5432/i3geosaude;Catalog=res:/var/www/i3geo/ferramentas/saiku/esquemaxml.php;JdbcDrivers=org.postgresql.Driver;
5   -username=postgres
6   -password=postgres