crop functionality fixed

Author: Severi Haverila

src/main/java/dtos/ImageLocation.java

@@ -4,7 +4,10 @@
 
 public class ImageLocation {
 
-	public ImageLocation(){}
+	public ImageLocation(){
+		this.scaleFactor=1;
+		this.resizeFactor=1;
+	}
 
 
 	public Point getTopLeft() {
@@ -47,6 +50,8 @@ public void setCenter(Point center) {
 	}
 
 	public void divideCoordinatesBy(int i) {
+		this.scaleFactor=i;
+		
 		this.topLeft.x = this.topLeft.x/i;
 		this.topLeft.y = this.topLeft.y/i;
 
@@ -71,11 +76,23 @@ public double getHeight(){
 		return this.bottomLeft.y-this.topLeft.y;
 	}
 
+	public int getScaleFactor(){
+		return this.scaleFactor;
+	}
+	
+	public void setResizeFactor(double resizeFactor) {
+		this.resizeFactor=resizeFactor;
+	}
+	public double getResizeFactor(){
+		return this.resizeFactor;
+	}
 
 
 	private Point topLeft;
 	private Point topRight;
 	private Point bottomLeft;
 	private Point bottomRight;
 	private Point center;
+	private int scaleFactor;
+	private double resizeFactor;
 }

src/main/java/library/AkazeImageFinder.java

@@ -26,7 +26,6 @@
 public class AkazeImageFinder {
 
     private static final Logger logger = LoggerFactory.getLogger(AkazeImageFinder.class);
-    double lastResizeFactor; //TODO Severi remove this
 
     public double getSceneHeight(String sceneFile) {
         Mat img_scene = Highgui.imread(sceneFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
@@ -64,9 +63,9 @@ public ImageLocation findImage(String queryImageFile, String sceneFile, double t
             Highgui.imwrite(sceneFile, resized_img_scene);
             img_scene = Highgui.imread(sceneFile, Highgui.CV_LOAD_IMAGE_UNCHANGED);
             logger.info("Image was resized, resize factor is: " + resizeFactor);
-            lastResizeFactor = resizeFactor;
-        } else
-            resizeFactor = 1;
+        } else{
+        	resizeFactor = 1;        	
+        }
 
         String jsonResults = null;
         try {
@@ -240,6 +239,7 @@ public ImageLocation findImage(String queryImageFile, String sceneFile, double t
         location.setBottomRight(points[2]);
         location.setBottomLeft(points[3]);
         location.setCenter(centerOriginal);
+        location.setResizeFactor(resizeFactor);
 
         return location;
     }
@@ -250,19 +250,15 @@ public void cropImage(ImageSearchDTO imageDto) {
     	double width = imageDto.getImageLocation().getWidth();
     	double height = imageDto.getImageLocation().getHeight();
     	String scene_filename = imageDto.getScreenshotFile();
-    	
-    	log("x: "+x);
-    	log("y: "+y);
-    	log("width:"+width);
-    	log("height: "+height);
-    	log("lastResizeFactor: "+lastResizeFactor);
+    	int scaleFactor = imageDto.getImageLocation().getScaleFactor();
+    	double resizeFactor = imageDto.getImageLocation().getResizeFactor();
 
         Mat img_object = Highgui.imread(scene_filename);
 
-        int x_resized = (int) (x / lastResizeFactor);
-		int y_resized = (int) (y / lastResizeFactor);
-		int width_resized = (int) (width / lastResizeFactor);
-		int height_resized = (int) (height / lastResizeFactor);
+		int x_resized = (int) (x / resizeFactor)*scaleFactor;
+		int y_resized = (int) (y / resizeFactor)*scaleFactor;
+		int width_resized = (int) (width / resizeFactor)*scaleFactor;
+		int height_resized = (int) (height / resizeFactor)*scaleFactor;
 		Rect croppedRect = new Rect(x_resized, y_resized, width_resized, height_resized);
         log(img_object.toString());
         log(croppedRect.toString());

src/test/java/AndroidSample.java

@@ -55,7 +55,7 @@ public void mainPageTest() throws Exception {
 
         AppiumCommons.hideKeyboard(driver);
 
-        findImageOnScreen("bitbar_logo.png");
+        findAndCropImage("test.png");
         log("Success.");
     }
 }