Download as
Browse Code »

Commit 5fe145777e674ae52ce3cfd8a9b498c6a4f681f7

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

Correção na ferramenta de escolha de cores

Showing 2 changed files with 31 additions and 17 deletions   Show diff stats
ferramentas/colourramp/index.php
  Diff comments   View file @5fe1457
1 1 <?php
2   - include_once("../../classesphp/pega_variaveis.php");
3   - include_once("../../classesphp/class.palette.php");
  2 + include_once(__DIR__."/../../classesphp/pega_variaveis.php");
  3 + include_once(__DIR__."/../../classesphp/class.palette.php");
4 4 $m = new palette();
5   - $lista = implode(",",($m->listaColourRamps("../..")));
  5 + $lista = implode(",",($m->listaColourRamps(__DIR__."/../..")));
6 6 if(!isset($ncores))
7 7 {$ncores = 10;}
  8 + if(empty($locaplic)){
  9 + $locaplic = "../..";
  10 + }
8 11 ?>
9 12 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
10 13 <html>
11 14 <head>
12 15 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
13   -<script type="text/javascript" src="../../classesjs/i3geo.js"></script>
  16 +<script type="text/javascript" src="<?php echo $locaplic;?>/classesjs/i3geo.js"></script>
14 17 <style>
15 18 body{
16 19 background-color:white;
... ... @@ -41,7 +44,7 @@ body{
41 44 }
42 45 #demo_bg {
43 46 position: relative;
44   - background: url(../../pacotes/yui290/examples/slider/assets/dual_thumb_bg.gif) 0 5px no-repeat;
  47 + background: url(<?php echo $locaplic;?>/pacotes/yui290/build/slider/assets/dual_thumb_bg.gif) 0 5px no-repeat;
45 48 height: 28px;
46 49 width: 258px;
47 50 left: 8px;
... ... @@ -56,7 +59,7 @@ body{
56 59 /* Here's the highlight element */
57 60 #demo_bg span {
58 61 position: absolute;
59   - background: url(../../pacotes/yui290/examples/slider/assets/dual_thumb_highlight.gif) 0 0 repeat-x;
  62 + background: url(<?php echo $locaplic;?>/pacotes/yui290/build/slider/assets/dual_thumb_highlight.gif) 0 0 repeat-x;
60 63 top: 10px;
61 64 left: 12px;
62 65 height: 13px;
... ... @@ -105,8 +108,8 @@ p .boom {
105 108 <div id="imagens" ></div>
106 109 <div id="demo_bg" title="Range slider">
107 110 <span id="demo_highlight"></span>
108   - <div id="demo_min_thumb"><img src="../../pacotes/yui290/examples/slider/assets/l-thumb-round.gif"></div>
109   - <div id="demo_max_thumb"><img src="../../pacotes/yui290/examples/slider/assets/r-thumb-round.gif"></div>
  111 + <div id="demo_min_thumb"><img src="<?php echo $locaplic;?>/pacotes/yui290/build/slider/assets/l-thumb-round.gif"></div>
  112 + <div id="demo_max_thumb"><img src="<?php echo $locaplic;?>/pacotes/yui290/build/slider/assets/r-thumb-round.gif"></div>
110 113 </div>
111 114 <p><span id="demo_range">0-255</span></p>
112 115 <div id=cores ></div>
... ... @@ -124,7 +127,7 @@ lista = lista.split(&quot;,&quot;);
124 127 var n = lista.length;
125 128 var ins = "";
126 129 for(var i=0; i<n; i++){
127   - ins += "<img title='"+lista[i]+" 'onclick='geracores(\""+lista[i]+"\")' src='../../symbols/colourramp/"+lista[i]+".gif' />";
  130 + ins += "<img title='"+lista[i]+" 'onclick='geracores(\""+lista[i]+"\")' src='<?php echo $locaplic;?>/symbols/colourramp/"+lista[i]+".gif' />";
128 131 }
129 132 $i("imagens").innerHTML = ins;
130 133  
... ... @@ -143,7 +146,7 @@ function geracores(codigo){
143 146 try{
144 147 if(retorno.data[i].r != undefined){
145 148 cor = retorno.data[i].r+","+retorno.data[i].g+","+retorno.data[i].b;
146   - ins += "<tr><td><img src='../../imagens/x.png' style='cursor:pointer;' title='excluir' onclick='javascript:$i(\"cor_"+cor+"\").style.display=\"none\";this.style.display=\"none\"' </td><td><p id='cor_"+cor+"' style='width:250px;heigth:10px;background-color:rgb("+cor+")'><input onchange='javascript:$i(\"cor_"+cor+"\").style.backgroundColor=this.value;' type=text size=17 value=\"rgb("+cor+")\"/></p></td></tr>";
  149 + ins += "<tr><td><img src='<?php echo $locaplic;?>/imagens/x.png' style='cursor:pointer;' title='excluir' onclick='javascript:$i(\"cor_"+cor+"\").style.display=\"none\";this.style.display=\"none\"' </td><td><p id='cor_"+cor+"' style='width:250px;heigth:10px;background-color:rgb("+cor+")'><input onchange='javascript:$i(\"cor_"+cor+"\").style.backgroundColor=this.value;' type=text size=17 value=\"rgb("+cor+")\"/></p></td></tr>";
147 150 }
148 151 }catch(e){}
149 152 }
... ... @@ -155,9 +158,9 @@ function geracores(codigo){
155 158 if(nobj.value > (slider.maxVal - slider.minVal))
156 159 {nobj.value = slider.maxVal - slider.minVal;}
157 160 var ncores = nobj.value;
158   -
159   - var p = "../../classesphp/mapa_controle.php?funcao=geraCoresColourRamp&map_file=&g_sid=&codigo="+codigo+"&inicio="+slider.minVal+"&fim="+slider.maxVal+"&ncores="+ncores;
160   - cpJSON.call(p,"foo",temp);
  161 +
  162 + var p = "<?php echo $locaplic;?>/classesphp/mapa_controle.php?funcao=geraCoresColourRamp&map_file=&g_sid=&codigo="+codigo+"&inicio="+slider.minVal+"&fim="+slider.maxVal+"&ncores="+ncores;
  163 + cpJSON.call(p,"foo",temp);
161 164 }
162 165  
163 166 //
... ... @@ -218,7 +221,7 @@ function aplicarCores()
218 221 slider = YAHOO.widget.Slider.getHorizDualSlider("demo_bg",
219 222 "demo_min_thumb", "demo_max_thumb",
220 223 range, tickSize);
221   -
  224 +
222 225 // Decorate the DualSlider instance with some new properties and
223 226 // methods to maintain the highlight element
224 227 YAHOO.lang.augmentObject(slider, {
... ... @@ -236,7 +239,7 @@ function aplicarCores()
236 239 updateHighlight : function () {
237 240 var delta = this.maxVal - this.minVal,
238 241 newStatus = 'ok';
239   -
  242 +
240 243 if (delta < boom_range) {
241 244 newStatus = 'boom';
242 245 } else if (delta < danger_range) {
... ...
ferramentas/metaestat/index.js
  Diff comments   View file @5fe1457
... ... @@ -560,7 +560,7 @@ i3GEOF.metaestat = {
560 560 //refaz o conteudo para mostrar a nova adicao
561 561 i3GEOF.metaestat.editor.removeEl("i3GEOF.metaestat.editor.t3");
562 562 // Enome e o id do input onde o usuario escolheu o nome da nova variavel
563   - i3GEOF.metaestat.editor.t3(true,$i("Enome").value);
  563 + i3GEOF.metaestat.editor.t4(true,$i("Enome").value);
564 564 };
565 565 var id_classificacao = $i("i3geoCartoComboClassificacoesEditor").value;
566 566 if(id_classificacao !== ""){
... ... @@ -592,7 +592,15 @@ i3GEOF.metaestat = {
592 592 i3GEOF.metaestat.editor.removeEl("i3GEOF.metaestat.editor.t3");
593 593 },
594 594 quartis: function(){
595   - //TODO
  595 + //TODO quartis
  596 + var id_medida_variavel = $i("i3geoCartoComboMedidaVariavelEditor").value,
  597 + id_classificacao = $i("i3geoCartoComboClassificacoesEditor").value,
  598 + p = i3GEO.configura.locaplic+"/admin/php/metaestat.php?funcao=calculaClassificacao&tipo=quartil&id_classificacao="+id_classificacao+"&id_medida_variavel="+id_medida_variavel+"&g_sid="+i3GEO.configura.sid,
  599 + temp = function(retorno){
  600 + core_carregando("desativa");
  601 + };
  602 + core_carregando("ativa");
  603 + i3GEO.util.ajaxGet(p,temp);
596 604 },
597 605 intervalosIguais: function(){
598 606  
... ... @@ -728,6 +736,9 @@ i3GEOF.metaestat = {
728 736 "<br><br><p><input id=i3GEOFmetaestatEditorBotao6 type='button' value='"+$trad(11,i3GEOF.metaestat.dicionario1)+"' />" +
729 737 "&nbsp;<input id=i3GEOFmetaestatEditorBotao7 type='button' value='"+$trad(12,i3GEOF.metaestat.dicionario1)+"' />";
730 738 i3GEO.util.proximoAnterior("i3GEOF.metaestat.editor.t3()","i3GEOF.metaestat.editor.t5()",ins,"i3GEOF.metaestat.editor.t4","i3GEOFmetaestatEditor",true);
  739 + //i3GEO.util.abreColourRamp("","listaColourRamp",ncores);
  740 + // '<input type=hidden value="" id="listaColourRamp" onchange="javascript:i3GEOF.legenda.aplicaColourRamp()" />'; //utilizado pelo seletor de colourramp
  741 +
731 742 new YAHOO.widget.Button(
732 743 "i3GEOFmetaestatEditorBotao6",
733 744 {onclick:{fn: i3GEOF.metaestat.editor.quartis}}
... ...