Revision 8765 branches/v10/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/v02/FGraphicUtilities.java
| FGraphicUtilities.java | ||
|---|---|---|
| 62 | 62 |
import com.iver.cit.gvsig.fmap.core.FShape; |
| 63 | 63 |
import com.iver.cit.gvsig.fmap.core.GeneralPathX; |
| 64 | 64 |
import com.iver.cit.gvsig.fmap.core.Handler; |
| 65 |
import com.iver.cit.gvsig.fmap.core.ISymbol; |
|
| 65 | 66 |
import com.vividsolutions.jts.geom.Geometry; |
| 66 | 67 |
import com.vividsolutions.jts.geom.Point; |
| 67 | 68 |
|
| ... | ... | |
| 69 | 70 |
/** |
| 70 | 71 |
* Clase con m?todos est?ticos para dibujar sobre el Graphics que se les pase |
| 71 | 72 |
* como par?metro. |
| 73 |
* |
|
| 74 |
* Esta clase deber?a ser privada. Las clases que la usan son GraphicLayer |
|
| 75 |
* y AnnotationStrategy, pero hay que revisarlas para que no sea necesario. |
|
| 76 |
* Lo m?s urgente ser?a lo del dibujado de textos, para que sea |
|
| 77 |
* Hay que quitar las dependecias de FSymbol, y trabajar SIEMPRE con ISymbol. |
|
| 78 |
* Recordar: Que sea ISymbol el que renderiza. |
|
| 79 |
* extensible el s?mbolo a usar. NOTA: Ver tambi?n comentario en ISymbol |
|
| 72 | 80 |
* |
| 73 | 81 |
* @author fjp |
| 74 | 82 |
*/ |
| ... | ... | |
| 111 | 119 |
symbol.setSize(8); // tama?o fijo |
| 112 | 120 |
} |
| 113 | 121 |
|
| 114 |
FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 122 |
symbol.draw(g2, mT, shp); |
|
| 123 |
// FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 124 |
|
|
| 115 | 125 |
|
| 116 | 126 |
if (!bAux2) {
|
| 117 | 127 |
symbol.setSize(alturaMetros); |
| ... | ... | |
| 144 | 154 |
rect.x + rect.width, rect.y + (rect.height / 2)); |
| 145 | 155 |
|
| 146 | 156 |
shp = new FPolyline2D(line); |
| 147 |
FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 157 |
symbol.draw(g2, mT, shp); |
|
| 158 |
// FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 148 | 159 |
|
| 149 | 160 |
break; |
| 150 | 161 |
|
| ... | ... | |
| 155 | 166 |
shp = new FPolygon2D(rectAux); |
| 156 | 167 |
|
| 157 | 168 |
// System.out.println("rect = "+rectAux.getBounds());
|
| 158 |
FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 169 |
symbol.draw(g2, mT, shp); |
|
| 170 |
// FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 159 | 171 |
|
| 160 | 172 |
break; |
| 161 | 173 |
|
| ... | ... | |
| 167 | 179 |
GeneralPathX rectAux2 = new GeneralPathX(r); |
| 168 | 180 |
rectAux2.transform(mT2); |
| 169 | 181 |
shp = new FPolygon2D(rectAux2); |
| 170 |
FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 182 |
symbol.draw(g2, mT, shp); |
|
| 183 |
// FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 171 | 184 |
|
| 172 | 185 |
// L?nea |
| 173 | 186 |
rect = mT2.createTransformedShape(r2).getBounds(); |
| ... | ... | |
| 180 | 193 |
rect.x + rect.width, rect.y + (rect.height / 2)); |
| 181 | 194 |
|
| 182 | 195 |
shp = new FPolyline2D(line); |
| 183 |
FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 196 |
symbol.draw(g2, mT, shp); |
|
| 197 |
// FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 184 | 198 |
|
| 185 | 199 |
// Punto: |
| 186 | 200 |
shp = new FPoint2D(r3.x + (r3.width / 2), r3.y + |
| ... | ... | |
| 194 | 208 |
symbol.setSizeInPixels(true); |
| 195 | 209 |
symbol.setSize(4); // tama?o fijo |
| 196 | 210 |
} |
| 211 |
symbol.draw(g2, mT, shp); |
|
| 212 |
// FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 197 | 213 |
|
| 198 |
FGraphicUtilities.DrawShape(g2, mT, shp, symbol); |
|
| 199 |
|
|
| 200 | 214 |
if (!bAux2) {
|
| 201 | 215 |
symbol.setSize(alturaMetros); |
| 202 | 216 |
symbol.setSizeInPixels(bAux2); |
Also available in: Unified diff