Revision 23535 branches/v2_0_0_prep/extensions/extCAD/src/com/iver/cit/gvsig/layers/VectorialLayerEdited.java

View differences:

VectorialLayerEdited.java
94 94
			return;
95 95
		FeatureCollection selection=(FeatureCollection)getFeatureStore().getSelection();
96 96
		if (!selection.isEmpty() && savePrevious){
97
//		if (!selectedRow.isEmpty() && savePrevious) {
98 97
			previousRowSelection.clear();
99 98
			previousHandlerSelection.clear();
100 99
		}
......
133 132
		previousRowSelection.clear();
134 133
		previousHandlerSelection.clear();
135 134
	}
136
	/**
137
	 * @return Returns the selectedRow.
138
	 */
139
//	public IFeature[] getSelectedRowsCache() {
140
//		return (IFeature[]) selectedRow.toArray(new IFeature[0]);
141
//	}
142 135
	public void selectWithPoint(double x, double y,boolean multipleSelection){
143 136
		try {
144 137
		firstPoint = new Point2D.Double(x, y);
......
166 159
//				firstPoint.getY() - tam, tam * 2, tam * 2);
167 160
//
168 161
		String strEPSG = vp.getProjection().getAbrev();
169
		selection.clear();
162
//		selection.clear();
170 163
		BufferedImage selectionImage = new BufferedImage(vp.getImageWidth(), vp.getImageHeight(), BufferedImage.TYPE_INT_ARGB);
171 164
		Graphics2D gs = selectionImage.createGraphics();
172 165
		BufferedImage handlersImage = new BufferedImage(vp.getImageWidth(), vp.getImageHeight(), BufferedImage.TYPE_INT_ARGB);
......
207 200
					doc.setGraphics(gs);
208 201
					doc.setViewPort(vp);
209 202
					doc.setSymbol(DefaultCADTool.selectionSymbol);
210
					geomReproject.invokeOperation(Draw.CODE,doc);//cloneGeometry().draw(gs, vp, DefaultCADTool.selectionSymbol);
211 203
					drawHandlers(geomReproject.cloneGeometry(),gh,vp);
204
					geomReproject.invokeOperation(Draw.CODE,doc);//cloneGeometry().draw(gs, vp, DefaultCADTool.selectionSymbol);
205

  
212 206
				}
213 207
//			}
214 208
			setSelectionImage(selectionImage);
......
262 256
			BufferedImage handlersImage = new BufferedImage(vp.getImageWidth(), vp.getImageHeight(), BufferedImage.TYPE_INT_ARGB);
263 257
			Graphics2D gh = handlersImage.createGraphics();
264 258
			ICoordTrans ct=getLayer().getCoordTrans();
265
			Iterator iterator=featureStore.getDataCollection(featureStore.getDefaultFeatureType(),rect.toString(),null).iterator();
259
			Envelope envelope=new DefaultEnvelope(rect.getX(),rect.getY(),rect.getMaxX(),rect.getMaxY());
260
			Iterator iterator=((FLyrVect)getLayer()).queryByEnvelope(envelope,featureStore.getDefaultFeatureType()).iterator();
266 261
			DrawOperationContext doc=new DrawOperationContext();
267 262
			doc.setGraphics(gs);
268 263
			doc.setViewPort(vp);
......
331 326
//		}
332 327
		ViewPort vp=getLayer().getMapContext().getViewPort();
333 328

  
334
		Rectangle2D rect = polygon.getBounds2D();
329
		Envelope envelope = polygon.getEnvelope();
335 330

  
336 331
		String strEPSG = vp.getProjection().getAbrev();
337 332
		BufferedImage selectionImage = new BufferedImage(vp.getImageWidth(), vp.getImageHeight(), BufferedImage.TYPE_INT_ARGB);
......
339 334
		BufferedImage handlersImage = new BufferedImage(vp.getImageWidth(), vp.getImageHeight(), BufferedImage.TYPE_INT_ARGB);
340 335
		Graphics2D gh = handlersImage.createGraphics();
341 336
		ICoordTrans ct=getLayer().getCoordTrans();
342
		Iterator iterator=featureStore.getDataCollection(featureStore.getDefaultFeatureType(),rect.toString(),null).iterator();
337
//		Envelope envelope=new DefaultEnvelope(rect.getX(),rect.getY(),rect.getMaxX(),rect.getMaxY());
338
		Iterator iterator=((FLyrVect)getLayer()).queryByEnvelope(envelope,featureStore.getDefaultFeatureType()).iterator();
343 339
		DrawOperationContext doc=new DrawOperationContext();
344 340
		doc.setGraphics(gs);
345 341
		doc.setViewPort(vp);
......
401 397
		BufferedImage handlersImage = new BufferedImage(vp.getImageWidth(), vp.getImageHeight(), BufferedImage.TYPE_INT_ARGB);
402 398
		Graphics2D gh = handlersImage.createGraphics();
403 399
		ICoordTrans ct=getLayer().getCoordTrans();
404
		Iterator iterator=featureStore.getDataCollection(featureStore.getDefaultFeatureType(),rect.toString(),null).iterator();
400
		Envelope envelope=new DefaultEnvelope(rect.getX(),rect.getY(),rect.getMaxX(),rect.getMaxY());
401
		Iterator iterator=((FLyrVect)getLayer()).queryByEnvelope(envelope,featureStore.getDefaultFeatureType()).iterator();
405 402

  
406 403
		DrawOperationContext doc=new DrawOperationContext();
407 404
		doc.setGraphics(gs);
......
464 461
		BufferedImage handlersImage = new BufferedImage(vp.getImageWidth(), vp.getImageHeight(), BufferedImage.TYPE_INT_ARGB);
465 462
		Graphics2D gh = handlersImage.createGraphics();
466 463
		ICoordTrans ct=getLayer().getCoordTrans();
467
		Iterator iterator=featureStore.getDataCollection(featureStore.getDefaultFeatureType(),rect.toString(),null).iterator();
464
		Envelope envelope=new DefaultEnvelope(rect.getX(),rect.getY(),rect.getMaxX(),rect.getMaxY());
465
		Iterator iterator=((FLyrVect)getLayer()).queryByEnvelope(envelope,featureStore.getDefaultFeatureType()).iterator();
468 466

  
469 467
		DrawOperationContext doc=new DrawOperationContext();
470 468
		doc.setGraphics(gs);
......
689 687
				}
690 688
				drawHandlers(geom.cloneGeometry(), gh, vp);
691 689
			}
692
//			vea.setSelectionImage(selectionImage);
693
//			vea.setHandlersImage(handlersImage);
690
			setSelectionImage(selectionImage);
691
			setHandlersImage(handlersImage);
694 692
		}
695 693
	}
696 694

  

Also available in: Unified diff