page segmentation improved

Author: diemmarkus

app/src/main/cmake/DocScan.rc

@@ -51,7 +51,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,26647
+ FILEVERSION 1,0,0,26652
  PRODUCTVERSION 1,0,0,26472
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -69,7 +69,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "TU Wien"
             VALUE "FileDescription", "flowView - a visualization tool for FCS data and AutoGating"
-            VALUE "FileVersion", "1.0.0.26647"
+            VALUE "FileVersion", "1.0.0.26652"
             VALUE "InternalName", "flowView.exe"
             VALUE "LegalCopyright", "(C) 2015 TU Wien, Computer Vision Lab, Markus Diem"
             VALUE "OriginalFilename", "flowView.exe"

app/src/main/cmake/src-test/main.cpp

@@ -48,7 +48,7 @@ int main(int argc, char** argv) {
 	}
 
 	std::string path = argv[1];
-	//path = "C:/VSProjects/DocScan/img/tests/test.png";
+	path = "C:/VSProjects/DocScan/img/tests/test.png";
 
 	// test the focus measure module
 	if (!testFocusMeasure(path))
@@ -57,7 +57,7 @@ int main(int argc, char** argv) {
 		std::cout << "[SUCCESS] focus measure succesfull..." << std::endl;
 
 	std::string oPath = argc > 2 ? argv[2] : "";
-	//oPath = "C:/VSProjects/DocScan/img/tests/test-res.png";
+	oPath = "C:/VSProjects/DocScan/img/tests/test-res.png";
 
 	// test the page segmentation module
 	if (!testPageSegmentation(path, oPath))
@@ -138,8 +138,8 @@ bool testPageSegmentation(const std::string& filePath, const std::string& output
 		cv::imwrite(outputPath, dstImg);
 	}
 
-	double illVal = dsc::DkIllumination::apply(img, pageRects[0]);
-	std::cout << "illumination value: " << illVal << std::endl;
+	//double illVal = dsc::DkIllumination::apply(img, pageRects[0]);
+	//std::cout << "illumination value: " << illVal << std::endl;
 
 	//std::cout << "test page segmentation not implemented..." << std::endl;
 	return true;

app/src/main/jni/PageSegmentation.cpp

@@ -97,22 +97,34 @@ void DkPageSegmentation::compute() {
 	if (scale > 0.8f || scale <= 0.0f)
 		scale = 1.0f;
 
-	findRectangles(mImg, mRects);
+	findRectanglesLab(mImg, mRects);
 
 
 	std::cout << "[DkPageSegmentation] " << mRects.size() << " rectangles found resize factor: " << scale << std::endl;
 }
 
-void DkPageSegmentation::findRectangles(const cv::Mat& img, std::vector<DkPolyRect>& rects) const {
+void DkPageSegmentation::findRectanglesLab(const cv::Mat & img, std::vector<DkPolyRect>& rects) const {
+
 
 	cv::Mat imgLab;
 	cv::cvtColor(img, imgLab, CV_RGB2Lab);	// luminance channel is better than grayscale
 
-	int ch[] = {0, 0};
-	cv::Mat imgL(img.size(), CV_8UC1);
-	mixChannels(&imgLab, 1, &imgL, 1, ch, 1);
-	cv::normalize(imgL, imgL, 255, 0, cv::NORM_MINMAX);
-	imgLab.release();	// early release
+	for (int idx = 0; idx < img.channels(); idx++) {
+
+		int ch[] = {idx, 0};
+		cv::Mat imgL(img.size(), CV_8UC1);
+		cv::mixChannels(&imgLab, 1, &imgL, 1, ch, 1);
+		std::vector<DkPolyRect> cr;
+		findRectangles(imgL, rects);
+		std::cout << rects.size() << " after channel " << idx << std::endl;
+	}
+
+}
+
+void DkPageSegmentation::findRectangles(const cv::Mat& img, std::vector<DkPolyRect>& rects) const {
+
+	cv::Mat imgL;
+	cv::normalize(img, imgL, 255, 0, cv::NORM_MINMAX);
 
 	// downscale
 	if (scale != 1.0f)
@@ -124,6 +136,7 @@ void DkPageSegmentation::findRectangles(const cv::Mat& img, std::vector<DkPolyRe
 	//std::cout << "thresh step: " << threshStep << std::endl;
 
 	cv::Mat gray;
+	std::vector<DkPolyRect> rectsL;
 
 	// try several threshold levels
 	for (int thr = 0; thr < 255; thr += threshStep) {
@@ -166,7 +179,7 @@ void DkPageSegmentation::findRectangles(const cv::Mat& img, std::vector<DkPolyRe
 		//cv::Mat pImg = imgL.clone();
 		//cv::cvtColor(pImg, pImg, CV_GRAY2BGR);
 		// DEBUG ------------------------
-		
+
 		// test each contour
 		for (size_t i = 0; i < contours.size(); i++) {
 			// approxicv::Mate contour with accuracy proportional
@@ -200,7 +213,7 @@ void DkPageSegmentation::findRectangles(const cv::Mat& img, std::vector<DkPolyRe
 					(!maxSide || cr.maxSide() < maxSide*scale) &&
 					cr.getMaxCosine() < 0.3 ) {
 
-					rects.push_back(cr);
+					rectsL.push_back(cr);
 				}
 			}
 		}
@@ -210,25 +223,23 @@ void DkPageSegmentation::findRectangles(const cv::Mat& img, std::vector<DkPolyRe
 		// DEBUG ------------------------
 	}
 
-	for (size_t idx = 0; idx < rects.size(); idx++)
-		rects[idx].scale(1.0f/scale);
+	for (size_t idx = 0; idx < rectsL.size(); idx++)
+		rectsL[idx].scale(1.0f/scale);
 
 
 	// filter rectangles which are found because of the image border
-	std::vector<DkPolyRect> noLargeRects;
-	for (const DkPolyRect& p : rects) {
+	for (const DkPolyRect& p : rectsL) {
 
 		DkBox b = p.getBBox();
 
 		if (b.size().height < img.rows*maxSideFactor &&
 			b.size().width < img.cols*maxSideFactor) {
-			noLargeRects.push_back(p);
+			rects.push_back(p);
 		}
 	}
 
 	//cv::normalize(dbgImg, dbgImg, 255, 0, cv::NORM_MINMAX);
 
-	rects = noLargeRects;
 }
 
 //QImage DkPageSegmentation::cropToRect(const QImage & img, const nmc::DkRotatingRect & rect, const QColor & bgCol) const {

app/src/main/jni/PageSegmentation.h

@@ -77,6 +77,7 @@ class DllCoreExport DkPageSegmentation {
 
 	std::vector<DkPolyRect> mRects;
 
+	virtual void findRectanglesLab(const cv::Mat& img, std::vector<DkPolyRect>& squares) const;
 	virtual void findRectangles(const cv::Mat& img, std::vector<DkPolyRect>& squares) const;
 	//QImage cropToRect(const QImage& mImg, const nmc::DkRotatingRect& rect, const QColor& bgCol = QColor(0,0,0)) const;
 	//void drawRects(QPainter* p, const std::vector<DkPolyRect>& mRects, const QColor& col = QColor(100, 100, 100)) const;