/ - Diff - Application: gvSIG desktop - gvSIG

Revision 10932

     import java.awt.image.WritableRaster;
     import java.io.File;
     import java.util.ArrayList;
     import java.util.Collection;
     import java.util.Collections;
     import java.util.Iterator;
     import java.util.List;
-...
     import com.iver.cit.gvsig.fmap.drivers.VectorialDatabaseDriver;
     import com.iver.cit.gvsig.fmap.drivers.VectorialDriver;
     import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.InfoByPoint;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.LayerCollection;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.VectorialData;
-...
     //        try
     //        {
             	boolean bNeedRecalculateCache = false;
        			///// CHEMA ComposedLayer
     		    long tg1 = System.currentTimeMillis();
     			ComposedLayer group = null;
     			ArrayList pendingEvents= new ArrayList();
             	boolean fireAfterDrawEvent = true;
        			///// CHEMA ComposedLayer
     //    		while (iter.hasNext())
     //    		{
         		 for (int i=0; i < layers.size(); i++) {
-...
                         break; // M?s que nada porque las capas raster no son interrumpibles por ahora.
     //    			FLayer lyr = (FLayer) iter.next();
         			FLayer lyr = (FLayer) layers.get(i);
            			///// CHEMA ComposedLayer
         			fireAfterDrawEvent = true;
         			///// CHEMA ComposedLayer
         		/*	if (lyr instanceof FLyrVect && ((FLyrVect)lyr).isBroken()){
         				continue;
+        			}
-...
         			fmap.fireLayerDrawingEvent(beforeEvent);
             		if ((lyr.isDirty()) || (lyr.isCachingDrawnLayers() == false))
             			bNeedRecalculateCache = true;
         			if (lyr.isVisible()) {
         			        long t1 = System.currentTimeMillis();
-...
+        			        		{
         			        		//if (bNeedRecalculateCache)
         			        		// {
            			        			///// CHEMA ComposedLayer
         			        			if (group != null) {
         			        				//si tenemos un grupo pendiente de pintar, pintamos
         			        				// para que la cache sea fiable
         			        				group.draw(image, g, viewPort, cancel,scale);
         			        				fireLayerDrawingEvents(pendingEvents);
         			        				pendingEvents.clear();
         			        				group = null;
+        			        			}
            			        			///// CHEMA ComposedLayer
         			        			// Copiamos la imagen actual
         			        			BufferedImage buff = new BufferedImage(image.getWidth(), image.getHeight(), image.getType());
         			        			WritableRaster w = buff.getRaster();
-...
     	    			        			// prepareDrawing de FMap.
     	    			        			if (lyr.isDirty())
+    	    			        			{
     	    	   			        			///// CHEMA ComposedLayer
     	    			        				// Checks for draw group (ComposedLayer)
     	        			        			if (group != null) {
     	        			        				// it's going to load a cache image,
     	        			        				// the current draw isn't needed
     	        			        				fireLayerDrawingEvents(pendingEvents);
     	        			        				pendingEvents.clear();
     	        			        				group = null;
+    	        			        			}
     	           			        			///// CHEMA ComposedLayer
     	    			        				g.drawImage(lyr.getCacheImageDrawnLayers(), 0, 0, null);
     	    			        				System.err.println("Pinto con acelerado lo que hab?a antes de " + lyr.getName());
+    	    			        			}
-...
         			        	// hay que volver a dibujar.
        			        		if (lyr.isDirty() || bNeedRecalculateCache)
+       			        		{
        			        			lyr.draw(image, g, viewPort, cancel,scale);
        			        			///// CHEMA ComposedLayer
        			        			//lyr.draw(image, g, viewPort, cancel,scale);
     								///// CHEMA ComposedLayer
        			        			/*
        			        			// Checks for draw group (ComposedLayer)
        			        			if (group != null) {
        			        				//If layer can be added to the group, does it
        			        				if (group.canAdd(lyr)) {
        			        					group.add(lyr);
        			        					pendingEvents.add(new LayerDrawEvent(lyr, g, viewPort, LayerDrawEvent.LAYER_AFTER_DRAW));
        			        					fireAfterDrawEvent=false;
        			        				} else {
        			        					// draw the 'pending to draw' layer group
        		   			        			group.draw(image, g, viewPort, cancel,scale);
         			        				fireLayerDrawingEvents(pendingEvents);
         			        				pendingEvents.clear();
        		   			        			// gets a new group instance
        		   			        			group = lyr.newComposedLayer();
        		   			        			// if layer hasn't group, draws it inmediately
        		   			        			if (group == null) {
        		   			        				lyr.draw(image, g, viewPort, cancel,scale);
        		   			        			} else {
        		   			        				// add the layer to the group
        		   			        				group.add(lyr);
        	   			        					pendingEvents.add(new LayerDrawEvent(lyr, g, viewPort, LayerDrawEvent.LAYER_AFTER_DRAW));
        	   			        					fireAfterDrawEvent=false;
+       		   			        			}
+       			        				}
        			        			} else {
     	   			        			// gets a new group instance
     	   			        			group = lyr.newComposedLayer();
     	   			        			// if layer hasn't group, draws it inmediately
     	   			        			if (group == null) {
     	   			        				lyr.draw(image, g, viewPort, cancel,scale);
     	   			        			} else {
     	   			        				// adds the layer to the group
     	   			        				group.add(lyr);
        			        					pendingEvents.add(new LayerDrawEvent(lyr, g, viewPort, LayerDrawEvent.LAYER_AFTER_DRAW));
        			        					fireAfterDrawEvent=false;
+    	   			        			}
+       			        			}
        			        			///// CHEMA ComposedLayer
        			        			/*
        			        			 * (Jaume)
        			        			 * If the layer is instance of ILabelable then it may have labels.
        			        			 */
        			        			if (lyr instanceof ILabelable && ((ILabelable) lyr).isLabeled()) {
        	   			        			///// CHEMA ComposedLayer
         			        			if (group != null) {
         			        				//si tenemos un grupo pendiente de pintar, pintamos
         			        				// para que se pinten correctamente las etiquetas
         			        				group.draw(image, g, viewPort, cancel,scale);
         			        				fireLayerDrawingEvents(pendingEvents);
         			        				pendingEvents.clear();
         			        				group = null;
+        			        			}
            			        			///// CHEMA ComposedLayer
        			        				((ILabelable) lyr).drawLabels(image, g, viewPort, cancel, scale);
+       			        			}
        			        			bNeedRecalculateCache = true;
-...
         					        + (t2-t1) + " milisecs.");
         					lyr.setDirty(false);
+        			}
         			LayerDrawEvent afterEvent = new LayerDrawEvent(lyr, g, viewPort, LayerDrawEvent.LAYER_AFTER_DRAW);
         			fmap.fireLayerDrawingEvent(afterEvent);
         			///// CHEMA ComposedLayer
         			if (fireAfterDrawEvent) {
         			///// CHEMA ComposedLayer
         				LayerDrawEvent afterEvent = new LayerDrawEvent(lyr, g, viewPort, LayerDrawEvent.LAYER_AFTER_DRAW);
         				fmap.fireLayerDrawingEvent(afterEvent);
         			///// CHEMA ComposedLayer
+        			}
         			///// CHEMA ComposedLayer
+        		 }
         		///// CHEMA ComposedLayer
         		if (group != null) {
      				//si tenemos un grupo pendiente de pintar, pintamos
      				group.draw(image, g, viewPort, cancel,scale);
     				fireLayerDrawingEvents(pendingEvents);
+        		}
+     			}
     			///// CHEMA ComposedLayer
         		if (getVirtualLayers() != null) {
         			getVirtualLayers().draw(image, g, viewPort, cancel,scale);
+        		}
-...
     //        {
     //            System.err.println(e.getMessage());
     //        }
     			long tg2 = System.currentTimeMillis();
     			System.out.println("Draw all layer "
     			        + (tg2-tg1) + " milisecs.");
+    	}
     	private void fireLayerDrawingEvents(Collection events) {
     		Iterator iter = events.iterator();
     		LayerDrawEvent afterEvent;
     		while (iter.hasNext()) {
     			afterEvent =(LayerDrawEvent)iter.next();
     			System.out.println("+++ evento " + afterEvent.getLayer().getName());
     			fmap.fireLayerDrawingEvent(afterEvent);
+    		}
+    	}
     	/**
     	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#print(java.awt.Graphics2D,
     	 * 		com.iver.cit.gvsig.fmap.ViewPort,

     import com.iver.cit.gvsig.exceptions.layers.StartEditionLayerException;
     import com.iver.cit.gvsig.fmap.MapContext;
     import com.iver.cit.gvsig.fmap.ViewPort;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer;
     import com.iver.utiles.XMLEntity;
     import com.iver.utiles.swing.threads.Cancellable;
-...
     	public Map getExtendedProperties();
     	/**
     	 * Return a new instance of ComposedLayer.
     	 * This allow make a single draw for a group
     	 * of layers with the same source.
+    	 *
     	 * If this operation is not aplicable for this
     	 * kind of layer this method returns null.
+    	 *
     	 * @see com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer
     	 * @return ComposedLayer instance or null
     	 */
     	public ComposedLayer  newComposedLayer();
+    }

     package com.iver.cit.gvsig.fmap.layers.layerOperations;
     import java.awt.Graphics2D;
     import java.awt.image.BufferedImage;
     import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
     import com.iver.cit.gvsig.fmap.ViewPort;
     import com.iver.cit.gvsig.fmap.layers.FLayer;
     import com.iver.utiles.swing.threads.Cancellable;
     /**
      * Interface for the classes that make able
      * a single draw for a layers group
+     *
      * @see  com.iver.cit.gvsig.fmap.layers.FLayer#newComposedLayer()
      */
     public interface ComposedLayer {
     	/**
     	 * Checks if the layer can be added to this group
+    	 *
     	 * @param layer
     	 * @return layer can be added or not
     	 */
     	public boolean canAdd(FLayer layer);
     	/**
     	 * Adds the layer to the draw group
     	 * @see com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer#canAdd(FLayer)
+    	 *
     	 * @param layer
     	 * @throws Exception
     	 */
     	public void add(FLayer layer) throws Exception;
     	/**
     	 * Draws all the group in one pass
+    	 *
+    	 *
     	 * @see  com.iver.cit.gvsig.fmap.layers.FLayer#draw(BufferedImage, Graphics2D, ViewPort, Cancellable, double)
     	 */
         public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort,
     			Cancellable cancel,double scale) throws ReadDriverException;
+    }

     import com.iver.cit.gvsig.fmap.MapContext;
     import com.iver.cit.gvsig.fmap.crs.CRSFactory;
     import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer;
     import com.iver.cit.gvsig.fmap.operations.strategies.Strategy;
     import com.iver.utiles.IPersistance;
     import com.iver.utiles.XMLEntity;
-...
     		return this;
+    	}
     	/* By default this operation is not suported
+    	 *
     	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#newComposedLayer()
     	 */
     	public ComposedLayer newComposedLayer() {
     		return null;
+    	}
+    }

Also available in: Unified diff