fourier padding, some exception cleanup, recent project filtered

Author: ponchio

relight-cli/convert_rti.cpp

@@ -26,7 +26,7 @@ int convertRTI(const char *file, const char *output, int quality) {
 	rti.chromasubsampling = lrti.chromasubsampled;
 	switch(lrti.type) {
 	case LRti::UNKNOWN:
-		throw "Unknown RTI type!\n";
+		throw QString("Unknown RTI type!\n");
 		return 1;
 	case LRti::PTM_LRGB:
 		rti.type = Rti::PTM;
@@ -76,7 +76,7 @@ int convertRTI(const char *file, const char *output, int quality) {
 	if(!dir.exists()) {
 		QDir here("./");
 		if(!here.mkdir(output))
-			throw "Could not create output dir!\n";
+			throw QString("Could not create output dir!\n");
 	}
 
 	rti.saveJSON(dir, quality);

relight-cli/rtibuilder.cpp

@@ -231,7 +231,7 @@ MaterialBuilder RtiBuilder::pickBasePCA(PixelArray &sample) {
 
 	if(callback)
 		if(!(*callback)("Computing PCA:", 0))
-			throw std::string("Cancelled.");
+			throw QString("Cancelled.");
 
 	if(colorspace == MRGB) {
 		uint32_t dim = sample.components()*3;
@@ -255,7 +255,7 @@ MaterialBuilder RtiBuilder::pickBasePCA(PixelArray &sample) {
 			d /= nsamples;
 
 		if(callback && !(*callback)("Computing PCA:", 5))
-			throw std::string("Cancelled.");
+			throw QString("Cancelled.");
 
 		for(uint32_t i = 0; i < sample.size(); i++) {
 			Pixel &pixel = sample[i];
@@ -269,7 +269,7 @@ MaterialBuilder RtiBuilder::pickBasePCA(PixelArray &sample) {
 		}
 
 		if(callback && !(*callback)("Computing PCA:", 10))
-			throw std::string("Cancelled.");
+			throw QString("Cancelled.");
 
 		pca.solve(nplanes);
 
@@ -349,7 +349,7 @@ MaterialBuilder RtiBuilder::pickBasePCA(PixelArray &sample) {
 
 
 			if(callback && !(*callback)("Computing PCA:", 100*component/3))
-				throw std::string("Cancelled.");
+				throw QString("Cancelled.");
 		}
 	}
 	//normalize coeffs
@@ -366,7 +366,7 @@ MaterialBuilder RtiBuilder::pickBasePCA(PixelArray &sample) {
 	}
 
 	if(callback && !(*callback)("Computing PCA:", 100))
-		throw std::string("Cancelled.");
+		throw QString("Cancelled.");
 	return mat;
 }
 

relight/mainwindow.cpp

@@ -234,8 +234,9 @@ void MainWindow::openProject() {
 	project.clear();
 	try {
 		project.load(filename);
-	} catch(QString e) {
-		QMessageBox::critical(this, "Could not load the project: " + filename, "Error: " + e);
+	} catch(Error err) {
+		//TODO replace with something that can display help
+		QMessageBox::critical(this, err.title,  err.text);
 		return;
 	}
 	project_filename = filename; //project.dir.relativeFilePath(filename);

relight/relight.pro

@@ -81,7 +81,8 @@ SOURCES += main.cpp \
     convertdialog.cpp \
     aligndialog.cpp \
     zoomdialog.cpp \
-    zoomtask.cpp
+    zoomtask.cpp \
+    error.cpp
 
 
 
@@ -141,7 +142,8 @@ HEADERS += \
     zoom.h \
     zoomdialog.h \
     zoomtask.h \
-    ../src/deepzoom.h
+    ../src/deepzoom.h \
+    error.h
 
 FORMS += \
     dstretchdialog.ui \

relightlab/cropframe.cpp

@@ -125,7 +125,7 @@ void CropFrame::init() {
 	int count = 0;
 	while(project.images[count].skip == true) {
 		count++;
-		if(count >= project.images.size())
+		if(size_t(count) >= project.images.size())
 			break;
 		filename = project.images[count].filename;
 	}

relightlab/homeframe.cpp

@@ -44,7 +44,7 @@ HomeFrame::HomeFrame() {
 	leftColumnLayout->addSpacing(20);
 	leftColumnLayout->addWidget(recentLabel);
 
-
+	cleanRecentProjects();
 	for(QString path: recentProjects()) {
 		QFileInfo fileInfo(path);
 		QString filename = fileInfo.fileName();

relightlab/imagelist.cpp

@@ -25,7 +25,7 @@ void ImageList::verifyItem(QListWidgetItem *item) {
 	bool skip = item->checkState() != Qt::Checked;
 
 	Project &project = qRelightApp->project();
-	assert(img_number >= 0 && img_number < project.images.size());
+	assert(img_number >= 0 && size_t(img_number) < project.images.size());
 
 	project.images[img_number].skip = skip;
 

relightlab/normalstask.cpp

@@ -199,7 +199,8 @@ void NormalsTask::run() {
 		assm(filename, normals, parameters.assm_error);
 
 	} else if(parameters.surface_integration == SURFACE_BNI || parameters.surface_integration == SURFACE_FFT) {
-		bool proceed = progressed("Bilateral normal integration...", 0);
+		QString type = parameters.surface_integration == SURFACE_BNI ? "Bilateral" : "Fourier";
+		bool proceed = progressed(type + " normal integration...", 0);
 		if(!proceed)
 			return;
 

relightlab/normalstask.h

@@ -23,7 +23,7 @@ class NormalsParameters {
 	NormalSolver solver = NORMALS_L2;
 
 	FlatMethod flatMethod = FLAT_NONE;
-	double flatPercentage = 50;
+	double flatPercentage = 20;
 
 
 	SurfaceIntegration surface_integration = SURFACE_NONE;

relightlab/recentprojects.cpp

@@ -2,6 +2,7 @@
 #include <QVariant>
 #include <QMap>
 #include <QList>
+#include <QFileInfo>
 #include "recentprojects.h"
 
 QStringList recentProjects() {
@@ -23,3 +24,24 @@ void clearRecentProjects() {
 }
 
 
+void removeRecentProject(const QString &filename) {
+	QStringList recents = recentProjects();
+	int index = recents.indexOf(filename);
+	if (index != -1) { // String found in the list
+		recents.removeAt(index); // Remove the string from its current position
+	}
+	QSettings().setValue("recent-projects", recents);
+}
+
+void cleanRecentProjects() {
+	QStringList recents = recentProjects();
+	QStringList valid;
+	for(QString path: recents) {
+		QFileInfo info(path);
+		if(info.exists())
+			valid.push_back(path);
+	}
+	if(recents.size() != valid.size())
+		QSettings().setValue("recent-projects", valid);
+}
+

relightlab/recentprojects.h

@@ -5,6 +5,8 @@
 
 QStringList recentProjects();
 void addRecentProject(const QString &filename);
+void removeRecentProject(const QString &filename);
+void cleanRecentProjects(); //removes missing projects
 void clearRecentProjects();
 
 #endif // RECENTPROJECTS_H

relightlab/relightapp.cpp

@@ -4,6 +4,7 @@
 #include "recentprojects.h"
 #include "mainwindow.h"
 #include "preferences.h"
+#include "../src/error.h"
 
 #include <QMessageBox>
 #include <QFileDialog>
@@ -228,7 +229,7 @@ void RelightApp::openProject(const QString &filename) {
 	try {
 		project.load(filename);
 	} catch(QString e) {
-		QMessageBox::critical(mainwindow, "Could not load the project: " + filename, "Error: " + e);
+		QMessageBox::critical(mainwindow, "Could not load project", e);
 		return;
 	}
 
@@ -325,9 +326,13 @@ void RelightApp::loadThumbnails() {
 		Image &image = m_project.images[i];
 		if(i == 0) {
 			QImage img(image.filename);
+			if(img.isNull()) {
+				img = QImage(256, 256, QImage::Format_ARGB32);
+				img.fill(Qt::black);
+			}
 			m_thumbnails[i] = img.scaledToHeight(256);
 		} else {
-			QImage img(m_thumbnails[0].size().scaled(2560, 256, Qt::KeepAspectRatio), QImage::Format_ARGB32);
+			QImage img(m_thumbnails[0].size().scaled(256, 256, Qt::KeepAspectRatio), QImage::Format_ARGB32);
 			img.fill(Qt::black);
 			m_thumbnails[i] = img;
 			paths.push_back(image.filename);

relightlab/sphererow.cpp

@@ -101,7 +101,7 @@ void SphereRow::remove() {
 	emit removeme(this);
 }
 
-void SphereRow::updateStatus(QString msg, int percent) {
+void SphereRow::updateStatus(QString /*msg*/, int percent) {
 //	status->setText(msg);
 	progress->setValue(percent);
 	reflections->update();

src/error.cpp

@@ -103,10 +103,63 @@ void ifft2(const ComplexMatrix& input, MatrixXd& output) {
 		}
 }
 
+void pad(int &w, int &h, std::vector<float> &normals, int padding) {
+	int W = w + padding;
+	int H = h + padding;
+	std::vector<float> n(W*H*3);
+	for(int y = 0; y < H;  y++) {
+		for(int x = 0; x < W; x++) {
+			int X = x - padding;
+			int Y = y - padding;
+			if(x < padding) {
+				X = padding -x;
+			}
+
+			if(x >= w + padding) {
+				X = 2*w + padding - 1 - x;
+			}
+
+			if(y < padding) {
+				Y = padding - y;
+			}
+
+			if(y >= h + padding) {
+				Y = 2*h + padding - 1 - y;
+				Y = H - padding + h - 1 -y;
+			}
+			for(int k = 0; k < 3; k++)
+				n[3*(x + y*W) + k] = normals[3*(X + Y*w) + k];
+			assert(!isnan(n[x + y*W]));
+		}
+	}
+	w = W;
+	h = H;
+	swap(normals, n);
+}
+
+void depad(int &w, int &h, std::vector<float> &heights, int padding) {
+
+	int W = w;
+	int H = h;
+	w -= padding;
+	h -= padding;
+	std::vector<float> elev(w*h);
+	for(int y = 0; y < h; y++) {
+		for(int x = 0; x < w; x++) {
+			elev[x + w*y] = heights[x + padding + (y + padding)*W];
+		}
+	}
+	swap(elev, heights);
+}
+
 void fft_integrate(std::function<bool(QString s, int n)> progressed,
 				   int cols, int rows, std::vector<float> &normals, std::vector<float> &heights) {
 
 
+	int minsize = std::min(cols, rows);
+	int padding = minsize/4;
+	pad(cols, rows, normals, padding);
+
 
 	MatrixXd dzdx(rows, cols);
 	MatrixXd dzdy(rows, cols);
@@ -152,6 +205,8 @@ void fft_integrate(std::function<bool(QString s, int n)> progressed,
 		}
 	}
 
+	depad(cols, rows, heights, padding);
+
 	/*
 	[wx, wy] = meshgrid(([1:cols]-(fix(cols/2)+1))/(cols-mod(cols,2)), ...
 			([1:rows]-(fix(rows/2)+1))/(rows-mod(rows,2)));

src/error.h

@@ -275,7 +275,7 @@ void Project::rotateImages() {
 void Project::load(QString filename) {
 	QFile file(filename);
 	if(!file.open(QFile::ReadOnly))
-		throw QString("Failed opening: " + filename);
+		throw QString("The project file could not be opened.\nThe path might be wrong, or the file missing.");
 
 	QJsonDocument doc = QJsonDocument::fromJson(file.readAll());
 	QJsonObject obj = doc.object();
@@ -293,14 +293,14 @@ void Project::load(QString filename) {
 	imgsize.setWidth(obj["width"].toInt());
 	imgsize.setHeight(obj["height"].toInt());
 	if(!imgsize.isValid())
-		throw "Missing or invalid width and/or height.";
+		throw QString("Missing or invalid width and/or height in project.");
 
 	QFileInfo info(filename);
 	QDir folder = info.dir();
 	folder.cd(obj["folder"].toString());
 
 	if(!setDir(folder))
-		throw(QString("Can't load a project without a valid folder"));
+		throw QString("The folder " + obj["folder"].toString() + " does not exists.");
 
 	lens.fromJson(obj["lens"].toObject());
 	lens.width = imgsize.width();
@@ -365,8 +365,7 @@ void Project::checkMissingImages() {
 		QFileInfo imginfo(image.filename);
 		if(!imginfo.exists()) {
 			missing.push_back(int(i));
-			//throw QString("Could not find the image: " + image.filename) + " in folder: " + dir.absolutePath();
-			continue;
+			throw "Could not find the image:\n" + image.filename + " in folder: " + dir.absolutePath();
 		}
 	}
 }

src/fft_normal_integration.cpp

@@ -58,8 +58,8 @@ class Project {
 
 	void clear();
 	void load(QString filename);
-	void save(QString filename); //throws QString on error
-	void saveLP(QString filename, std::vector<Eigen::Vector3f> &directions); //throws QString on error
+	void save(QString filename);
+	void saveLP(QString filename, std::vector<Eigen::Vector3f> &directions);
 	void loadLP(QString filename);
 	void computeDirections();
 	void computePixelSize();