Commit 6698eeb989a61274f9e1b18359903c9154ed25b9
1 parent
3a31d743
Exists in
master
and in
7 other branches
Inclusão da opção de criação de gráfico interativo na janela de opções de análise do METAESTAT
Showing
3 changed files
with
20 additions
and
18 deletions
Show diff stats
ferramentas/graficointerativo/index.js
| ... | ... | @@ -240,7 +240,8 @@ i3GEOF.graficointerativo = { |
| 240 | 240 | String com o código html |
| 241 | 241 | */ |
| 242 | 242 | html:function(){ |
| 243 | - var ins = '' + | |
| 243 | + var locaplic = i3GEO.configura.locaplic, | |
| 244 | + ins = '' + | |
| 244 | 245 | '<div id=i3GEOgraficointerativoguiasYUI class="yui-navset" style="top:0px;cursor:pointer;left:0px;">' + |
| 245 | 246 | ' <ul class="yui-nav" style="border-width:0pt 0pt 0px;border-color:rgb(240,240,240);border-bottom-color:white;">' + |
| 246 | 247 | ' <li><a href="#ancora"><em><div id="i3GEOgraficointerativoguia1" style="text-align:center;left:0px;" >Tipo</div></em></a></li>' + |
| ... | ... | @@ -252,35 +253,33 @@ i3GEOF.graficointerativo = { |
| 252 | 253 | '<div class=guiaobj id="i3GEOgraficointerativoguia1obj" style="left:1px;display:none;">' + |
| 253 | 254 | ' <p class=paragrafo >Escolha o tipo de gráfico: </p>' + |
| 254 | 255 | ' <table class=lista6 >' + |
| 255 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="pizza2d" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>pizza 2d</td></tr>' + | |
| 256 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-pie-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="pizza2d" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>pizza 2d</td></tr>' + | |
| 256 | 257 | ' <tr><td> </td></tr>' + |
| 257 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="area" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>área 2d</td></tr>' + | |
| 258 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-area-stacked-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="area" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>área 2d</td></tr>' + | |
| 258 | 259 | ' <tr><td> </td></tr>' + |
| 259 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="scatter" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>distribuição de pontos</td></tr>' + | |
| 260 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-scatter-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="scatter" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>distribuição de pontos</td></tr>' + | |
| 260 | 261 | ' <tr><td> </td></tr>' + |
| 261 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="line" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>linha</td></tr>' + | |
| 262 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-line-stacked-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="line" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>linha</td></tr>' + | |
| 262 | 263 | ' <tr><td> </td></tr>' + |
| 263 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="radar" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>radar</td></tr>' + | |
| 264 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-polar-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="radar" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>radar</td></tr>' + | |
| 264 | 265 | ' <tr><td> </td></tr>' + |
| 265 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_filled" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras simples</td></tr>' + | |
| 266 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-bar-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_filled" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras simples</td></tr>' + | |
| 266 | 267 | ' <tr><td> </td></tr>' + |
| 267 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_glass" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras 2 cores</td></tr>' + | |
| 268 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-bar-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_glass" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras 2 cores</td></tr>' + | |
| 268 | 269 | ' <tr><td> </td></tr>' + |
| 269 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_3d" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras 3d</td></tr>' + | |
| 270 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-bar-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_3d" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras 3d</td></tr>' + | |
| 270 | 271 | ' <tr><td> </td></tr>' + |
| 271 | - | |
| 272 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_sketch" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras rascunho</td></tr>' + | |
| 272 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-bar-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_sketch" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras rascunho</td></tr>' + | |
| 273 | 273 | ' <tr><td> </td></tr>' + |
| 274 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_cylinder" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras cilindro</td></tr>' + | |
| 274 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-bar-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_cylinder" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras cilindro</td></tr>' + | |
| 275 | 275 | ' <tr><td> </td></tr>' + |
| 276 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_cylinder_outline" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras cilindro com contorno</td></tr>' + | |
| 276 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-bar-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_cylinder_outline" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras cilindro com contorno</td></tr>' + | |
| 277 | 277 | ' <tr><td> </td></tr>' + |
| 278 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_round_glass" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras cúpula</td></tr>' + | |
| 278 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-bar-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_round_glass" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras cúpula</td></tr>' + | |
| 279 | 279 | ' <tr><td> </td></tr>' + |
| 280 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_round" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras pílula</td></tr>' + | |
| 280 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-bar-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="bar_round" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras pílula</td></tr>' + | |
| 281 | 281 | ' <tr><td> </td></tr>' + |
| 282 | - ' <tr><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="hbar" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras horizontais</td></tr>' + | |
| 283 | - | |
| 282 | + ' <tr><td><img style=cursor:text; src="'+locaplic+'/imagens/oxygen/22x22/Actions-office-chart-bar-icon.png" /></td><td><input type=radio onclick="i3GEOF.graficointerativo.ativaTipo(this)" value="hbar" name="tipoGrafico" style="border:0px solid white;cursor:pointer" > </td><td>barras horizontais</td></tr>' + | |
| 284 | 283 | ' </table>' + |
| 285 | 284 | '</div> ' + |
| 286 | 285 | '<div class=guiaobj id="i3GEOgraficointerativoguia2obj" style="left:1px;display:none;top:-5px">' + | ... | ... |
ferramentas/metaestat/index.js
| ... | ... | @@ -78,6 +78,7 @@ i3GEOF.metaestat = { |
| 78 | 78 | ics[i].style.width = "32px"; |
| 79 | 79 | ics[i].style.border = "1px solid gray"; |
| 80 | 80 | ics[i].style.margin = "0px"; |
| 81 | + ics[i].style.position = "relative"; | |
| 81 | 82 | } |
| 82 | 83 | }, |
| 83 | 84 | abreJanela: function(){ |
| ... | ... | @@ -89,7 +90,7 @@ i3GEOF.metaestat = { |
| 89 | 90 | i3GEO.janela.minimiza("i3geoCartoAnalise"); |
| 90 | 91 | }; |
| 91 | 92 | janela = i3GEO.janela.cria( |
| 92 | - "200px", | |
| 93 | + "210px", | |
| 93 | 94 | "100px", |
| 94 | 95 | "", |
| 95 | 96 | "", |
| ... | ... | @@ -112,11 +113,13 @@ i3GEOF.metaestat = { |
| 112 | 113 | imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO)); |
| 113 | 114 | janela.moveTo(imagemxy[0]+(i3GEOF.metaestat.LEFT*2)+i3GEOF.metaestat.LARGURA+10,i3GEOF.metaestat.TOP); |
| 114 | 115 | }, |
| 116 | + //TODO traduzir | |
| 115 | 117 | html: function(){ |
| 116 | 118 | var ins = '<div id="i3geoCartoAnaliseContainer" style="margin-left:5px;">' + |
| 117 | 119 | ' <button title="Localizar região" onclick="i3GEO.mapa.dialogo.locregiao()"><img src="'+i3GEO.configura.locaplic+'/imagens/gisicons/open-street-maps.png" /></button>' + |
| 118 | 120 | ' <button title="Filtrar região" onclick="i3GEO.mapa.dialogo.filtraregiao()"><img src="'+i3GEO.configura.locaplic+'/imagens/gisicons/open-street-maps-filtro.png" /></button>' + |
| 119 | 121 | ' <button title="Tabela com os dados" onclick="i3GEO.tema.dialogo.tabela()"><img src="'+i3GEO.configura.locaplic+'/imagens/gisicons/table.png" /></button>' + |
| 122 | + ' <button title="Gráfico interativo" onclick="i3GEO.analise.dialogo.graficoInterativo()"><img src="'+i3GEO.configura.locaplic+'/imagens/oxygen/22x22/view_statistics.png" /></button>' + | |
| 120 | 123 | '</div>'; |
| 121 | 124 | return ins; |
| 122 | 125 | }, | ... | ... |
imagens/oxygen/22x22/view_statistics.png
