Revision 341 trunk/org.gvsig.app.document.layout2.app/org.gvsig.app.document.layout2.app.mainplugin/src/main/java/org/gvsig/app/project/documents/layout/FLayoutZooms.java

View differences:

FLayoutZooms.java
375 375 
            if (fframes[i] instanceof IFFrameUseFMap) {
376 376 
                IFFrameUseFMap fframe = (IFFrameUseFMap) fframes[i];
377 377 

  		




  378
  
  
    
                if (fframe.isSelected()) {


  		




  
  378
  
    
                if (fframe.isSelected() && fframe.getMapContext()!=null) {


  		




  379
  379
  
    
                    


  		




  380
  380
  
    
                    Point2D vppo1 = FLayoutUtilities.screenCoordinatesToViewportImageCoordinates(


  		




  381
  381
  
    
                        poi1, fframes[i]);


  		




  ......




  438
  438
  
    
            if (fframes[i] instanceof IFFrameUseFMap) {


  		




  439
  439
  
    
                IFFrameUseFMap fframe = (IFFrameUseFMap) fframes[i];


  		




  440
  440
  
    

  		




  441
  
  
    
                if (fframe.isSelected()) {


  		




  
  441
  
    
                if (fframe.isSelected() && fframe.getMapContext()!=null) {


  		




  442
  442
  
    

  		




  443
  443
  
    
                    double nuevoX;


  		




  444
  444
  
    
                    double nuevoY;


  		




  ......




  490
  490
  
    
        for (int i = 0; i < fframes.length; i++) {


  		




  491
  491
  
    
            if (fframes[i] instanceof IFFrameUseFMap) {


  		




  492
  492
  
    
                IFFrameUseFMap fframe = (IFFrameUseFMap) fframes[i];


  		




  493
  
  
    
                AffineTransform at = fframe.getATMap();


  		




  494
  
  
    
                if (at != null) {


  		




  495
  
  
    
                    


  		




  496
  
  
    
                    Point2D vppo1 = FLayoutUtilities.screenCoordinatesToViewportImageCoordinates(


  		




  497
  
  
    
                        p1, fframes[i]);


  		




  498
  
  
    
                    Point2D vppo2 = FLayoutUtilities.screenCoordinatesToViewportImageCoordinates(


  		




  499
  
  
    
                        p2, fframes[i]);


  		




  
  493
  
    
                if (fframe.getMapContext()!=null) {


  		




  
  494
  
    
                	AffineTransform at = fframe.getATMap();


  		




  
  495
  
    
                	if (at != null) {


  		




  500
  496
  
    

  		




  501
  
  
    
                    Point2D px1 = FLayoutFunctions.toMapPoint(vppo1, at);


  		




  502
  
  
    
                    Point2D px2 = FLayoutFunctions.toMapPoint(vppo2, at);


  		




  503
  
  
    
                    fframe.movePoints(px1, px2);


  		




  
  497
  
    
                		Point2D vppo1 = FLayoutUtilities.screenCoordinatesToViewportImageCoordinates(


  		




  
  498
  
    
                				p1, fframes[i]);


  		




  
  499
  
    
                		Point2D vppo2 = FLayoutUtilities.screenCoordinatesToViewportImageCoordinates(


  		




  
  500
  
    
                				p2, fframes[i]);


  		




  
  501
  
    

  		




  
  502
  
    
                		Point2D px1 = FLayoutFunctions.toMapPoint(vppo1, at);


  		




  
  503
  
    
                		Point2D px2 = FLayoutFunctions.toMapPoint(vppo2, at);


  		




  
  504
  
    
                		fframe.movePoints(px1, px2);


  		




  
  505
  
    
                	}


  		




  504
  506
  
    
                }


  		




  505
  507
  
    
            }


  		




  506
  508
  
    
        }


  		












Also available in:  Unified diff