Revision 3676
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/FLayoutZooms.java | ||
---|---|---|
46 | 46 |
|
47 | 47 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameView; |
48 | 48 |
import com.iver.cit.gvsig.gui.layout.fframes.IFFrame; |
49 |
import com.iver.cit.gvsig.gui.layout.fframes.IFFrameUseFMap; |
|
49 | 50 |
|
50 | 51 |
import java.awt.Point; |
51 | 52 |
import java.awt.Toolkit; |
... | ... | |
152 | 153 |
|
153 | 154 |
rScreen.setRect(FLayoutUtilities.fromSheetRect(rSheet, |
154 | 155 |
layout.getAT())); |
156 |
IFFrame[] fframes=layout.getFFrames(); |
|
157 |
for (int i=0;i<fframes.length;i++){ |
|
158 |
if (fframes[i] instanceof FFrameView){ |
|
159 |
Point2D point1=new Point2D.Double(p2.getX()-(layout.getWidth()/2)*difw,p2.getY()-(layout.getHeight()/2)*difw); |
|
160 |
Point2D point2=new Point2D.Double(p2.getX()+(layout.getWidth()/2)*difw,p2.getY()+(layout.getHeight()/2)*difw); |
|
161 |
((FFrameView)fframes[i]).getRectView(point1,point2); |
|
162 |
} |
|
163 |
} |
|
164 |
|
|
165 |
|
|
155 | 166 |
} else { |
156 | 167 |
double wv = FLayoutUtilities.toSheetDistance(layout.getVisibleRect() |
157 | 168 |
.getWidth(), |
... | ... | |
184 | 195 |
|
185 | 196 |
rScreen.setRect(FLayoutUtilities.fromSheetRect(rSheet, |
186 | 197 |
layout.getAT())); |
198 |
|
|
199 |
IFFrame[] fframes=layout.getFFrames(); |
|
200 |
for (int i=0;i<fframes.length;i++){ |
|
201 |
if (fframes[i] instanceof FFrameView){ |
|
202 |
((FFrameView)fframes[i]).getRectView(p1,p2); |
|
203 |
} |
|
204 |
} |
|
187 | 205 |
} |
188 | 206 |
|
189 | 207 |
if (FLayoutUtilities.isPosible(rScreen)) { |
190 | 208 |
layout.getRect().setRect(rScreen); |
191 | 209 |
} |
210 |
|
|
192 | 211 |
} |
193 | 212 |
|
194 | 213 |
/** |
... | ... | |
228 | 247 |
if (FLayoutUtilities.isPosible(rScreen)) { |
229 | 248 |
layout.getRect().setRect(rScreen); |
230 | 249 |
} |
250 |
IFFrame[] fframes=layout.getFFrames(); |
|
251 |
for (int i=0;i<fframes.length;i++){ |
|
252 |
if (fframes[i] instanceof FFrameView){ |
|
253 |
Point2D point1=new Point2D.Double(p2.getX()-(layout.getWidth()/2)*difw,p2.getY()-(layout.getHeight()/2)*difw); |
|
254 |
Point2D point2=new Point2D.Double(p2.getX()+(layout.getWidth()/2)*difw,p2.getY()+(layout.getHeight()/2)*difw); |
|
255 |
((FFrameView)fframes[i]).getRectView(point1,point2); |
|
256 |
} |
|
257 |
} |
|
231 | 258 |
} |
232 | 259 |
|
233 | 260 |
/** |
... | ... | |
336 | 363 |
*/ |
337 | 364 |
public void setViewZoomIn(Point2D p1, Point2D p2) { |
338 | 365 |
for (int i = 0; i < layout.getFFrames().length; i++) { |
339 |
if (layout.getFFrame(i) instanceof FFrameView) {
|
|
340 |
FFrameView fframe = (FFrameView) layout.getFFrame(i);
|
|
366 |
if (layout.getFFrame(i) instanceof IFFrameUseFMap) {
|
|
367 |
IFFrameUseFMap fframe = (IFFrameUseFMap) layout.getFFrame(i);
|
|
341 | 368 |
|
342 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
343 |
p1 = functions.toMapPoint(p1, fframe.getAt());
|
|
344 |
p2 = functions.toMapPoint(p2, fframe.getAt());
|
|
369 |
if (((IFFrame)fframe).getSelected() != IFFrame.NOSELECT) {
|
|
370 |
p1 = functions.toMapPoint(p1, fframe.getATMap());
|
|
371 |
p2 = functions.toMapPoint(p2, fframe.getATMap());
|
|
345 | 372 |
|
346 | 373 |
// Borramos el anterior |
347 | 374 |
layout.setStatus(Layout.DESACTUALIZADO); |
... | ... | |
380 | 407 |
|
381 | 408 |
fframe.setNewExtent(r); |
382 | 409 |
} |
383 |
|
|
410 |
fframe.refresh(); |
|
384 | 411 |
// Fin del else |
385 | 412 |
//layout.repaint(); |
386 | 413 |
} |
... | ... | |
397 | 424 |
Point2D.Double pWorld; |
398 | 425 |
|
399 | 426 |
for (int i = 0; i < layout.getFFrames().length; i++) { |
400 |
if (layout.getFFrame(i) instanceof FFrameView) {
|
|
401 |
FFrameView fframe = (FFrameView) layout.getFFrame(i);
|
|
427 |
if (layout.getFFrame(i) instanceof IFFrameUseFMap) {
|
|
428 |
IFFrameUseFMap fframe = (IFFrameUseFMap) layout.getFFrame(i);
|
|
402 | 429 |
|
403 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
430 |
if (((IFFrame)fframe).getSelected() != IFFrame.NOSELECT) {
|
|
404 | 431 |
double nuevoX; |
405 | 432 |
double nuevoY; |
406 | 433 |
double cX; |
407 | 434 |
double cY; |
408 | 435 |
Point pScreen = new Point((int) p2.getX(), (int) p2.getY()); |
409 |
pWorld = functions.toMapPoint(pScreen, fframe.getAt());
|
|
436 |
pWorld = functions.toMapPoint(pScreen, fframe.getATMap());
|
|
410 | 437 |
|
411 | 438 |
cX = pWorld.getX(); |
412 | 439 |
cY = pWorld.getY(); |
... | ... | |
426 | 453 |
.getHeight() * factor; |
427 | 454 |
|
428 | 455 |
fframe.setNewExtent(r); |
429 |
|
|
456 |
fframe.refresh(); |
|
430 | 457 |
///fframe.getFMap().setCancelDrawing(false); |
431 | 458 |
} |
432 | 459 |
} |
Also available in: Unified diff