Refactor

Author: nguyenq

src/main/java/net/sourceforge/tess4j/ITesseract.java

@@ -223,5 +223,5 @@ public enum RenderedFormat {
      * @return
      * @throws TesseractException
      */
-    List<Rectangle> getRegions(BufferedImage bi, int level) throws TesseractException;
+    List<Rectangle> getSegmentedRegions(BufferedImage bi, int level) throws TesseractException;
 }

src/main/java/net/sourceforge/tess4j/Tesseract.java

@@ -573,7 +573,7 @@ private void createDocuments(String filename, TessResultRenderer renderer) throw
      * @throws TesseractException
      */
     @Override
-    public List<Rectangle> getRegions(BufferedImage bi, int level) throws TesseractException {
+    public List<Rectangle> getSegmentedRegions(BufferedImage bi, int level) throws TesseractException {
         init();
         setTessVariables();
 

src/main/java/net/sourceforge/tess4j/Tesseract1.java

@@ -541,7 +541,7 @@ private void createDocuments(String filename, TessResultRenderer renderer) throw
      * @throws TesseractException
      */
     @Override
-    public List<Rectangle> getRegions(BufferedImage bi, int level) throws TesseractException {
+    public List<Rectangle> getSegmentedRegions(BufferedImage bi, int level) throws TesseractException {
         init();
         setTessVariables();
 

src/test/java/net/sourceforge/tess4j/ProgressMonitor.java

@@ -40,8 +40,8 @@ String getMessage() {
     public void run() {
         try {
             while (true) {
-                logger.error("ocr alive: " + (monitor.ocr_alive == TRUE));
-                logger.error("progress: " + monitor.progress);
+                logger.info("ocr alive: " + (monitor.ocr_alive == TRUE));
+                logger.info("progress: " + monitor.progress);
                 outputMessage.append(monitor.more_to_come);
                 if (monitor.progress >= 100) {
                     break;

src/test/java/net/sourceforge/tess4j/Tesseract1Test.java

@@ -45,6 +45,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -233,7 +236,8 @@ public void testExtendingTesseract1() throws Exception {
         int pageIteratorLevel = TessPageIteratorLevel.RIL_WORD;
         logger.info("PageIteratorLevel: "
                 + Utils.getConstantName(pageIteratorLevel, TessPageIteratorLevel.class));
-        List<Word> result = instance1.getWords(imageFile, pageIteratorLevel);
+        BufferedImage bi = ImageIO.read(imageFile);
+        List<Word> result = instance1.getWords(bi, pageIteratorLevel);
 
         // print the complete result
         for (Word word : result) {
@@ -250,13 +254,12 @@ public void testExtendingTesseract1() throws Exception {
 
     class Tess1Extension extends Tesseract1 {
 
-        public List<Word> getWords(File file, int pageIteratorLevel) {
+        public List<Word> getWords(BufferedImage bi, int pageIteratorLevel) {
             this.init();
             this.setTessVariables();
 
             List<Word> words = new ArrayList<Word>();
             try {
-                BufferedImage bi = ImageIO.read(file);
                 setImage(bi, null);
 
                 TessBaseAPIRecognize(this.getHandle(), null);
@@ -292,7 +295,7 @@ public List<Word> getWords(File file, int pageIteratorLevel) {
     }
 
     /**
-     * Test of getRegions method, of class Tesseract1.
+     * Test of getSegmentedRegions method, of class Tesseract1.
      */
     @Test
     public void testGetRegions() throws Exception {
@@ -301,7 +304,7 @@ public void testGetRegions() throws Exception {
         BufferedImage bi = ImageIO.read(imageFile);
         int level = TessPageIteratorLevel.RIL_SYMBOL;
         logger.info("PageIteratorLevel: " + Utils.getConstantName(level, TessPageIteratorLevel.class));
-        List<Rectangle> result = instance.getRegions(bi, level);
+        List<Rectangle> result = instance.getSegmentedRegions(bi, level);
         for (int i = 0; i < result.size(); i++) {
             Rectangle rect = result.get(i);
             logger.info(String.format("Box[%d]: x=%d, y=%d, w=%d, h=%d", i, rect.x, rect.y, rect.width, rect.height));

src/test/java/net/sourceforge/tess4j/TesseractTest.java

@@ -251,7 +251,8 @@ public void testExtendingTesseract() throws Exception {
         instance1.setDatapath(new File(datapath).getPath());
         int pageIteratorLevel = TessPageIteratorLevel.RIL_WORD;
         logger.info("PageIteratorLevel: " + Utils.getConstantName(pageIteratorLevel, TessPageIteratorLevel.class));
-        List<Word> result = instance1.getTextElements(imageFile, pageIteratorLevel);
+        BufferedImage bi = ImageIO.read(imageFile);
+        List<Word> result = instance1.getWords(bi, pageIteratorLevel);
 
         //print the complete result
         for (Word word : result) {
@@ -271,13 +272,12 @@ public void testExtendingTesseract() throws Exception {
      */
     class TessExtension extends Tesseract {
 
-        public List<Word> getTextElements(File file, int pageIteratorLevel) {
+        public List<Word> getWords(BufferedImage bi, int pageIteratorLevel) {
             this.init();
             this.setTessVariables();
 
             List<Word> words = new ArrayList<Word>();
             try {
-                BufferedImage bi = ImageIO.read(file);
                 setImage(bi, null);
 
                 TessAPI api = this.getAPI();
@@ -314,7 +314,7 @@ public List<Word> getTextElements(File file, int pageIteratorLevel) {
     }
 
     /**
-     * Test of getRegions method, of class Tesseract.
+     * Test of getSegmentedRegions method, of class Tesseract.
      */
     @Test
     public void testGetRegions() throws Exception {
@@ -323,7 +323,7 @@ public void testGetRegions() throws Exception {
         BufferedImage bi = ImageIO.read(imageFile);
         int level = TessPageIteratorLevel.RIL_SYMBOL;
         logger.info("PageIteratorLevel: " + Utils.getConstantName(level, TessPageIteratorLevel.class));
-        List<Rectangle> result = instance.getRegions(bi, level);
+        List<Rectangle> result = instance.getSegmentedRegions(bi, level);
         for (int i = 0; i < result.size(); i++) {
             Rectangle rect = result.get(i);
             logger.info(String.format("Box[%d]: x=%d, y=%d, w=%d, h=%d", i, rect.x, rect.y, rect.width, rect.height));

src/test/java/net/sourceforge/tess4j/Word.java

@@ -1,3 +1,18 @@
+/**
+ * Copyright @ 2015 Quan Nguyen
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package net.sourceforge.tess4j;
 
 import java.awt.Rectangle;
@@ -11,10 +26,17 @@ class Word {
     private final float confidence;
     private final Rectangle rect;
 
-    public Word(String text, float confidence, Rectangle rect) {
+    /**
+     * Constructor.
+     * 
+     * @param text
+     * @param confidence
+     * @param boundingBox 
+     */
+    Word(String text, float confidence, Rectangle boundingBox) {
         this.text = text;
         this.confidence = confidence;
-        this.rect = rect;
+        this.rect = boundingBox;
     }
 
     /**
@@ -34,12 +56,12 @@ public float getConfidence() {
     /**
      * @return the bounding box
      */
-    public Rectangle getRect() {
+    public Rectangle getBoundingBox() {
         return rect;
     }
 
     @Override
     public String toString() {
-        return String.format("%s\t[Confidence: %f Bounding box: %d %d %d %d]", text, confidence, rect.x, rect.y, rect.width, rect.height);
+        return String.format("%s [Confidence: %f Bounding box: %d %d %d %d]", text, confidence, rect.x, rect.y, rect.width, rect.height);
     }
 }