Download as
Browse Code »

Commit 85c103ba52b93f9834871575362e9983637ffb65

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

Correção na geração de gráficos

Showing 1 changed file with 6 additions and 9 deletions   Show diff stats
classesphp/classe_shp.php
  Diff comments   View file @85c103b
@@ -290,16 +290,14 @@ Include: @@ -290,16 +290,14 @@ Include:
290 //pega os valores 290 //pega os valores
291 include_once($this->locaplic."/classesphp/classe_atributos.php"); 291 include_once($this->locaplic."/classesphp/classe_atributos.php");
292 $m = new Atributos($this->arquivo,$this->tema); 292 $m = new Atributos($this->arquivo,$this->tema);
  293 + //FIXME alterar para a nova funcao de identificacao
293 $shape = $m->identificaQBP($this->nome,$x,$y,$this->arquivo,0,"","shape"); 294 $shape = $m->identificaQBP($this->nome,$x,$y,$this->arquivo,0,"","shape");
294 - if ((is_array($shape)) && ($shape[0] == " "))  
295 - { 295 + if ((is_array($shape)) && ($shape[0] == " ")){
296 return("erro.Nenhum valor encontrado"); 296 return("erro.Nenhum valor encontrado");
297 } 297 }
298 - else  
299 - { 298 + else{
300 $itens = explode("*",$itens); 299 $itens = explode("*",$itens);
301 - foreach ($itens as $i)  
302 - { 300 + foreach ($itens as $i){
303 $ii = explode(",",$i); 301 $ii = explode(",",$i);
304 $v = $shape->values[$ii[0]]; 302 $v = $shape->values[$ii[0]];
305 if (!is_numeric($v)) 303 if (!is_numeric($v))
@@ -309,8 +307,7 @@ Include: @@ -309,8 +307,7 @@ Include:
309 } 307 }
310 $data = implode("*",$valor); 308 $data = implode("*",$valor);
311 $cores = implode("*",$cor); 309 $cores = implode("*",$cor);
312 - if ($tipo == "pizza")  
313 - { 310 + if ($tipo == "pizza"){
314 //gera a figura 311 //gera a figura
315 include_once($this->locaplic."/classesphp/graficopizza.php"); 312 include_once($this->locaplic."/classesphp/graficopizza.php");
316 $res = graficopizza($data,$width,$inclinacao,$shadow_height,$cores,$this->arquivo,$temaedit); 313 $res = graficopizza($data,$width,$inclinacao,$shadow_height,$cores,$this->arquivo,$temaedit);
@@ -318,7 +315,7 @@ Include: @@ -318,7 +315,7 @@ Include:
318 } 315 }
319 //insere simbolo 316 //insere simbolo
320 $nomes = nomeRandomico(); 317 $nomes = nomeRandomico();
321 - $nId = ms_newsymbolobj($this->mapa, "foto"); 318 + $nId = ms_newsymbolobj($this->mapa, $img[0]);
322 $oSymbol = $this->mapa->getsymbolobjectbyid($nId); 319 $oSymbol = $this->mapa->getsymbolobjectbyid($nId);
323 $oSymbol->set("inmapfile", MS_TRUE); 320 $oSymbol->set("inmapfile", MS_TRUE);
324 $oSymbol->set("type",MS_SYMBOL_PIXMAP); 321 $oSymbol->set("type",MS_SYMBOL_PIXMAP);