Revision 40676

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.lib/org.gvsig.symbology.lib.impl/src/main/java/org/gvsig/symbology/fmap/mapcontext/rendering/legend/styling/DefaultLabelingMethod.java
45 45 
import org.gvsig.fmap.dal.feature.FeatureQuery;
46 46 
import org.gvsig.fmap.dal.feature.FeatureSet;
47 47 
import org.gvsig.fmap.dal.feature.FeatureStore;
48 
import org.gvsig.fmap.dal.feature.FeatureType;
48 49 
import org.gvsig.fmap.mapcontext.ViewPort;
49 50 
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
51 
import org.gvsig.fmap.mapcontext.layers.vectorial.IntersectsEnvelopeEvaluator;
50 52 
import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelClass;
51 53 
import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelingMethod;
52 54 
import org.gvsig.tools.ToolsLocator;
53 55 
import org.gvsig.tools.dynobject.DynStruct;
56 
import org.gvsig.tools.evaluator.Evaluator;
54 57 
import org.gvsig.tools.persistence.PersistenceManager;
55 58 
import org.gvsig.tools.persistence.PersistentState;
56 59 
import org.gvsig.tools.persistence.exception.PersistenceException;
......
104 107 
		FeatureStore featureStore=layer.getFeatureStore();
105 108 
		FeatureQuery featureQuery=featureStore.createFeatureQuery();
106 109 
		featureQuery.setAttributeNames(usedFields);
110 

  		




  
  111
  
    
		if (viewPort != null) {


  		




  
  112
  
    
			FeatureType fty = featureStore.getDefaultFeatureType(); 


  		




  
  113
  
    
			Evaluator eva = new IntersectsEnvelopeEvaluator(


  		




  
  114
  
    
					viewPort.getAdjustedEnvelope(),


  		




  
  115
  
    
					layer.getProjection(),


  		




  
  116
  
    
					fty, fty.getDefaultGeometryAttributeName());


  		




  
  117
  
    
			featureQuery.setFilter(eva);


  		




  
  118
  
    
		}


  		




  
  119
  
    

  		




  107
  120
  
    
		return (FeatureSet)featureStore.getFeatureSet(featureQuery);


  		




  108
  
  
    
//		layer.getSource().getFeatureIterator(


  		




  109
  
  
    
//					viewPort.getAdjustedExtent(), usedFields,


  		




  110
  
  
    
//					layer.getProjection(), true);


  		




  111
  121
  
    
	}


  		




  112
  122
  
    

  		




  113
  123
  
    
	public boolean definesPriorities() {


  		












Also available in:  Unified diff