Changeset 12438 in osm for applications/editors/josm/plugins

Timestamp:

2008-12-20T14:55:53+01:00 (16 years ago)

Author:

stoecker

Message:

fixed image shifting

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• GeorefImage.java (modified) (2 diffs)
• WMSAdjustAction.java (modified) (4 diffs)
• WMSLayer.java (modified) (4 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/GeorefImage.java

@@ -23 +23 @@
         }
 
-        public void displace(double dx, double dy) {
-                min = new EastNorth(min.east() + dx, min.north() + dy);
-                max = new EastNorth(max.east() + dx, max.north() + dy);
+        public boolean contains(EastNorth en, double dx, double dy) {
+                return min.east()+dx <= en.east() && en.east() <= max.east()+dx
+                        && min.north()+dy <= en.north() && en.north() <= max.north()+dy;
         }
 
-        public boolean contains(EastNorth en) {
-                return min.east() <= en.east() && en.east() <= max.east()
-                        && min.north() <= en.north() && en.north() <= max.north();
-        }
-
+        /* this does not take dx and dy offset into account! */
         public boolean isVisible(NavigatableComponent nc) {
                 Point minPt = nc.getPoint(min), maxPt = nc.getPoint(max);
@@ -41 +37 @@
         }
 
-        public boolean paint(Graphics g, NavigatableComponent nc) {
+        public boolean paint(Graphics g, NavigatableComponent nc, double dx, double dy) {
                 if (image == null || min == null || max == null) return false;
 
-                Point minPt = nc.getPoint(min), maxPt = nc.getPoint(max);
+                EastNorth mi = new EastNorth(min.east()+dx, min.north()+dy);
+                EastNorth ma = new EastNorth(max.east()+dx, max.north()+dy);
+                Point minPt = nc.getPoint(mi), maxPt = nc.getPoint(ma);
 
-                if(!isVisible(nc))
+                /* this is isVisible() but taking dx, dy into account */
+                if(!(g.hitClip(minPt.x, maxPt.y,
+                                maxPt.x - minPt.x, minPt.y - maxPt.y)))
                         return false;
 

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java

@@ -20 +20 @@
 
         GeorefImage selectedImage;
+        WMSLayer selectedLayer;
         boolean mouseDown;
         EastNorth prevEastNorth;
@@ -48 +49 @@
                         if (layer.visible && layer instanceof WMSLayer) {
                                 prevEastNorth=Main.map.mapView.getEastNorth(e.getX(),e.getY());
-                                selectedImage = ((WMSLayer)layer).findImage(prevEastNorth);
+                                selectedLayer = ((WMSLayer)layer);
+                                selectedImage = selectedLayer.findImage(prevEastNorth);
                                 if(selectedImage!=null){
                                         Main.map.mapView.setCursor
@@ -66 +68 @@
                         EastNorth eastNorth=
                                         Main.map.mapView.getEastNorth(e.getX(),e.getY());
-                        if(selectedImage.contains(eastNorth)) {
-                                selectedImage.displace(eastNorth.east()-prevEastNorth.east(), 
-                                                                        eastNorth.north()-prevEastNorth.north());
-                                prevEastNorth = eastNorth;
-                        }
+                        selectedLayer.displace(eastNorth.east()-prevEastNorth.east(), 
+                                eastNorth.north()-prevEastNorth.north());
+                        prevEastNorth = eastNorth;
                         Main.map.mapView.repaint();
                 }
@@ -79 +79 @@
                 Main.map.mapView.setCursor(Cursor.getDefaultCursor());
                 selectedImage = null;   
+                prevEastNorth = null;
+                selectedLayer = null;
         }
 

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -56 +56 @@
         protected int day = 10;
         protected int minZoom = 3;
+        protected double dx = 0.0;
+        protected double dy = 0.0;
         protected double pixelPerDegree;
         protected GeorefImage[][] images = new GeorefImage[dax][day];
@@ -143 +145 @@
                         for(int x = 0; x<dax; ++x)
                                 for(int y = 0; y<day; ++y)
-                                        images[modulo(x,dax)][modulo(y,day)].paint(g, mv);
+                                        images[modulo(x,dax)][modulo(y,day)].paint(g, mv, dx, dy);
                 } else
                         downloadAndPaintVisible(g, mv);
+        }
+
+        public void displace(double dx, double dy) {
+                this.dx += dx;
+                this.dy += dy;
         }
 
@@ -162 +169 @@
                         for(int y = bminy; y<bmaxy; ++y){
                                 GeorefImage img = images[modulo(x,dax)][modulo(y,day)];
-                                if(!img.paint(g, mv) && !img.downloadingStarted){
-                                        //System.out.println(tr("------{0}|{1}|{2}|{3}", modulo(x,dax), modulo(y,day), img.downloadingStarted, img.isVisible(mv)));
+                                if(!img.paint(g, mv, dx, dy) && !img.downloadingStarted){
                                         img.downloadingStarted = true;
                                         img.image = null;
@@ -205 +211 @@
                         for(int y = 0; y<day; ++y)
                                         if(images[x][y].image!=null && images[x][y].min!=null && images[x][y].max!=null)
-                                                if(images[x][y].contains(eastNorth))
+                                                if(images[x][y].contains(eastNorth, dx, dy))
                                                         return images[x][y];
                 return null;