From 9ce0ede801c46198cff7cd127c3fb8f24e776562 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Wed, 12 Sep 2007 19:34:46 +0000 Subject: [PATCH] Compatibilização da lista de símbolos lineares presentes no arquivo simbolos.sym e simboloslin.sym --- classesphp/classe_legenda.php | 1 + classesphp/mapa_controle.php | 26 ++++++++++++++++++++------ symbols/simbolos.sym | 315 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- symbols/simboloslin.sym | 53 +++++++++++++++++++++++++---------------------------- 4 files changed, 354 insertions(+), 41 deletions(-) diff --git a/classesphp/classe_legenda.php b/classesphp/classe_legenda.php index e0c97aa..3cd4a4f 100644 --- a/classesphp/classe_legenda.php +++ b/classesphp/classe_legenda.php @@ -507,6 +507,7 @@ $size - Tamanho que será aplicado ao símbolo. $sld = $this->layer->getmetadata("sld"); reSLD($this->arquivo,$this->nome,$sld); } + return "ok"; } /* function: pegaParametrosLegImg diff --git a/classesphp/mapa_controle.php b/classesphp/mapa_controle.php index a877574..7e3b5f7 100644 --- a/classesphp/mapa_controle.php +++ b/classesphp/mapa_controle.php @@ -1601,16 +1601,30 @@ Include: include("classe_legenda.php"); $m = new Legenda($map_file,$locaplic,$tema); if ($opcao == "excluiestilo") - {$cp->set_data($m->excluiEstilo($classe,$estilo));} + { + $cp->set_data($m->excluiEstilo($classe,$estilo)); + $m->salva(); + } if ($opcao == "adicionaestilo") - {$cp->set_data($m->adicionaEstilo($classe,$estilo));} + { + $cp->set_data($m->adicionaEstilo($classe,$estilo)); + $m->salva(); + } if ($opcao == "sobeestilo") - {$cp->set_data($m->sobeEstilo ($classe,$estilo));} + { + $cp->set_data($m->sobeEstilo ($classe,$estilo)); + $m->salva(); + } if ($opcao == "desceestilo") - {$cp->set_data($m->desceEstilo ($classe,$estilo));} + { + $cp->set_data($m->desceEstilo ($classe,$estilo)); + $m->salva(); + } if ($opcao == "aplica") - {$cp->set_data($m->aplicaParametro($classe,$estilo,$outlinecolor,$backgroundcolor,$color,$symbolname,$size));} - $m->salva(); + { + $cp->set_data($m->aplicaParametro($classe,$estilo,$outlinecolor,$backgroundcolor,$color,$symbolname,$size)); + $m->salva(); + } if ($opcao == "listaSimbolos") {$cp->set_data($m->listaSimbolos($tipo,$dir_tmp,$imgdir));} if ($opcao == "pegaparametros") diff --git a/symbols/simbolos.sym b/symbols/simbolos.sym index 930057e..9628ad9 100644 --- a/symbols/simbolos.sym +++ b/symbols/simbolos.sym @@ -518,14 +518,315 @@ Symbol 1 1 END END -SYMBOL -NAME "T" -TYPE TRUETYPE -FONT "arial" -CHARACTER "#" -ANTIALIAS TRUE -GAP 10 + Symbol + Name "pt1l" + Type VECTOR + TRANSPARENT 0 + Points + 1 1 + 1 1 + END + STYLE + 1 13 1 13 + END + END + + Symbol + name "pt2l" + TYPE ELLIPSE + POINTS 1 1 END + FILLED true + STYLE + 1 13 1 13 + END + END + + Symbol + Name "pt3l" + Type ELLIPSE + POINTS 1 1 END + Transparent 0 + STYLE + 1 13 1 13 + END + END + Symbol + Name "setal" + Type PIXMAP + Image "seta.png" + STYLE + 1 13 1 13 + END + END + + Symbol + Name "sedel" + Type PIXMAP + Image "sede.png" + Transparent 1 + STYLE + 1 13 1 13 + END + + END + + Symbol + Name "cidmunl" + Type PIXMAP + Image "cidmun.png" + STYLE + 1 13 1 13 + END + + END + + Symbol + Name "capitall" + Type PIXMAP + Image "capital.png" + STYLE + 1 13 1 13 + END + + END + + Symbol + Name "cidadel" + Type PIXMAP + Image "cidade.png" + STYLE + 1 13 1 13 + END + + END + + Symbol + Name "vilal" + Type PIXMAP + Image "vila.png" + STYLE + 1 13 1 13 + END + + END + + Symbol + Name "xyl" + Type PIXMAP + Image "xy.png" + STYLE + 1 13 1 13 + END + + END + + Symbol + Name "xyrl" + Type PIXMAP + Image "xyr.png" + STYLE + 1 13 1 13 + END + + END + + Symbol + Name "portol" + Type PIXMAP + Image "porto.png" + STYLE + 1 13 1 13 + END + + END + + Symbol + Name "refl" + Type PIXMAP + Image "ref.png" + STYLE + 1 13 1 13 + END + + END + + Symbol + Name "marcal" + Type PIXMAP + Image "marca.png" + STYLE + 1 13 1 13 + END + + END + + + Symbol + Name "pontol" + Type ELLIPSE + FILLED true + TRANSPARENT 0 + Points + 1 1 + 1 1 + END + STYLE + 1 13 1 13 + END + + END + + Symbol + NAME 'quadradol' + TYPE VECTOR + FILLED TRUE + POINTS + 0 1 + 0 0 + 1 0 + 1 1 + 0 1 + END + STYLE + 1 13 1 13 + END + + END + + SYMBOL + NAME "estrelal" + TYPE vector + FILLED TRUE + POINTS + 81 48 + 66 0 + 50 48 + 0 48 + 41 77 + 25 125 + 66 96 + 106 125 + 91 77 + 131 48 + 81 48 + END + STYLE + 1 13 1 13 + END + + END + + SYMBOL + NAME 'triangulol' + TYPE VECTOR + FILLED TRUE + POINTS + 0 1 + .5 0 + 1 1 + 0 1 + END + STYLE + 1 13 1 13 + END + + END + + SYMBOL + NAME 'industrial' + TYPE VECTOR + FILLED TRUE + POINTS + 0 2 + 0 5 + 4 5 + 4 0 + 3 0 + 3 2 + 0 2 + END + STYLE + 1 13 1 13 + END + + END + + SYMBOL + NAME 'torrel' + TYPE VECTOR + FILLED FALSE + POINTS + 2 0 + 3 4 + 4 4 + 4 5 + 0 5 + 0 4 + 1 4 + 2 0 + END + STYLE + 1 13 1 13 + END + + END + + SYMBOL + NAME 'mineracaol' + TYPE VECTOR + FILLED FALSE + POINTS + 0 0 + 5 5 + 4 6 + 3 7 + 2 6 + 0 5 + 5 0 + END + STYLE + 1 13 1 13 + END + + END + SYMBOL + NAME 'cruzl' + TYPE VECTOR + FILLED TRUE + POINTS + 2 0 + 3 0 + 3 1 + 5 1 + 5 2 + 3 2 + 3 7 + 2 7 + 2 2 + 0 2 + 0 1 + 2 1 + 2 0 + END + STYLE + 1 13 1 13 + END + + END + +Symbol + name "circlel" + Type ELLIPSE + Filled true + POINTS + 1 1 + END + STYLE + 1 13 1 13 + END + END + diff --git a/symbols/simboloslin.sym b/symbols/simboloslin.sym index e623177..b2ce172 100644 --- a/symbols/simboloslin.sym +++ b/symbols/simboloslin.sym @@ -25,7 +25,7 @@ Symbol END END Symbol - Name "pt1" + Name "pt1l" Type VECTOR TRANSPARENT 0 Points @@ -38,7 +38,7 @@ END END Symbol - name "pt2" + name "pt2l" TYPE ELLIPSE POINTS 1 1 END FILLED true @@ -48,7 +48,7 @@ END END Symbol - Name "pt3" + Name "pt3l" Type ELLIPSE POINTS 1 1 END Transparent 0 @@ -83,7 +83,7 @@ END 1 1 END STYLE - 20 10 20 10 + 8 3 END END @@ -105,14 +105,11 @@ END FILLED true POINTS 2 0 - END - STYLE - 8 8 1 8 - END + END END Symbol - Name "seta" + Name "setal" Type PIXMAP Image "seta.png" STYLE @@ -121,7 +118,7 @@ END END Symbol - Name "sede" + Name "sedel" Type PIXMAP Image "sede.png" Transparent 1 @@ -132,7 +129,7 @@ END END Symbol - Name "cidmun" + Name "cidmunl" Type PIXMAP Image "cidmun.png" STYLE @@ -142,7 +139,7 @@ END END Symbol - Name "capital" + Name "capitall" Type PIXMAP Image "capital.png" STYLE @@ -152,7 +149,7 @@ END END Symbol - Name "cidade" + Name "cidadel" Type PIXMAP Image "cidade.png" STYLE @@ -162,7 +159,7 @@ END END Symbol - Name "vila" + Name "vilal" Type PIXMAP Image "vila.png" STYLE @@ -172,7 +169,7 @@ END END Symbol - Name "xy" + Name "xyl" Type PIXMAP Image "xy.png" STYLE @@ -182,7 +179,7 @@ END END Symbol - Name "xyr" + Name "xyrl" Type PIXMAP Image "xyr.png" STYLE @@ -192,7 +189,7 @@ END END Symbol - Name "porto" + Name "portol" Type PIXMAP Image "porto.png" STYLE @@ -202,7 +199,7 @@ END END Symbol - Name "ref" + Name "refl" Type PIXMAP Image "ref.png" STYLE @@ -212,7 +209,7 @@ END END Symbol - Name "marca" + Name "marcal" Type PIXMAP Image "marca.png" STYLE @@ -223,7 +220,7 @@ END Symbol - Name "ponto" + Name "pontol" Type ELLIPSE FILLED true TRANSPARENT 0 @@ -238,7 +235,7 @@ END END Symbol - NAME 'quadrado' + NAME 'quadradol' TYPE VECTOR FILLED TRUE POINTS @@ -255,7 +252,7 @@ END END SYMBOL - NAME "estrela" + NAME "estrelal" TYPE vector FILLED TRUE POINTS @@ -278,7 +275,7 @@ END END SYMBOL - NAME 'triangulo' + NAME 'triangulol' TYPE VECTOR FILLED TRUE POINTS @@ -294,7 +291,7 @@ END END SYMBOL - NAME 'industria' + NAME 'industrial' TYPE VECTOR FILLED TRUE POINTS @@ -313,7 +310,7 @@ END END SYMBOL - NAME 'torre' + NAME 'torrel' TYPE VECTOR FILLED FALSE POINTS @@ -333,7 +330,7 @@ END END SYMBOL - NAME 'mineracao' + NAME 'mineracaol' TYPE VECTOR FILLED FALSE POINTS @@ -351,7 +348,7 @@ END END SYMBOL - NAME 'cruz' + NAME 'cruzl' TYPE VECTOR FILLED TRUE POINTS @@ -376,7 +373,7 @@ END END Symbol - name "circle" + name "circlel" Type ELLIPSE Filled true POINTS -- libgit2 0.21.2