extend ETEXT_DESC by progress_callback

Author: zdenop

ccmain/control.cpp

@@ -224,10 +224,22 @@ bool Tesseract::RecogAllWordsPassN(int pass_n, ETEXT_DESC* monitor,
     if (w > 0) word->prev_word = &(*words)[w - 1];
     if (monitor != NULL) {
       monitor->ocr_alive = TRUE;
-      if (pass_n == 1)
-        monitor->progress = 30 + 50 * w / words->size();
-      else
-        monitor->progress = 80 + 10 * w / words->size();
+      if (pass_n == 1) {
+      //  monitor->progress = 30 + 50 * w / words->size();
+        monitor->progress = 70 * w / words->size();
+        if (monitor->progress_callback != NULL) {
+            TBOX box = pr_it->word()->word->bounding_box();
+            (*monitor->progress_callback)(monitor->progress,
+                                          box.left(), box.right(),
+                                          box.top(), box.bottom());
+        }
+      } else {
+        monitor->progress = 70 + 30 * w / words->size();
+        if (monitor->progress_callback!=NULL) {
+                      (*monitor->progress_callback)(monitor->progress,
+                                                    0, 0, 0, 0);
+        }
+      }
       if (monitor->deadline_exceeded() ||
           (monitor->cancel != NULL && (*monitor->cancel)(monitor->cancel_this,
                                                          words->size()))) {

ccutil/ocrclass.h

@@ -101,13 +101,17 @@ typedef struct {                  /*single character */
  * the OCR engine is storing its output to shared memory.
  * During progress, all the buffer info is -1.
  * Progress starts at 0 and increases to 100 during OCR. No other constraint.
+ * Additionally the progress callback contains the bounding box of the word that
+ * is currently being processed.
  * Every progress callback, the OCR engine must set ocr_alive to 1.
  * The HP side will set ocr_alive to 0. Repeated failure to reset
  * to 1 indicates that the OCR engine is dead.
  * If the cancel function is not null then it is called with the number of
  * user words found. If it returns true then operation is cancelled.
  **********************************************************************/
 typedef bool (*CANCEL_FUNC)(void* cancel_this, int words);
+typedef bool (*PROGRESS_FUNC)(int progress,
+                              int left, int right, int top, int bottom);
 
 class ETEXT_DESC {             // output header
  public:
@@ -117,6 +121,7 @@ class ETEXT_DESC {             // output header
   volatile inT8 ocr_alive;     // ocr sets to 1, HP 0
   inT8 err_code;               // for errcode use
   CANCEL_FUNC cancel;          // returns true to cancel
+  PROGRESS_FUNC progress_callback; // called whenever progress increases
   void* cancel_this;           // this or other data for cancel
   struct timeval end_time;     // time to stop. expected to be set only by call
                                // to set_deadline_msecs()