better queue info for normals.

Author: ponchio

relight/queueitem.cpp

@@ -78,6 +78,7 @@ void QueueItem::update() {
 	case Task::PAUSED:
 		status->setText("Paused");
 	case Task::ON_QUEUE:
+		status->setText("On queue");
 	case Task::RUNNING:
 		break;
 	case Task::DONE:

relightlab/normalsframe.cpp

@@ -93,7 +93,7 @@ void NormalsFrame::save() {
 		}
 	}
 	NormalsTask *task = new NormalsTask();
-	task->parameters = parameters;
+	task->setParameters(parameters);
 	task->output = parameters.path;
 	task->initFromProject(qRelightApp->project());
 

relightlab/normalstask.cpp

@@ -33,6 +33,23 @@ using namespace Eigen;
 ///         That NormalsWorker fills a vector with the colors of the normals in that line.
 ///
 
+QString NormalsParameters::summary() {
+	QString ret = "Normals";
+	if(flatMethod == FLAT_RADIAL)
+		ret += " , radial flattning";
+	if(flatMethod == FLAT_FOURIER)
+		ret += ", frequencies based flattening";
+
+	if(surface_integration == SURFACE_ASSM)
+		ret += ", adaptive surface reconstruction";
+	if(surface_integration == SURFACE_BNI)
+		ret += ", bilateral surface reconstruction";
+	if(surface_integration == SURFACE_FFT)
+		ret += ", Fourier transform surface reconstruction";
+	ret += ".";
+	return ret;
+}
+
 void NormalsTask::initFromProject(Project &project) {
 	lens = project.lens;
 	imageset.width = imageset.image_width = project.lens.width;
@@ -48,10 +65,14 @@ void NormalsTask::initFromProject(Project &project) {
 	}
 	pixelSize = project.pixelSize;
 }
+void NormalsTask::setParameters(NormalsParameters &param) {
+	parameters = param;
+	label = parameters.summary();
+}
 
 void NormalsTask::run() {
 	status = RUNNING;
-
+	label = parameters.summary();
 
 	function<bool(QString s, int d)> callback = [this](QString s, int n)->bool { return this->progressed(s, n); };
 
@@ -307,7 +328,7 @@ void NormalsTask::assm(QString filename, vector<float> &_normals, float approx_e
 
 	for(auto vertex: mesh.vertices()) {
 		auto &p = mesh.position(vertex);
-		p[1] *= imageset.height -p[1] -1;
+		p[1] = imageset.height -p[1] -1;
 		p[2] *= -1;
 	}
 	savePly(filename.toStdString().c_str(), mesh);

relightlab/normalstask.h

@@ -30,15 +30,10 @@ class NormalsParameters {
 	float bni_k = 2.0;
 	float assm_error = 0.1;
 
-	//bool exportJpeg = true;
 	int quality = 95;
-	//bool exportPng = false;
-	//bool exportTiff = false;
-	//bool exportPly = false;
-	//bool exportObj = false;
-
 	QString path;
 
+	QString summary();
 };
 
 
@@ -53,6 +48,7 @@ class NormalsTask :  public Task {
 
 	virtual void run() override;
 
+	void setParameters(NormalsParameters &param);
 	void initFromProject(Project &project);
 	void assm(QString filename, std::vector<float> &normals, float precision);
 

relightlab/queueitem.cpp

@@ -86,7 +86,11 @@ void QueueItem::update() {
 	case Task::PAUSED:
 		status->setText("Paused");
 	case Task::ON_QUEUE:
+		status->setText("On queue");
+		break;
 	case Task::RUNNING:
+		status->setText("Starting...");
+
 		break;
 	case Task::DONE:
 		status->setText("Done");

src/fft_normal_integration.cpp

@@ -114,8 +114,7 @@ void fft_integrate(std::function<bool(QString s, int n)> progressed,
 		for (int j = 0; j < cols; ++j) {
 			float *normal = &normals[3*(i * cols + j)];
 			dzdx(i, j) = normal[0] / normal[2]; // dz/dx = -nx/nz
-			dzdy(i, j) = -normal[1] / normal[2]; // dz/dy = -ny/nz
-			assert(!isnan(dzdx(i, j)));
+			dzdy(i, j) = -normal[1] / normal[2]; // dz/dy = -ny/nz			assert(!isnan(dzdx(i, j)));
 			assert(!isnan(dzdy(i, j)));
 		}
 	}