Revision 1762 branches/FMap_piloto_CAD_Layout_version/libraries/libFMap/src/com/iver/cit/gvsig/fmap/MapControl.java
MapControl.java | ||
---|---|---|
98 | 98 |
private MapToolListener mapToolListener = new MapToolListener(); |
99 | 99 |
private MapContextListener mapContextListener = new MapContextListener(); |
100 | 100 |
private ExceptionHandlingSupport exceptionHandlingSupport = new ExceptionHandlingSupport(); |
101 |
|
|
101 |
private CadGrid grid = new CadGrid(); |
|
102 |
private Behavior returnBehavior; |
|
102 | 103 |
/** |
103 | 104 |
* Crea un nuevo NewMapControl. |
104 | 105 |
*/ |
... | ... | |
256 | 257 |
protected void paintComponent(Graphics g) { |
257 | 258 |
if (status == ACTUALIZADO) { |
258 | 259 |
logger.debug("Dibujando la imagen obtenida"); |
259 |
|
|
260 |
|
|
260 | 261 |
/* |
261 | 262 |
* Si hay un behaviour y la imagen es distinta de null se delega el dibujado |
262 | 263 |
* en dicho behaviour |
... | ... | |
265 | 266 |
((Behavior)toolStack.peek()).paintComponent(g); |
266 | 267 |
System.out.println("Pinto ACTUALIZADO"); |
267 | 268 |
} |
269 |
|
|
270 |
|
|
268 | 271 |
} else if (status == DESACTUALIZADO) { |
269 | 272 |
System.out.println("DESACTUALIZADO: Obteniendo la imagen de la cartograf?a"); |
270 | 273 |
/* if (isOpaque()) |
... | ... | |
284 | 287 |
BufferedImage.TYPE_INT_ARGB); |
285 | 288 |
vp.setImageSize(new Dimension(getWidth(), getHeight())); |
286 | 289 |
Graphics gTemp = image.createGraphics(); |
287 |
Color theBackColor = vp.getBackColor(); |
|
288 |
if (theBackColor == null) |
|
290 |
|
|
291 |
Color theBackColor = vp.getBackColor(); |
|
292 |
|
|
293 |
if (theBackColor == null) |
|
289 | 294 |
gTemp.setColor(Color.WHITE); |
290 | 295 |
else |
291 | 296 |
gTemp.setColor(theBackColor); |
297 |
|
|
298 |
gTemp.fillRect(0,0,getWidth(), getHeight()); |
|
299 |
grid.drawGrid(gTemp); |
|
292 | 300 |
|
293 |
gTemp.fillRect(0,0,getWidth(), getHeight()); |
|
294 | 301 |
gTemp.dispose(); |
295 |
// g.drawImage(image,0,0,null); |
|
302 |
|
|
296 | 303 |
System.out.println("Imagen con null en DESACTUALIZADO"); |
297 | 304 |
} |
298 | 305 |
g.drawImage(image,0,0,null); |
299 | 306 |
|
300 | 307 |
Graphics imgg = image.createGraphics(); |
301 |
|
|
308 |
|
|
302 | 309 |
//Se cancela el dibujado anterior |
303 | 310 |
cancelDrawing(); |
304 | 311 |
|
305 | 312 |
drawer = new Drawer(image, (Graphics2D) imgg, canceldraw); |
313 |
|
|
306 | 314 |
drawer.start(); |
307 | 315 |
//Se lanza el tread de dibujado |
308 | 316 |
timer.start(); |
... | ... | |
433 | 441 |
else |
434 | 442 |
g.setColor(theBackColor); |
435 | 443 |
g.fillRect(0, 0, viewPort.getImageWidth(), viewPort.getImageHeight()); |
436 |
|
|
444 |
grid.drawGrid(g); |
|
437 | 445 |
mapContext.draw(image, g, cancel); |
438 | 446 |
|
439 | 447 |
isCancelled = true; |
... | ... | |
648 | 656 |
public ViewPort getViewPort() { |
649 | 657 |
return vp; |
650 | 658 |
} |
659 |
public CadGrid getGrid(){ |
|
660 |
return grid; |
|
661 |
} |
|
662 |
public void setGrid(CadGrid cg){ |
|
663 |
grid=cg; |
|
664 |
} |
|
651 | 665 |
} |
Also available in: Unified diff