extracted tesseract

Author: Severi Haverila

src/main/java/TestdroidImageRecognition.java

@@ -293,17 +293,7 @@ public void processBuilder(String[] adbCommand) {
         }
     }
 
-    /**
-     * ======================================================================================
-     * CROP IMAGE
-     * ======================================================================================
-     */
 
-    public void findAndCropImageFromScreen(String image) throws Exception {
-    	ImageRecognitionSettingsDTO settings = new ImageRecognitionSettingsDTO();
-    	settings.setCrop(true);
-    	findImageOnScreen(image, settings);
-    }
 
     /**
      * ======================================================================================
@@ -312,29 +302,17 @@ public void findAndCropImageFromScreen(String image) throws Exception {
      */
 
     public String grabText(String image) throws Exception {
-        findAndCropImageFromScreen(image);
-        String imageInput = screenshotsFolder + getScreenshotsCounter() + "_" + image + "_screenshot" + getRetryCounter() + "_" + timeDifferenceStartTest + "sec" + ".png";
-        String[] tesseractCommand = {"tesseract", imageInput, "stdout"};
-        String value = "";
-        try {
-            ProcessBuilder p = new ProcessBuilder(tesseractCommand);
-            Process proc = p.start();
-            InputStream stdin = proc.getInputStream();
-            InputStreamReader isr = new InputStreamReader(stdin);
-            BufferedReader br = new BufferedReader(isr);
-            String line;
-            String[] size = null;
-            String[] splitLines;
-            while ((line = br.readLine()) != null) {
-                value += line;
-            }
-
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-        return value;
+    	ImageRecognitionSettingsDTO settings = new ImageRecognitionSettingsDTO();
+    	settings.setCrop(true);
+    	ImageSearchDTO imageSearch = findImageOnScreen2(image, settings);
+    	
+        String imageInput = imageSearch.getScreenshotFile();
+        return ImageRecognition.getTextStringFromImage(imageInput);
     }
 
+
+	
+
     /**
      * ======================================================================================
      * OTHER UTILITIES

src/main/java/library/ImageRecognition.java

@@ -1,5 +1,9 @@
 package library;
 
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
 import org.opencv.core.Point;
 import org.openqa.selenium.Dimension;
 import org.slf4j.Logger;
@@ -85,4 +89,30 @@ public static Point[] findImage(String image, String scene, ImageRecognitionSett
         }
 	      return null;
     }
+    
+    
+    public static String getTextStringFromImage(String imageInput) {
+		String[] tesseractCommand = {"tesseract", imageInput, "stdout"};
+        String value = "";
+        try {
+            ProcessBuilder p = new ProcessBuilder(tesseractCommand);
+            Process proc = p.start();
+            InputStream stdin = proc.getInputStream();
+            InputStreamReader isr = new InputStreamReader(stdin);
+            BufferedReader br = new BufferedReader(isr);
+            String line;
+            String[] size = null;
+            String[] splitLines;
+            while ((line = br.readLine()) != null) {
+                value += line;
+            }
+
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+        return value;
+	}
+    
+    
+    
 }