/ - Diff - Application: gvSIG desktop - gvSIG

Revision 25953

         	if (bDrawShapes) {
         		boolean cacheFeatures = isSpatialCacheEnabled();
         		SpatialCache cache = null;
             	if (cacheFeatures) {
             		getSpatialCache().clearAll();
             		cache = getSpatialCache();
+            	}
         		if (cacheFeatures) {
         			getSpatialCache().clearAll();
         			cache = getSpatialCache();
+        		}
         		try {
         			ArrayList<String> fieldList = new ArrayList<String>();
-...
         				if (cacheFeatures) {
         					if (cache.getMaxFeatures() >= cache.size()) {
     							// already reprojected
     							cache.insert(geom.getBounds2D(), geom);
+    						}
         						// already reprojected
         						cache.insert(geom.getBounds2D(), geom);
+        					}
+        				}
         				// retrieve the symbol associated to such feature
-...
+        				}
         				if (selectionIndex!=-1) {
         					if (selectionSupport.isSelected(selectionIndex)) {
             					sym = sym.getSymbolForSelection();
+            				}
+            			}
         						sym = sym.getSymbolForSelection();
+        					}
+        				}
         				// Check if this symbol is sized with CartographicSupport
         				CartographicSupport csSym = null;
-...
         						|| sym instanceof CartographicSupport) {
         					// patch
         				    if (!sym.getClass().equals(FSymbol.class)) {
         				    	csSym = (CartographicSupport) sym;
         				    	bDrawCartographicSupport = (csSym.getUnit() != -1);
+        				    }
         					if (!sym.getClass().equals(FSymbol.class)) {
         						csSym = (CartographicSupport) sym;
         						bDrawCartographicSupport = (csSym.getUnit() != -1);
+        					}
+        				}
         				int x = -1;
-...
         				// Check if size is a pixel
         				boolean onePoint = bDrawCartographicSupport ?
         						isOnePoint(g.getTransform(), viewPort, MapContext.getScreenDPI(), csSym, geom, xyCoords) :
         						isOnePoint(g.getTransform(), viewPort, geom, xyCoords);
         							isOnePoint(g.getTransform(), viewPort, geom, xyCoords);
     					// Avoid out of bounds exceptions
     					if (onePoint) {
     						x = xyCoords[0];
     						y = xyCoords[1];
     						if (x<0 || y<0 || x>= viewPort.getImageWidth() || y>=viewPort.getImageHeight()) continue;
+    					}
         						// Avoid out of bounds exceptions
         						if (onePoint) {
         							x = xyCoords[0];
         							y = xyCoords[1];
         							if (x<0 || y<0 || x>= viewPort.getImageWidth() || y>=viewPort.getImageHeight()) continue;
+        						}
     					if (useZSort) {
     						// Check if this symbol is a multilayer
     						if (sym instanceof IMultiLayerSymbol) {
     							// if so, treat each of its layers as a single symbol
     							// in its corresponding map level
     							IMultiLayerSymbol mlSym = (IMultiLayerSymbol) sym;
     							for (int i = 0; !cancel.isCanceled() && i < mlSym.getLayerCount(); i++) {
     								ISymbol mySym = mlSym.getLayer(i);
     								int symbolLevel = zSort.getSymbolLevel(mySym);
         						if (useZSort) {
         							// Check if this symbol is a multilayer
         							if (sym instanceof IMultiLayerSymbol) {
         								// if so, treat each of its layers as a single symbol
         								// in its corresponding map level
         								IMultiLayerSymbol mlSym = (IMultiLayerSymbol) sym;
         								for (int i = 0; !cancel.isCanceled() && i < mlSym.getLayerCount(); i++) {
         									ISymbol mySym = mlSym.getLayer(i);
         									int symbolLevel = zSort.getSymbolLevel(mySym);
     								if (symbolLevel == -1) {
     									/* an error occured when managing symbol levels.
     									 * some of the legend changed events regarding the
     									 * symbols did not finish satisfactory and the legend
     									 * is now inconsistent. For this drawing, it will finish
     									 * as it was at the bottom (level 0) but, when done, the
     									 * ZSort will be reset to avoid app crashes. This is
     									 * a bug that has to be fixed.
     									 */
     									bSymbolLevelError = true;
     									symbolLevel=0;
+    								}
         									if (symbolLevel == -1) {
         										/* an error occured when managing symbol levels.
         										 * some of the legend changed events regarding the
         										 * symbols did not finish satisfactory and the legend
         										 * is now inconsistent. For this drawing, it will finish
         										 * as it was at the bottom (level 0) but, when done, the
         										 * ZSort will be reset to avoid app crashes. This is
         										 * a bug that has to be fixed.
         										 */
         										bSymbolLevelError = true;
         										symbolLevel=0;
+        									}
     								if (onePoint) {
     									if (x<0 || y<0 || x>= imageLevels[symbolLevel].getWidth() || y>=imageLevels[symbolLevel].getHeight()) continue;
     									imageLevels[symbolLevel].setRGB(x, y, mySym.getOnePointRgb());
     								} else {
     									if (!bDrawCartographicSupport) {
     										geom.drawInts(graphics[symbolLevel], viewPort, mySym, cancel);
     									} else {
     										geom.drawInts(graphics[symbolLevel], viewPort, dpi, (CartographicSupport) mySym, cancel);
+    									}
+    								}
+    							}
     						} else {
     							// else, just draw the symbol in its level
     							if (!bDrawCartographicSupport) {
     								geom.drawInts(graphics[zSort.getSymbolLevel(sym)], viewPort, sym, cancel);
     							} else {
     								geom.drawInts(graphics[zSort.getSymbolLevel(sym)], viewPort, dpi, (CartographicSupport) csSym, cancel);
+    							}
+    						}
         									if (onePoint) {
         										if (x<0 || y<0 || x>= imageLevels[symbolLevel].getWidth() || y>=imageLevels[symbolLevel].getHeight()) continue;
         										imageLevels[symbolLevel].setRGB(x, y, mySym.getOnePointRgb());
         									} else {
         										if (!bDrawCartographicSupport) {
         											geom.drawInts(graphics[symbolLevel], viewPort, mySym, cancel);
         										} else {
         											geom.drawInts(graphics[symbolLevel], viewPort, dpi, (CartographicSupport) mySym, cancel);
+        										}
+        									}
+        								}
         							} else {
         								// else, just draw the symbol in its level
         								int symbolLevel = zSort.getSymbolLevel(sym);
         								if (symbolLevel == -1) {
         									/* an error occured when managing symbol levels.
         									 * some of the legend changed events regarding the
         									 * symbols did not finish satisfactory and the legend
         									 * is now inconsistent. For this drawing, it will finish
         									 * as it was at the bottom (level 0). This is
         									 * a bug that has to be fixed.
         									 */
     //    									bSymbolLevelError = true;
         									symbolLevel=0;
+        								}
     						// -- visual FX stuff
     						// Cuando el offset!=0 se est? dibujando sobre el Layout y por tanto no tiene que ejecutar el siguiente c?digo.
     						if (offset.getX()==0 && offset.getY()==0)
     							if ((System.currentTimeMillis() - time) > screenRefreshDelay) {
     								virtualBim = new BufferedImage(image.getWidth(),image.getHeight(),BufferedImage.TYPE_INT_ARGB);
     								virtualGraphics = virtualBim.createGraphics();
     								virtualGraphics.drawImage(image,0,0, null);
     								for (int i = 0; !cancel.isCanceled() && i < imageLevels.length; i++) {
     									virtualGraphics.drawImage(imageLevels[i],0,0, null);
+    								}
     								g.clearRect(0, 0, image.getWidth(), image.getHeight());
     								g.drawImage(virtualBim, 0, 0, null);
     								time = System.currentTimeMillis();
+    							}
     						// -- end visual FX stuff
         								if (!bDrawCartographicSupport) {
         									geom.drawInts(graphics[symbolLevel], viewPort, sym, cancel);
         								} else {
         									geom.drawInts(graphics[symbolLevel], viewPort, dpi, (CartographicSupport) csSym, cancel);
+        								}
+        							}
     					} else {
     						// no ZSort, so there is only a map level, symbols are
     						// just drawn.
     						if (onePoint) {
     							if (x<0 || y<0 || x>= image.getWidth() || y>=image.getHeight()) continue;
     							image.setRGB(x, y, sym.getOnePointRgb());
     						} else {
     							if (!bDrawCartographicSupport) {
     								geom.drawInts(g, viewPort, sym, cancel);
     							} else {
     								geom.drawInts(g, viewPort, dpi, csSym, cancel);
+    							}
+    						}
+    					}
         							// -- visual FX stuff
         							// Cuando el offset!=0 se est? dibujando sobre el Layout y por tanto no tiene que ejecutar el siguiente c?digo.
         							if (offset.getX()==0 && offset.getY()==0)
         								if ((System.currentTimeMillis() - time) > screenRefreshDelay) {
         									virtualBim = new BufferedImage(image.getWidth(),image.getHeight(),BufferedImage.TYPE_INT_ARGB);
         									virtualGraphics = virtualBim.createGraphics();
         									virtualGraphics.drawImage(image,0,0, null);
         									for (int i = 0; !cancel.isCanceled() && i < imageLevels.length; i++) {
         										virtualGraphics.drawImage(imageLevels[i],0,0, null);
+        									}
         									g.clearRect(0, 0, image.getWidth(), image.getHeight());
         									g.drawImage(virtualBim, 0, 0, null);
         									time = System.currentTimeMillis();
+        								}
         							// -- end visual FX stuff
         						} else {
         							// no ZSort, so there is only a map level, symbols are
         							// just drawn.
         							if (onePoint) {
         								if (x<0 || y<0 || x>= image.getWidth() || y>=image.getHeight()) continue;
         								image.setRGB(x, y, sym.getOnePointRgb());
         							} else {
         								if (!bDrawCartographicSupport) {
         									geom.drawInts(g, viewPort, sym, cancel);
         								} else {
         									geom.drawInts(g, viewPort, dpi, csSym, cancel);
+        								}
+        							}
+        						}
+        			}
         			if (useZSort) {
         				g.drawImage(image, 0, 0, null);
     					g.translate(offset.getX(), offset.getY());
         				g.translate(offset.getX(), offset.getY());
         				for (int i = 0; !cancel.isCanceled() && i < imageLevels.length; i++) {
         					g.drawImage(imageLevels[i],0,0, null);
         					imageLevels[i] = null;
         					graphics[i] = null;
+        				}
     					g.translate(-offset.getX(), -offset.getY());
         				g.translate(-offset.getX(), -offset.getY());
         				imageLevels = null;
         				graphics = null;
+        			}

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/ZSort.java
208	208	}
209	209	}
210	210	} else {
211		// if (mySymbol.equals(layer)) {
212		// return matrix[symbols.get(layer)][0];
213		//Cuando la leyenda ha sufrido una clonaci?n, la comparaci?n de arriba no sirve.
214		//FIXME: Pero esto no es del todo bueno.
215	211	if (mySymbol.equals(layer)){
216	212	return matrix[symbols.get(mySymbol)][0];
217	213	}
...	...
325	321	}
326	322
327	323	public boolean valueChange(ValueLegendEvent e) {
328		System.out.println("log ValueLegendEvent:"+e.getOldValue()+"->"+e.getNewValue());
329	324	return false;
330	325	}
331	326

     /**
      * Abstract class that implements the interface for legends composed by
      * classified symbols.It will have two methods that will be executed
      * depending on the action that had been done with the legend (addition
      * depending on the action that had been done with the legend (addition
      * of a new symbol or clear the legend).
+     *
+     *
      * @author pepe vidal salvador - jose.vidal.salvador@iver.es
      */
     public abstract class AbstractClassifiedVectorLegend extends AbstractLegend implements IClassifiedVectorLegend {
     	private String[] fieldNames;
     	private int[] fieldTypes;
     	private ZSort zSort;
     	/**
     	 * Looks for a change in a classified symbol of a legend. To perform
     	 * it, the Array of LegendListeners is scaned and when the corresponding
-...
     	 * @param event
     	 */
     	public void fireClassifiedSymbolChangeEvent(SymbolLegendEvent event) {
     		for (int i = 0; i < getListeners().length; i++) {
     			getListeners()[i].symbolChanged(event);
     		LegendContentsChangedListener[] listeners = getListeners();
     		for (int i = 0; i < listeners.length; i++) {
     			listeners[i].symbolChanged(event);
+    		}
+    	}
     	/**
-...
     	public void setClassifyingFieldTypes(int[] fieldTypes) {
     		this.fieldTypes =  fieldTypes;
+    	}
     	public ZSort getZSort() {
     		return zSort;
+    	}
     	public void setZSort(ZSort zSort) {
     		if (zSort == null) {
     			removeLegendListener(this.zSort);
-...
     		this.zSort = zSort;
     		addLegendListener(zSort);
+    	}
     	public boolean isSuitableForShapeType(int shapeType) {
     		return getShapeType() == shapeType;
+    	}

Also available in: Unified diff