From dda2954b2c50e937167cfb1b149e19c2b89c4bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Maneiro?= Date: Thu, 8 Mar 2012 18:27:59 +0100 Subject: [PATCH 2/2] gvsig-desktop refs #416 Clean codebase --- .../com/iver/cit/gvsig/fmap/layers/FLyrVect.java | 328 ++++---------------- 1 files changed, 54 insertions(+), 274 deletions(-) diff --git a/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrVect.java b/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrVect.java index b533097..7f8e1f5 100644 --- a/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrVect.java +++ b/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrVect.java @@ -55,7 +55,6 @@ import javax.print.attribute.standard.PrintQuality; import org.apache.log4j.Logger; import org.cresques.cts.ICoordTrans; -import org.gvsig.exceptions.BaseException; import org.gvsig.tools.file.PathGenerator; import com.hardcode.gdbms.driver.exceptions.ReadDriverException; @@ -88,7 +87,6 @@ import com.iver.cit.gvsig.fmap.drivers.IFeatureIterator; import com.iver.cit.gvsig.fmap.drivers.IVectorialDatabaseDriver; import com.iver.cit.gvsig.fmap.drivers.VectorialDriver; import com.iver.cit.gvsig.fmap.drivers.WithDefaultLegend; -import com.iver.cit.gvsig.fmap.drivers.featureiterators.DefaultFeatureIterator; import com.iver.cit.gvsig.fmap.drivers.featureiterators.JoinFeatureIterator; import com.iver.cit.gvsig.fmap.edition.AfterFieldEditEvent; import com.iver.cit.gvsig.fmap.edition.AfterRowEditEvent; @@ -124,7 +122,6 @@ import com.iver.cit.gvsig.fmap.rendering.SymbolLegendEvent; import com.iver.cit.gvsig.fmap.rendering.ZSort; import com.iver.cit.gvsig.fmap.rendering.styling.labeling.AttrInTableLabelingStrategy; import com.iver.cit.gvsig.fmap.rendering.styling.labeling.ILabelingStrategy; -import com.iver.cit.gvsig.fmap.rendering.styling.labeling.LabelClass; import com.iver.cit.gvsig.fmap.rendering.styling.labeling.LabelingFactory; import com.iver.cit.gvsig.fmap.spatialindex.IPersistentSpatialIndex; import com.iver.cit.gvsig.fmap.spatialindex.ISpatialIndex; @@ -145,19 +142,11 @@ import com.iver.utiles.swing.threads.CancellableMonitorable; * @author Fernando González Cortés */ -// TODO Cuando no sea para pruebas debe no ser public public class FLyrVect extends FLyrDefault implements ILabelable, ClassifiableVectorial, SingleLayer, VectorialData, RandomVectorialData, AlphanumericData, InfoByPoint, SelectionListener, IEditionListener, LegendContentsChangedListener { - private static Logger logger = Logger.getLogger(FLyrVect.class.getName()); - /** - * @deprecated Don´t use Strategy, you should be use iterators. - */ -// public static boolean forTestOnlyVariableUseIterators_REMOVE_THIS_FIELD = true; - /** - * @deprecated Don´t use Strategy, you should be use iterators. - */ -// private boolean useStrategy=false; + + private static Logger logger = Logger.getLogger(FLyrVect.class.getName()); /** Leyenda de la capa vectorial */ private IVectorLegend legend; @@ -628,8 +617,6 @@ public class FLyrVect extends FLyrDefault implements ILabelable, public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort, Cancellable cancel, double scale) throws ReadDriverException { -// forTestOnlyVariableUseIterators_REMOVE_THIS_FIELD = true; -// if (!isUseStrategy()) { if (isWaitTodraw()) { return; } @@ -639,178 +626,10 @@ public class FLyrVect extends FLyrDefault implements ILabelable, else { _draw(image, g, viewPort, cancel, scale); } -// } else { -//// moved up to FLayers -//// if (isWithinScale(scale)) { -// -// -// // Las que solo tienen etiquetado sin pintar el shape, -// // no pasamos por ellas -// boolean bDrawShapes = true; -// if (legend instanceof SingleSymbolLegend) { -// if (legend.getDefaultSymbol().isShapeVisible() == false) -// bDrawShapes = false; -// } -// if (bDrawShapes) { -// Strategy strategy = StrategyManager.getStrategy(this); -// try { -// prepareDrawing(image, g, viewPort); -// strategy.draw(image, g, viewPort, cancel); -// } catch (ReadDriverException e) { -// this.setVisible(false); -// this.setActive(false); -// throw e; -// } -// } -// if (getVirtualLayers() != null) { -// getVirtualLayers().draw(image, g, viewPort, cancel, scale); -// } -//// } -// } - } - - /** - * Se llama antes de empezar a pintar. - * Es útil para preparar la cache a emplear, las leyendas, etc. - * @param image - * @param g - * @param viewPort - */ - private void prepareDrawing(BufferedImage image, Graphics2D g, ViewPort viewPort) { - } public void _print(Graphics2D g, ViewPort viewPort, Cancellable cancel, double scale, PrintRequestAttributeSet properties) throws ReadDriverException { - // TEST METHOD - - - /* SVN */ - - /* boolean bDrawShapes = true; - if (legend instanceof SingleSymbolLegend) { - bDrawShapes = legend.getDefaultSymbol().isShapeVisible(); - } - - - if (bDrawShapes) { - double dpi = 72; - - PrintQuality resolution=(PrintQuality)properties.get(PrintQuality.class); - if (resolution.equals(PrintQuality.NORMAL)){ - dpi = 300; - } else if (resolution.equals(PrintQuality.HIGH)){ - dpi = 600; - } else if (resolution.equals(PrintQuality.DRAFT)){ - dpi = 72; - } - - - try { - prepareDrawing(null, g, viewPort); - ArrayList fieldList = new ArrayList(); - String[] aux; - - // fields from legend - if (legend instanceof IClassifiedVectorLegend) { - aux = ((IClassifiedVectorLegend) legend). - getClassifyingFieldNames(); - for (int i = 0; i < aux.length; i++) { - fieldList.add(aux[i]); - } - } - - // fields from labeling - if (isLabeled()) { - aux = getLabelingStrategy().getUsedFields(); - for (int i = 0; i < aux.length; i++) { - fieldList.add(aux[i]); - } - } - - ZSort zSort = ((IVectorLegend) getLegend()).getZSort(); - - // if layer has map levels it will use a ZSort - boolean useZSort = zSort != null && zSort.isUsingZSort(); - - - int mapLevelCount = (useZSort) ? zSort.getLevelCount() : 1; - for (int mapPass = 0; mapPass < mapLevelCount; mapPass++) { - // Get the iterator over the visible features - IFeatureIterator it = getSource().getFeatureIterator( - viewPort.getAdjustedExtent(), - fieldList.toArray(new String[fieldList.size()]), - viewPort.getProjection(), - true); - - // Iteration over each feature - while ( !cancel.isCanceled() && it.hasNext()) { - IFeature feat = it.next(); - IGeometry geom = feat.getGeometry(); - - // retreive the symbol associated to such feature - ISymbol sym = legend.getSymbolByFeature(feat); - - if (useZSort) { - // Check if this symbol is a multilayer - if (sym instanceof IMultiLayerSymbol) { - // if so, get the layer corresponding to the current - // level. If none, continue to next iteration - IMultiLayerSymbol mlSym = (IMultiLayerSymbol) sym; - for (int i = 0; i < mlSym.getLayerCount(); i++) { - ISymbol mySym = mlSym.getLayer(i); - if (zSort.getSymbolLevel(mySym) == mapPass) { - sym = mySym; - break; - } - System.out.println("avoided layer "+i+"of symbol '"+mlSym.getDescription()+"' (pass "+mapPass+")"); - } - - if (sym == null) { - continue; - } - } else { - // else, just draw the symbol in its level - if (zSort.getSymbolLevel(sym) != mapPass) { - System.out.println("avoided single layer symbol '"+sym.getDescription()+"' (pass "+mapPass+")"); - continue; - } - } - } - - // Check if this symbol is sized with CartographicSupport - CartographicSupport csSym = null; - int symbolType = sym.getSymbolType(); - boolean bDrawCartographicSupport = false; - - if ( symbolType == FShape.POINT - || symbolType == FShape.LINE - || sym instanceof CartographicSupport) { - - csSym = (CartographicSupport) sym; - bDrawCartographicSupport = (csSym.getUnit() != -1); - } - - System.err.println("passada "+mapPass+" pinte símboll "+sym.getDescription()); - - if (!bDrawCartographicSupport) { - geom.drawInts(g, viewPort, sym, null); - } else { - geom.drawInts(g, viewPort, dpi, (CartographicSupport) csSym); - } - - } - it.closeIterator(); - } - } catch (ReadDriverException e) { - this.setVisible(false); - this.setActive(false); - throw e; - } - */ - - - // TEST METHOD boolean bDrawShapes = true; if (legend instanceof SingleSymbolLegend) { bDrawShapes = legend.getDefaultSymbol().isShapeVisible(); @@ -835,20 +654,19 @@ public class FLyrVect extends FLyrDefault implements ILabelable, // fields from legend if (legend instanceof IClassifiedVectorLegend) { - aux = ((IClassifiedVectorLegend) legend). - getClassifyingFieldNames(); + aux = ((IClassifiedVectorLegend) legend).getClassifyingFieldNames(); for (int i = 0; i < aux.length; i++) { fieldList.add(aux[i]); } } -// -// // fields from labeling -// if (isLabeled()) { -// aux = getLabelingStrategy().getUsedFields(); -// for (int i = 0; i < aux.length; i++) { -// fieldList.add(aux[i]); -// } -// } + // + // // fields from labeling + // if (isLabeled()) { + // aux = getLabelingStrategy().getUsedFields(); + // for (int i = 0; i < aux.length; i++) { + // fieldList.add(aux[i]); + // } + // } ZSort zSort = ((IVectorLegend) getLegend()).getZSort(); @@ -859,23 +677,23 @@ public class FLyrVect extends FLyrDefault implements ILabelable, int mapLevelCount = (useZSort) ? zSort.getLevelCount() : 1; for (int mapPass = 0; mapPass < mapLevelCount; mapPass++) { // Get the iterator over the visible features -// IFeatureIterator it = getSource().getFeatureIterator( -// viewPort.getAdjustedExtent(), -// fieldList.toArray(new String[fieldList.size()]), -// viewPort.getProjection(), -// true); - IFeatureIterator it = null; - if (isJoined()) { - it = new JoinFeatureIterator(this, viewPort, - fieldList.toArray(new String[fieldList.size()])); - } - else { - it = getSource().getFeatureIterator( - viewPort.getAdjustedExtent(), - fieldList.toArray(new String[fieldList.size()]), - viewPort.getProjection(), - true); - } + // IFeatureIterator it = getSource().getFeatureIterator( + // viewPort.getAdjustedExtent(), + // fieldList.toArray(new String[fieldList.size()]), + // viewPort.getProjection(), + // true); + IFeatureIterator it = null; + if (isJoined()) { + it = new JoinFeatureIterator(this, viewPort, + fieldList.toArray(new String[fieldList.size()])); + } + else { + it = getSource().getFeatureIterator( + viewPort.getAdjustedExtent(), + fieldList.toArray(new String[fieldList.size()]), + viewPort.getProjection(), + true); + } // Iteration over each feature while ( !cancel.isCanceled() && it.hasNext()) { @@ -885,32 +703,32 @@ public class FLyrVect extends FLyrDefault implements ILabelable, // retreive the symbol associated to such feature ISymbol sym = legend.getSymbolByFeature(feat); if (sym == null) { - continue; - } + continue; + } if (useZSort) { - int[] symLevels = zSort.getLevels(sym); - if(symLevels != null){ - // Check if this symbol is a multilayer - if (sym instanceof IMultiLayerSymbol) { - // if so, get the layer corresponding to the current - // level. If none, continue to next iteration - IMultiLayerSymbol mlSym = (IMultiLayerSymbol) sym; - for (int i = 0; i < mlSym.getLayerCount(); i++) { - ISymbol mySym = mlSym.getLayer(i); - if (symLevels[i] == mapPass) { - sym = mySym; - break; - } - System.out.println("avoided layer "+i+"of symbol '"+mlSym.getDescription()+"' (pass "+mapPass+")"); - } - } else { - // else, just draw the symbol in its level - if (symLevels[0] != mapPass) { - System.out.println("avoided single layer symbol '"+sym.getDescription()+"' (pass "+mapPass+")"); - continue; - } - } - } + int[] symLevels = zSort.getLevels(sym); + if(symLevels != null){ + // Check if this symbol is a multilayer + if (sym instanceof IMultiLayerSymbol) { + // if so, get the layer corresponding to the current + // level. If none, continue to next iteration + IMultiLayerSymbol mlSym = (IMultiLayerSymbol) sym; + for (int i = 0; i < mlSym.getLayerCount(); i++) { + ISymbol mySym = mlSym.getLayer(i); + if (symLevels[i] == mapPass) { + sym = mySym; + break; + } + System.out.println("avoided layer "+i+"of symbol '"+mlSym.getDescription()+"' (pass "+mapPass+")"); + } + } else { + // else, just draw the symbol in its level + if (symLevels[0] != mapPass) { + System.out.println("avoided single layer symbol '"+sym.getDescription()+"' (pass "+mapPass+")"); + continue; + } + } + } } // Check if this symbol is sized with CartographicSupport @@ -924,7 +742,7 @@ public class FLyrVect extends FLyrDefault implements ILabelable, csSym = (CartographicSupport) sym; } -// System.err.println("passada "+mapPass+" pinte símboll "+sym.getDescription()); + //System.err.println("passada "+mapPass+" pinte símboll "+sym.getDescription()); if (csSym == null) { geom.drawInts(g, viewPort, sym, null); @@ -946,23 +764,9 @@ public class FLyrVect extends FLyrDefault implements ILabelable, public void print(Graphics2D g, ViewPort viewPort, Cancellable cancel, double scale, PrintRequestAttributeSet properties) throws ReadDriverException { -// if (forTestOnlyVariableUseIterators_REMOVE_THIS_FIELD) { if (isVisible() && isWithinScale(scale)) { _print(g, viewPort, cancel, scale, properties); } -// } else { -//// moved up to Flayers -//// if (isVisible() && isWithinScale(scale)) { -// Strategy strategy = StrategyManager.getStrategy(this); -// -// strategy.print(g, viewPort, cancel, properties); -// ILabelingStrategy labeling; -// if ( (labeling = getLabelingStrategy() ) != null) { -// // contains labels -// labeling.print(g, viewPort, cancel, properties); -// } -//// } -// } } public void deleteSpatialIndex() { @@ -1045,7 +849,6 @@ public class FLyrVect extends FLyrDefault implements ILabelable, //request for feature iteration based in spatial queries source.setSpatialIndex(spatialIndex); } catch (ReadDriverException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } @@ -1341,10 +1144,6 @@ public class FLyrVect extends FLyrDefault implements ILabelable, String recordsetName = xml.getStringProperty("recordset-name"); -// SelectableDataSource sds = new SelectableDataSource(LayerFactory -// .getDataSourceFactory().createRandomDataSource( -// recordsetName, DataSourceFactory.AUTOMATIC_OPENING)); - LayerFactory.getDataSourceFactory().changeDataSourceName( getSource().getRecordset().getName(), recordsetName); SelectableDataSource sds = new SelectableDataSource(LayerFactory @@ -1971,7 +1770,6 @@ public class FLyrVect extends FLyrDefault implements ILabelable, try { strategy.setLayer(this); } catch (ReadDriverException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } @@ -2024,24 +1822,6 @@ public class FLyrVect extends FLyrDefault implements ILabelable, //return linkProperties.getLink(this) return linkProperties.getLink(this,point,tolerance); } -// /** -// * @deprecated Don´t use Strategy, you should be use iterators. -// */ -// public boolean isUseStrategy() { -// return useStrategy; -// } -// /** -// * @deprecated Don´t use Strategy, you should be use iterators. -// */ -// public void setUseStrategy(boolean useStrategy) { -// this.useStrategy = useStrategy; -// } -// -// @Override -// public void load() throws LoadLayerException { -// super.load(); -// useStrategy=forTestOnlyVariableUseIterators_REMOVE_THIS_FIELD; -// } public void selectionChanged(SelectionEvent e) { this.updateDrawVersion(); -- 1.7.1