Changeset 11539 in josm for trunk

Timestamp:

2017-02-04T16:19:52+01:00 (8 years ago)

Author:

Don-vip

Message:

add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) (15 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplayTest.java (added)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -166 +166 @@
             if (e.getWhen() - lastTimeForMousePoint > 1500 || mousePointInImg == null) {
                 lastTimeForMousePoint = e.getWhen();
-                mousePointInImg = comp2imgCoord(visibleRect, e.getX(), e.getY());
+                mousePointInImg = comp2imgCoord(visibleRect, e.getX(), e.getY(), getSize());
             }
 
@@ -199 +199 @@
 
             // Set the position of the visible rectangle, so that the mouse cursor doesn't move on the image.
-            Rectangle drawRect = calculateDrawImageRectangle(visibleRect);
+            Rectangle drawRect = calculateDrawImageRectangle(visibleRect, getSize());
             visibleRect.x = mousePointInImg.x + ((drawRect.x - e.getX()) * visibleRect.width) / drawRect.width;
             visibleRect.y = mousePointInImg.y + ((drawRect.y - e.getY()) * visibleRect.height) / drawRect.height;
@@ -235 +235 @@
 
             // Calculate the translation to set the clicked point the center of the view.
-            Point click = comp2imgCoord(visibleRect, e.getX(), e.getY());
+            Point click = comp2imgCoord(visibleRect, e.getX(), e.getY(), getSize());
             Point center = getCenterImgCoord(visibleRect);
 
@@ -273 +273 @@
 
             if (e.getButton() == DRAG_BUTTON) {
-                mousePointInImg = comp2imgCoord(visibleRect, e.getX(), e.getY());
+                mousePointInImg = comp2imgCoord(visibleRect, e.getX(), e.getY(), getSize());
                 mouseIsDragging = true;
                 selectedRect = null;
             } else if (e.getButton() == ZOOM_BUTTON) {
-                mousePointInImg = comp2imgCoord(visibleRect, e.getX(), e.getY());
+                mousePointInImg = comp2imgCoord(visibleRect, e.getX(), e.getY(), getSize());
                 checkPointInVisibleRect(mousePointInImg, visibleRect);
                 mouseIsDragging = false;
@@ -310 +310 @@
 
             if (mouseIsDragging) {
-                Point p = comp2imgCoord(visibleRect, e.getX(), e.getY());
+                Point p = comp2imgCoord(visibleRect, e.getX(), e.getY(), getSize());
                 visibleRect.x += mousePointInImg.x - p.x;
                 visibleRect.y += mousePointInImg.y - p.y;
@@ -322 +322 @@
 
             } else if (selectedRect != null) {
-                Point p = comp2imgCoord(visibleRect, e.getX(), e.getY());
+                Point p = comp2imgCoord(visibleRect, e.getX(), e.getY(), getSize());
                 checkPointInVisibleRect(p, visibleRect);
                 Rectangle rect = new Rectangle(
@@ -432 +432 @@
     }
 
+    /**
+     * Constructs a new {@code ImageDisplay}.
+     */
     public ImageDisplay() {
         ImgDisplayMouseListener mouseListener = new ImgDisplayMouseListener();
@@ -471 +474 @@
         }
 
+        Dimension size = getSize();
         if (file == null) {
             g.setColor(Color.black);
             String noImageStr = tr("No image");
             Rectangle2D noImageSize = g.getFontMetrics(g.getFont()).getStringBounds(noImageStr, g);
-            Dimension size = getSize();
             g.drawString(noImageStr,
                     (int) ((size.width - noImageSize.getWidth()) / 2),
@@ -488 +491 @@
             }
             Rectangle2D noImageSize = g.getFontMetrics(g.getFont()).getStringBounds(loadingStr, g);
-            Dimension size = getSize();
             g.drawString(loadingStr,
                     (int) ((size.width - noImageSize.getWidth()) / 2),
                     (int) ((size.height - noImageSize.getHeight()) / 2));
         } else {
-            Rectangle target = calculateDrawImageRectangle(visibleRect);
+            Rectangle target = calculateDrawImageRectangle(visibleRect, size);
             g.drawImage(image,
                     target.x, target.y, target.x + target.width, target.y + target.height,
@@ -499 +501 @@
                     null);
             if (selectedRect != null) {
-                Point topLeft = img2compCoord(visibleRect, selectedRect.x, selectedRect.y);
+                Point topLeft = img2compCoord(visibleRect, selectedRect.x, selectedRect.y, size);
                 Point bottomRight = img2compCoord(visibleRect,
                         selectedRect.x + selectedRect.width,
-                        selectedRect.y + selectedRect.height);
+                        selectedRect.y + selectedRect.height, size);
                 g.setColor(new Color(128, 128, 128, 180));
                 g.fillRect(target.x, target.y, target.width, topLeft.y - target.y);
@@ -514 +516 @@
                 String loadingStr = tr("Error on file {0}", file.getName());
                 Rectangle2D noImageSize = g.getFontMetrics(g.getFont()).getStringBounds(loadingStr, g);
-                Dimension size = getSize();
                 g.drawString(loadingStr,
                         (int) ((size.width - noImageSize.getWidth()) / 2),
@@ -550 +551 @@
     }
 
-    private Point img2compCoord(Rectangle visibleRect, int xImg, int yImg) {
-        Rectangle drawRect = calculateDrawImageRectangle(visibleRect);
+    static Point img2compCoord(Rectangle visibleRect, int xImg, int yImg, Dimension compSize) {
+        Rectangle drawRect = calculateDrawImageRectangle(visibleRect, compSize);
         return new Point(drawRect.x + ((xImg - visibleRect.x) * drawRect.width) / visibleRect.width,
                 drawRect.y + ((yImg - visibleRect.y) * drawRect.height) / visibleRect.height);
     }
 
-    private Point comp2imgCoord(Rectangle visibleRect, int xComp, int yComp) {
-        Rectangle drawRect = calculateDrawImageRectangle(visibleRect);
+    static Point comp2imgCoord(Rectangle visibleRect, int xComp, int yComp, Dimension compSize) {
+        Rectangle drawRect = calculateDrawImageRectangle(visibleRect, compSize);
         return new Point(visibleRect.x + ((xComp - drawRect.x) * visibleRect.width) / drawRect.width,
                 visibleRect.y + ((yComp - drawRect.y) * visibleRect.height) / drawRect.height);
     }
 
-    private static Point getCenterImgCoord(Rectangle visibleRect) {
+    static Point getCenterImgCoord(Rectangle visibleRect) {
         return new Point(visibleRect.x + visibleRect.width / 2,
-                visibleRect.y + visibleRect.height / 2);
-    }
-
-    private Rectangle calculateDrawImageRectangle(Rectangle visibleRect) {
-        return calculateDrawImageRectangle(visibleRect, new Rectangle(0, 0, getSize().width, getSize().height));
+                         visibleRect.y + visibleRect.height / 2);
+    }
+
+    static Rectangle calculateDrawImageRectangle(Rectangle visibleRect, Dimension compSize) {
+        return calculateDrawImageRectangle(visibleRect, new Rectangle(0, 0, compSize.width, compSize.height));
     }
 
@@ -579 +580 @@
      */
     static Rectangle calculateDrawImageRectangle(Rectangle imgRect, Rectangle compRect) {
-        int x, y, w, h;
-        x = 0;
-        y = 0;
-        w = compRect.width;
-        h = compRect.height;
+        int x = 0;
+        int y = 0;
+        int w = compRect.width;
+        int h = compRect.height;
 
         int wFact = w * imgRect.height;
@@ -633 +633 @@
     }
 
-    private static void checkVisibleRectPos(Image image, Rectangle visibleRect) {
+    static void checkVisibleRectPos(Image image, Rectangle visibleRect) {
         if (visibleRect.x < 0) {
             visibleRect.x = 0;
@@ -648 +648 @@
     }
 
-    private static void checkVisibleRectSize(Image image, Rectangle visibleRect) {
+    static void checkVisibleRectSize(Image image, Rectangle visibleRect) {
         if (visibleRect.width > image.getWidth(null)) {
             visibleRect.width = image.getWidth(null);