/ - Diff - | gvSIG desktop 1 - gvSIG

     import java.awt.Graphics2D;
     import java.awt.geom.AffineTransform;
     import java.awt.geom.Point2D;
     import java.awt.geom.Rectangle2D;
     import java.awt.image.BufferedImage;
     import java.util.BitSet;
-...
     	 */
     	public BitSet queryByRect(Rectangle2D rect) throws DriverException {
     		QueryByRectVisitor visitor = new QueryByRectVisitor();
     		ICoordTrans ct = getCapa().getCoordTrans();
         	if (ct != null)
+        	{
         		rect = ct.getInverted().convert(rect);
+        	}
     		visitor.setRect(rect);
     		try{
     			process(visitor);

     	private ArrayList colorListeners = new ArrayList();
     	private Point2D offset = new Point2D.Double(0, 0);
     	private Rectangle2D clip;
     	private Color backColor = Color.WHITE;
     	private Color backColor = null; //Color.WHITE;
     	private IProjection proj;
     	private double dist1pixel;
     	private double dist3pixel;

     	 */
     	public void move(MoveEvent event) {
     		ViewPort vp = mapControl.getMapContext().getViewPort();
     		System.out.println(vp);
     		// System.out.println(vp);
     		Point2D from=vp.toMapPoint(event.getFrom());
     		Point2D to=vp.toMapPoint(event.getTo());
-...
              r.height = extent.getHeight();
              vp.setExtent(r);
              mapControl.drawMap();
              // mapControl.drawMap();
+    	}

     	public void draw(BufferedImage image, Graphics2D g, Cancellable cancel)
     		throws DriverException {
     		if (viewPort.getExtent() == null) {
     			System.err.println("viewPort.getExtent() = null");
     			// System.err.println("viewPort.getExtent() = null");
     			return;
+    		}
     		System.out.println("Viewport despues: " + viewPort);
     		// System.out.println("Viewport despues: " + viewPort);
     		/* if ((viewPort.getImageWidth() <=0) || (viewPort.getImageHeight() <= 0))
+    		{
     			return;
-...
     		layers.draw(image, g, viewPort, cancel);
     		g.setColor(Color.BLUE);
     		/* g.setColor(Color.BLUE);
     		GeneralPath shpR = new GeneralPath(viewPort.getExtent());
     		shpR.transform(viewPort.getAffineTransform());
     		g.draw(shpR);
     		g.draw(shpR); */
+    	}
     	/**

     package com.iver.cit.gvsig.fmap;
     import java.awt.Color;
     import java.awt.Dimension;
     import java.awt.Graphics;
     import java.awt.Graphics2D;
-...
         private MapTool currentMapTool = null;
         private int status = ACTUALIZADO;
         private BufferedImage image = null;
         private BufferedImage backimage = null;
         private String currentTool;
         private CancelDraw canceldraw;
         private boolean isCancelled = true;
-...
             }else{
             	vp = mapContext.getViewPort();
             	// vp.setImageSize(new Dimension(getWidth(), getHeight()));
             	System.err.println("Viewport en setMapContext:" + vp);
             	// System.err.println("Viewport en setMapContext:" + vp);
+            }
             mapContext.addAtomicEventListener(mapContextListener);
-...
          * @see javax.swing.JComponent#paintComponent(java.awt.Graphics)
          */
         protected void paintComponent(Graphics g) {
         	if (image == null) return;
           if (status == ACTUALIZADO) {
             logger.debug("Dibujando la imagen obtenida");
                 if (image != null) {
                     g.drawImage(image, 0, 0,vp.getBackColor(), this);
                 } else {
             System.out.println("Dibujando la imagen obtenida" + System.currentTimeMillis());
                 /* else {
                     image = new BufferedImage(this.getWidth(), this.getHeight(),
                             BufferedImage.TYPE_INT_ARGB);
+                }
+                }
                 */
                 if (currentMapTool != null) {
                     currentMapTool.paintComponent(g);
+                }
                 /* else if (image != null) {
                     g.drawImage(image, 0, 0,vp.getBackColor(), this);
                 } */
                 if (currentMapTool != null) {
                     currentMapTool.paintComponent(g);
+                }
             } else if (status == DESACTUALIZADO) {
             	logger.debug("Obteniendo la imagen de la cartograf?a");
             	if (backimage !=null){
             	g.drawImage(backimage,0,0,vp.getBackColor(),this);
+            	}
             	image = new BufferedImage(this.getWidth(), this.getHeight(),
                             BufferedImage.TYPE_INT_ARGB);
                 g.setColor(vp.getBackColor());
                 g.fillRect(0, 0, getWidth(), getHeight());
                 cancelDrawing();
                 drawer = new Drawer(image, (Graphics2D) image.getGraphics(),
                 if (image != null)
+                {
                 	drawer = new Drawer(image, (Graphics2D) image.getGraphics(),
                         canceldraw);
                 drawer.start();
                 timer.start();
                 status = ACTUALIZADO;
                 	drawer.start();
                 	timer.start();
                 	status = ACTUALIZADO;
+                }
+            }
+        }
-...
          */
         public void drawMap() {
             status = DESACTUALIZADO;
             vp.setImageSize(new Dimension(getWidth(), getHeight()));
             backimage=new BufferedImage(this.getWidth(), this.getHeight(),
                     BufferedImage.TYPE_INT_ARGB);
             backimage.setRGB(2,4,5);
             repaint();
+        }
-...
          * @see java.awt.event.ComponentListener#componentResized(java.awt.event.ComponentEvent)
          */
         public void componentResized(ComponentEvent e) {
             vp.setImageSize(new Dimension(getWidth(), getHeight()));
         	image = new BufferedImage(this.getWidth(), this.getHeight(),
                     BufferedImage.TYPE_INT_ARGB);
             image.getGraphics().setColor(vp.getBackColor());
             image.getGraphics().fillRect(0, 0, getWidth(), getHeight());
             drawMap();
+        }
-...
                 this.g = g;
                 this.image = image;
                 this.cancel = cancel;
+            }
             /**
-...
             public void run() {
                 try {
                     synchronized (Drawer.class) {
                         mapContext.draw(image, (Graphics2D) image.getGraphics(),
                             cancel);
                         timer.stop();

             // jToolBar1.add(jTextField1);
     		m_MapControl = new NewMapControl();
     		m_MapControl.setBackground(new Color(255, 255, 255));
     		m_MapControl.getMapContext().getViewPort().setBackColor(Color.RED);
     		m_MapControl.addMouseListener(new MouseAdapter() {
     				public void mousePressed(MouseEvent e) {
     					/* if (m_MapControl.getTool() == MapControl.INFO) {

| gvSIG desktop 1

Revision 980