switching between fast and precise page segmentation (via the navigation drawer)

hollaus · hollaus · commit 810c0750aec1 · 2016-12-13T00:25:51.000+01:00
removed debug output in FocusMeasure.cpp
diff --git a/app/src/main/java/at/ac/tuwien/caa/docscan/CameraActivity.java b/app/src/main/java/at/ac/tuwien/caa/docscan/CameraActivity.java
@@ -826,6 +826,18 @@ private void selectDrawerItem(MenuItem menuItem) {
 
                 break;
 
+            // Switch between the two page segmentation methods:
+            case R.id.action_precise_page_seg:
+
+                if (NativeWrapper.useLab()) {
+                    NativeWrapper.setUseLab(false);
+                    menuItem.setTitle(R.string.precise_page_seg_text);
+                }
+                else {
+                    NativeWrapper.setUseLab(true);
+                    menuItem.setTitle(R.string.fast_page_seg_text);
+                }
+
 
         }
 
diff --git a/app/src/main/java/at/ac/tuwien/caa/docscan/NativeWrapper.java b/app/src/main/java/at/ac/tuwien/caa/docscan/NativeWrapper.java
@@ -33,6 +33,8 @@
  */
 public class NativeWrapper {
 
+    private static boolean mUseLab = true;
+
 
     /**
      * Returns an array of Patch objects, containing focus measurement results.
@@ -54,7 +56,7 @@ public static Patch[] getFocusMeasures(Mat src) {
      */
     public static DkPolyRect[] getPageSegmentation(Mat src) {
 
-        return nativeGetPageSegmentation(src.getNativeObjAddr());
+        return nativeGetPageSegmentation(src.getNativeObjAddr(), mUseLab);
 
     }
 
@@ -77,7 +79,7 @@ public static double getIllumination(Mat src, DkPolyRect polyRect) {
      * @return array of DKPolyRect objects
      */
     @SuppressWarnings("JniMissingFunction")
-    private static native DkPolyRect[] nativeGetPageSegmentation(long src);
+    private static native DkPolyRect[] nativeGetPageSegmentation(long src, boolean useLab);
 
     /**
      * Native method for illumination computation.
@@ -88,6 +90,14 @@ public static double getIllumination(Mat src, DkPolyRect polyRect) {
     @SuppressWarnings("JniMissingFunction")
     private static native double nativeGetIllumination(long src, DkPolyRect polyRect);
 
+    public static void setUseLab(boolean useLab) {
+        mUseLab = useLab;
+    }
+
+    public static boolean useLab() {
+        return mUseLab;
+    }
+
 
     // Callbacks:
     public interface CVCallback {
diff --git a/app/src/main/jni/DocScanInterface.cpp b/app/src/main/jni/DocScanInterface.cpp
@@ -176,13 +176,13 @@ JNIEXPORT jdouble JNICALL Java_at_ac_tuwien_caa_docscan_NativeWrapper_nativeGetI
 
 }
 
-JNIEXPORT jobjectArray JNICALL Java_at_ac_tuwien_caa_docscan_NativeWrapper_nativeGetPageSegmentation(JNIEnv * env, jclass cls, jlong src) {
+JNIEXPORT jobjectArray JNICALL Java_at_ac_tuwien_caa_docscan_NativeWrapper_nativeGetPageSegmentation(JNIEnv * env, jclass cls, jlong src, jboolean useLab) {
 
 
 
 
     // call the main function:
-    std::vector<dsc::DkPolyRect> polyRects = dsc::DkPageSegmentation::apply(*((cv::Mat*)src));
+    std::vector<dsc::DkPolyRect> polyRects = dsc::DkPageSegmentation::apply(*((cv::Mat*)src), useLab);
 
     jclass polyRectClass = env->FindClass("at/ac/tuwien/caa/docscan/cv/DkPolyRect");
 
@@ -205,46 +205,16 @@ JNIEXPORT jobjectArray JNICALL Java_at_ac_tuwien_caa_docscan_NativeWrapper_nativ
 
         std::vector<cv::Point> points = polyRects[i].toCvPoints();
 
-         if (points.empty()) {
-
-            std::stringstream strs;
-            strs << i;
-            std::string temp_str = strs.str();
-            char* char_type = (char*) temp_str.c_str();
-
-            __android_log_write(ANDROID_LOG_INFO, "DocScanInterfaceEmpty", char_type);
-
+         if (points.empty())
             continue;
 
-
-        }
-        else {
-
-            std::stringstream strs;
-            strs << i;
-            std::string temp_str = strs.str();
-            char* char_type = (char*) temp_str.c_str();
-        }
-
         polyRect = env->NewObject(polyRectClass, cnstrctr,
             (float) points[0].x, (float)  points[0].y, (float) points[1].x, (float) points[1].y, (float) points[2].x, (float) points[2].y, (float) points[3].x, (float) points[3].y);
 
         env->SetObjectArrayElement(outJNIArray, i, polyRect);
 
-
     }
 
-    /*
-    std::stringstream strs;
-    strs << polyRects.size();
-    std::string temp_str = strs.str();
-    char* char_type = (char*) temp_str.c_str();
-
-    __android_log_write(ANDROID_LOG_INFO, "DocScanInterface", char_type);
-    */
-
-
-
     return outJNIArray;
 
 }
diff --git a/app/src/main/jni/DocScanInterface.h b/app/src/main/jni/DocScanInterface.h
@@ -29,7 +29,7 @@
 
 extern "C" {
     JNIEXPORT jobjectArray JNICALL Java_at_ac_tuwien_caa_docscan_NativeWrapper_nativeGetFocusMeasures(JNIEnv *, jclass, jlong);
-    JNIEXPORT jobjectArray JNICALL Java_at_ac_tuwien_caa_docscan_NativeWrapper_nativeGetPageSegmentation(JNIEnv *, jclass, jlong);
+    JNIEXPORT jobjectArray JNICALL Java_at_ac_tuwien_caa_docscan_NativeWrapper_nativeGetPageSegmentation(JNIEnv *, jclass, jlong, jboolean useLab);
     JNIEXPORT jdouble JNICALL Java_at_ac_tuwien_caa_docscan_NativeWrapper_nativeGetIllumination(JNIEnv *, jclass, jlong, jobject);
 
     JNIEXPORT void JNICALL Java_at_ac_tuwien_caa_docscan_NativeWrapper_nativeGetPageSegmentationTest(JNIEnv*, jobject, jint, jint, jbyteArray, jintArray);
diff --git a/app/src/main/jni/FocusMeasure.cpp b/app/src/main/jni/FocusMeasure.cpp
@@ -588,8 +588,6 @@ namespace dsc {
 	/// <returns>A vector with image patches containing the fm value.</returns>
 	std::vector<dsc::Patch> dsc::FocusEstimation::apply(const cv::Mat & src, const double globalFMThr) {
 
-	 Utils::print("FocusMeasure", "1");
-
 		static dsc::FocusEstimation fe;
 		int w = src.cols < src.rows ? src.cols : src.rows;
 		int ws = (int)ceil((double)w / 5.0);
@@ -599,7 +597,6 @@ namespace dsc {
 		fe.setImg(src);
 		fe.setGlobalFMThreshold(globalFMThr);
 
-		dsc::Utils::print("FocusMeasure", "2");
 
 		////version 1
 		//fe.compute(dsc::FocusEstimation::FocusMeasure::LAPV);
@@ -632,8 +629,6 @@ namespace dsc {
 
 		}
 
-        dsc::Utils::print("FocusMeasure", "3");
-
 		return resultP;
 
 
diff --git a/app/src/main/jni/PageSegmentation.cpp b/app/src/main/jni/PageSegmentation.cpp
@@ -84,7 +84,7 @@ DkPolyRect DkPageSegmentation::getMaxRect() const {
 //	return mImg;	// no document page found
 //}
 
-void DkPageSegmentation::compute() {
+void DkPageSegmentation::compute(bool useLab) {
 
 	// compute scale factor
 	int maxImgSide = std::max(mImg.rows, mImg.cols);
@@ -97,7 +97,20 @@ void DkPageSegmentation::compute() {
 	if (scale > 0.8f || scale <= 0.0f)
 		scale = 1.0f;
 
-	findRectanglesLab(mImg, mRects);
+    if (useLab)
+	    findRectanglesLab(mImg, mRects);
+    else {
+        cv::Mat imgLab;
+        cv::cvtColor(mImg, imgLab, CV_RGB2Lab);	// luminance channel is better than grayscale
+
+        int ch[] = {0, 0};
+        cv::Mat imgL(mImg.size(), CV_8UC1);
+        mixChannels(&imgLab, 1, &imgL, 1, ch, 1);
+        cv::normalize(imgL, imgL, 255, 0, cv::NORM_MINMAX);
+        imgLab.release();	// early release
+
+        findRectangles(imgL, mRects);
+    }
 
 
 	std::cout << "[DkPageSegmentation] " << mRects.size() << " rectangles found resize factor: " << scale << std::endl;
@@ -123,8 +136,8 @@ void DkPageSegmentation::findRectanglesLab(const cv::Mat & img, std::vector<DkPo
 
 void DkPageSegmentation::findRectangles(const cv::Mat& img, std::vector<DkPolyRect>& rects) const {
 
-	cv::Mat imgL;
-	cv::normalize(img, imgL, 255, 0, cv::NORM_MINMAX);
+    cv::Mat imgL;
+    cv::normalize(img, imgL, 255, 0, cv::NORM_MINMAX);
 
 	// downscale
 	if (scale != 1.0f)
@@ -411,13 +424,13 @@ void DkPageSegmentation::draw(cv::Mat& img, const std::vector<DkPolyRect>& rects
 	}
 }
 
-std::vector<DkPolyRect> DkPageSegmentation::apply(const cv::Mat& src) {
+std::vector<DkPolyRect> DkPageSegmentation::apply(const cv::Mat& src, bool useLab) {
 
 	std::vector<DkPolyRect> pageRects;
 
 	// run the page segmentation
 	DkPageSegmentation segM(src);
-	segM.compute();
+	segM.compute(useLab);
 	segM.filterDuplicates();
 
 	//pageRects = segM.getRects();
diff --git a/app/src/main/jni/PageSegmentation.h b/app/src/main/jni/PageSegmentation.h
@@ -47,7 +47,7 @@ class DllCoreExport DkPageSegmentation {
 public:
 	DkPageSegmentation(const cv::Mat& colImg = cv::Mat());
 
-	virtual void compute();
+	virtual void compute(bool useLab);
 	virtual void filterDuplicates(float overlap = 0.6f, float areaRatio = 0.5f);
 	virtual void filterDuplicates(std::vector<DkPolyRect>& rects, float overlap = 0.6f, float areaRatio = 0.1f) const;
 
@@ -60,7 +60,7 @@ class DllCoreExport DkPageSegmentation {
 	DkPolyRect getMaxRect() const;
 	DkPolyRect getDocumentRect() const;
 
-    static std::vector<DkPolyRect> apply(const cv::Mat& src);
+    static std::vector<DkPolyRect> apply(const cv::Mat& src, bool useLab = true);
 
 protected:
 	cv::Mat mImg;
diff --git a/app/src/main/res/menu/drawer_view_menu.xml b/app/src/main/res/menu/drawer_view_menu.xml
@@ -20,4 +20,10 @@
             android:title="@string/show_guide_text" />
     </group>
 
+    <group android:checkableBehavior="single">
+        <item
+            android:id="@+id/action_precise_page_seg"
+            android:title="@string/fast_page_seg_text" />
+    </group>
+
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -9,6 +9,8 @@
     <string name="show_fm_values_text">Show focus values</string>
     <string name="show_guide_text">Show guide lines</string>
     <string name="hide_guide_text">Hide guide lines</string>
+    <string name="fast_page_seg_text">Use fast page segmentation</string>
+    <string name="precise_page_seg_text">Use precise page segmentation</string>
     <string name="hide_fm_values_text">Hide focus values</string>
     <string name="taking_picture_text">Taking picture</string>
 
