Work in progress on next generation dewarping.

Author: Tulon

.gitignore

@@ -1 +1 @@
-CMakeLists.txt.user
+CMakeLists.txt.user*

CMakeLists.txt

@@ -301,8 +301,6 @@ IF(MSVC)
 	OPTION(ENABLE_CRASH_REPORTER "Enable crash reporter (only for official builds)" OFF)
 ENDIF(MSVC)
 
-OPTION(ENABLE_DEWARPING "Enable experimental dewarping support" OFF)
-
 # Prepare config.h
 IF(WIN32)
 	SET(TRANSLATIONS_DIR_REL "translations")
@@ -416,7 +414,7 @@ SET(
 	AtomicFileOverwriter.cpp AtomicFileOverwriter.h
 	EstimateBackground.cpp EstimateBackground.h
 	Despeckle.cpp Despeckle.h
-	Undistort.cpp Undistort.h
+	#Undistort.cpp Undistort.h
 	ThreadPriority.cpp ThreadPriority.h
 	SystemLoadWidget.cpp SystemLoadWidget.h
 	FileNameDisambiguator.cpp FileNameDisambiguator.h
@@ -439,11 +437,12 @@ SET(
 	filter_dc/ThumbnailCollector.h
 	filter_dc/ContentBoxCollector.h
 	filter_dc/PageOrientationCollector.h
+	config.h.in
 )
 SOURCE_GROUP("Sources" FILES ${sources})
 QT4_AUTOMOC(${sources})
 
-SOURCE_GROUP("Version Header" FILES version.h)
+SOURCE_GROUP("Special Headers" FILES version.h config.h.in)
 
 SET(win32_resource_file)
 IF(WIN32)

FilterData.h

@@ -1,6 +1,6 @@
 /*
     Scan Tailor - Interactive post-processing tool for scanned pages.
-    Copyright (C) 2007-2008  Joseph Artsimovich <joseph_a@mail.ru>
+    Copyright (C)  Joseph Artsimovich <joseph.artsimovich@gmail.com>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #define FILTERDATA_H_
 
 #include "imageproc/BinaryThreshold.h"
+#include "imageproc/GrayImage.h"
 #include "ImageTransformation.h"
 #include <QImage>
 
@@ -37,10 +38,10 @@ class FilterData
 
 	QImage const& origImage() const {return m_origImage;}
 
-	QImage const& grayImage() const {return m_grayImage;}
+	imageproc::GrayImage const& grayImage() const {return m_grayImage;}
 private:
 	QImage m_origImage;
-	QImage m_grayImage;
+	imageproc::GrayImage m_grayImage;
 	ImageTransformation m_xform;
 	imageproc::BinaryThreshold m_bwThreshold;
 };

XmlMarshaller.cpp

@@ -1,6 +1,6 @@
 /*
     Scan Tailor - Interactive post-processing tool for scanned pages.
-    Copyright (C) 2007-2009  Joseph Artsimovich <joseph_a@mail.ru>
+    Copyright (C)  Joseph Artsimovich <joseph.artsimovich@gmail.com>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
 #include "Margins.h"
 #include "Dpi.h"
 #include "Utils.h"
+#include "imageproc/CubicBSpline.h"
+#include <boost/foreach.hpp>
 #include <QPointF>
 #include <QLineF>
 #include <QRect>
@@ -150,3 +152,19 @@ XmlMarshaller::margins(Margins const& margins, QString const& name)
 	el.setAttribute("bottom", Utils::doubleToString(margins.bottom()));
 	return el;
 }
+
+QDomElement
+XmlMarshaller::bspline(imageproc::CubicBSpline const& bspline, QString const& name)
+{
+	if (bspline.controlPoints().empty()) {
+		return QDomElement();
+	}
+
+	QDomElement el(m_doc.createElement(name));
+	
+	BOOST_FOREACH(QPointF const& pt, bspline.controlPoints()) {
+		el.appendChild(pointF(pt, "point"));
+	}
+	
+	return el;
+}

XmlMarshaller.h

@@ -1,6 +1,6 @@
 /*
     Scan Tailor - Interactive post-processing tool for scanned pages.
-    Copyright (C) 2007-2009  Joseph Artsimovich <joseph_a@mail.ru>
+    Copyright (C)  Joseph Artsimovich <joseph.artsimovich@gmail.com>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,6 +34,11 @@ class QPolygonF;
 class QRect;
 class QRectF;
 
+namespace imageproc
+{
+	class CubicBSpline;
+}
+
 class XmlMarshaller
 {
 public:
@@ -60,6 +65,8 @@ class XmlMarshaller
 	QDomElement polygonF(QPolygonF const& poly, QString const& name);
 
 	QDomElement margins(Margins const& margins, QString const& name);
+
+	QDomElement bspline(imageproc::CubicBSpline const& bspline, QString const& name);
 private:
 	QDomDocument m_doc;
 };

XmlUnmarshaller.cpp

@@ -1,6 +1,6 @@
 /*
     Scan Tailor - Interactive post-processing tool for scanned pages.
-    Copyright (C) 2007-2009  Joseph Artsimovich <joseph_a@mail.ru>
+    Copyright (C)  Joseph Artsimovich <joseph.artsimovich@gmail.com>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include "Dpi.h"
 #include "OrthogonalRotation.h"
 #include "Margins.h"
+#include "imageproc/CubicBSpline.h"
 #include <QString>
 #include <QSize>
 #include <QSizeF>
@@ -140,3 +141,23 @@ XmlUnmarshaller::polygonF(QDomElement const& el)
 
 	return poly;
 }
+
+imageproc::CubicBSpline
+XmlUnmarshaller::bspline(QDomElement const& el)
+{
+	imageproc::CubicBSpline bspline;
+
+	QString const point_tag_name("point");
+	QDomNode node(el.firstChild());
+	for (; !node.isNull(); node = node.nextSibling()) {
+		if (!node.isElement()) {
+			continue;
+		}
+		if (node.nodeName() != point_tag_name) {
+			continue;
+		}
+		bspline.appendControlPoint(pointF(node.toElement()));
+	}
+
+	return bspline;
+}

XmlUnmarshaller.h

@@ -1,6 +1,6 @@
 /*
     Scan Tailor - Interactive post-processing tool for scanned pages.
-    Copyright (C) 2007-2009  Joseph Artsimovich <joseph_a@mail.ru>
+    Copyright (C)  Joseph Artsimovich <joseph.artsimovich@gmail.com>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -32,6 +32,11 @@ class QRect;
 class QRectF;
 class QPolygonF;
 
+namespace imageproc
+{
+	class CubicBSpline;
+}
+
 class XmlUnmarshaller
 {
 public:
@@ -56,6 +61,8 @@ class XmlUnmarshaller
 	static QRectF rectF(QDomElement const& el);
 
 	static QPolygonF polygonF(QDomElement const& el);
+
+	static imageproc::CubicBSpline bspline(QDomElement const& el);
 };
 
 #endif

config.h.in

@@ -8,6 +8,5 @@
 
 #cmakedefine ENABLE_CRASH_REPORTER
 #cmakedefine ENABLE_OPENGL
-#cmakedefine ENABLE_DEWARPING
 
 #endif

filters/output/ApplyColorsDialog.cpp

@@ -56,7 +56,7 @@ ApplyColorsDialog::onSubmit()
 
 	// thisPageRB is intentionally not handled.
 	if (allPagesRB->isChecked()) {
-		emit acceptedForAllPages();
+		m_pages.selectAll().swap(pages);
 	} else if (thisPageAndFollowersRB->isChecked()) {
 		m_pages.selectPagePlusFollowers(m_curPage).swap(pages);
 	} else if (selectedPagesRB->isChecked()) {

filters/output/ApplyColorsDialog.h

@@ -42,8 +42,6 @@ class ApplyColorsDialog : public QDialog, private Ui::OutputApplyColorsDialog
 	virtual ~ApplyColorsDialog();
 signals:
 	void accepted(std::set<PageId> const& pages);
-
-	void acceptedForAllPages();
 private slots:
 	void onSubmit();
 private:

filters/output/BlackWhiteOptions.cpp

@@ -25,14 +25,12 @@ namespace output
 {
 
 BlackWhiteOptions::BlackWhiteOptions()
-:	m_thresholdAdjustment(0),
-	m_dewarp(false)
+:	m_thresholdAdjustment(0)
 {
 }
 
 BlackWhiteOptions::BlackWhiteOptions(QDomElement const& el)
-:	m_thresholdAdjustment(el.attribute("thresholdAdj").toInt()),
-	m_dewarp(el.attribute("dewarp") == "1")
+:	m_thresholdAdjustment(el.attribute("thresholdAdj").toInt())
 {
 }
 
@@ -41,7 +39,6 @@ BlackWhiteOptions::toXml(QDomDocument& doc, QString const& name) const
 {
 	QDomElement el(doc.createElement(name));
 	el.setAttribute("thresholdAdj", m_thresholdAdjustment);
-	el.setAttribute("dewarp", m_dewarp ? "1" : "0");
 	return el;
 }
 
@@ -52,10 +49,6 @@ BlackWhiteOptions::operator==(BlackWhiteOptions const& other) const
 		return false;
 	}
 
-	if (m_dewarp != other.m_dewarp) {
-		return false;
-	}
-	
 	return true;
 }
 

filters/output/BlackWhiteOptions.h

@@ -38,17 +38,12 @@ class BlackWhiteOptions
 	int thresholdAdjustment() const { return m_thresholdAdjustment; }
 
 	void setThresholdAdjustment(int val) { m_thresholdAdjustment = val; }
-	
-	bool dewarp() const { return m_dewarp; }
-
-	void setDewarp(bool enabled) { m_dewarp = enabled; }
-	
+		
 	bool operator==(BlackWhiteOptions const& other) const;
 
 	bool operator!=(BlackWhiteOptions const& other) const;
 private:
 	int m_thresholdAdjustment;
-	bool m_dewarp;
 };
 
 } // namespace output

filters/output/CMakeLists.txt

@@ -47,6 +47,11 @@ SET(
 	DespeckleVisualization.cpp DespeckleVisualization.h
 	DespeckleLevel.cpp DespeckleLevel.h
 	DewarpingView.cpp DewarpingView.h
+	DewarpingMode.cpp DewarpingMode.h
+	ChangeDewarpingDialog.cpp ChangeDewarpingDialog.h
+	DistortionModel.cpp DistortionModel.h
+	DepthPerception.cpp DepthPerception.h
+	Curve.cpp Curve.h
 )
 SOURCE_GROUP("Sources" FILES ${sources})
 QT4_AUTOMOC(${sources})

filters/output/CacheDrivenTask.cpp

@@ -84,7 +84,9 @@ CacheDrivenTask::process(
 			);
 			OutputImageParams const new_output_image_params(
 				generator.outputImageSize(), generator.outputContentRect(),
-				xform, params.outputDpi(), params.colorParams(), params.despeckleLevel()
+				xform, params.outputDpi(), params.colorParams(),
+				params.dewarpingMode(), params.distortionModel(),
+				params.depthPerception(), params.despeckleLevel()
 			);
 
 			if (!stored_output_params->outputImageParams().matches(new_output_image_params)) {
@@ -134,7 +136,7 @@ CacheDrivenTask::process(
 				)
 			);
 		} else {
-			Dpi const out_dpi(m_ptrSettings->getDpi(page_info.id()));
+			Dpi const out_dpi(m_ptrSettings->getParams(page_info.id()).outputDpi());
 
 			QTransform tmp_xform(xform.transform());
 			tmp_xform *= Utils::scaleFromToDpi(