debug normalsframe and minor bugfix

Author: ponchio

relightlab/alignframe.cpp

@@ -40,8 +40,7 @@ void AlignFrame::clear() {
 
 void AlignFrame::init() {
 	for(Align *align: qRelightApp->project().aligns) {
-		AlignRow * row = addAlign(align);
-//		row->detectHighlights(false);
+		addAlign(align);
 	}
 }
 
@@ -59,8 +58,7 @@ void AlignFrame::newAlign() {
 		return;
 	}
 	qRelightApp->project().aligns.push_back(align);
-	AlignRow *row = addAlign(align);
-	//row->detectHighlights();
+	addAlign(align);
 }
 
 AlignRow *AlignFrame::addAlign(Align *align) {

relightlab/brdfframe.cpp

@@ -0,0 +1,11 @@
+#include "brdfframe.h"
+
+#include <QVBoxLayout>
+
+//export various planes.
+
+BrdfFrame::BrdfFrame(QWidget *parent): QFrame(parent) {
+	QVBoxLayout *content = new QVBoxLayout(this);
+
+	content->addSpacing(10);
+}

relightlab/brdfframe.h

@@ -0,0 +1,19 @@
+#ifndef BRDFFRAME_H
+#define BRDFFRAME_H
+
+#include <QFrame>
+
+class BrdfFrame: public QFrame {
+	Q_OBJECT
+	public:
+		BrdfFrame(QWidget *parent = nullptr);
+		void clear();
+		void init();
+
+	public slots:
+
+
+	private:
+	};
+
+#endif // BRDFFRAME_H

relightlab/domepanel.cpp

@@ -110,14 +110,19 @@ void DomePanel::exportDome() {
 
 void DomePanel::loadLP(QString path) {
 	std::vector<QString> filenames;
-	dome.lightConfiguration = Dome::DIRECTIONAL;
+	std::vector<Eigen::Vector3f> directions;
 
 	try {
-		parseLP(path, dome.directions, filenames);
+		parseLP(path, directions, filenames);
+		qRelightApp->project().validateDome(directions.size());
+
 	} catch(QString error) {
 		QMessageBox::critical(this, "Loading .lp file failed", error);
 		return;
 	}
+
+	dome.lightConfiguration = Dome::DIRECTIONAL;
+	dome.directions = directions;
 	QFileInfo info(path);
 	dome.label = info.filePath();
 	qRelightApp->addDome(path);
@@ -129,12 +134,16 @@ void DomePanel::loadLP(QString path) {
 
 void DomePanel::loadDome(QString path) {
 	float imageWidth = dome.imageWidth;
+	Dome new_dome;
 	try {
-		dome.load(path);
+		new_dome.load(path);
+		qRelightApp->project().validateDome(new_dome.directions.size());
+
 	} catch (QString error) {
 		QMessageBox::critical(this, "Loading .dome file failed", error);
 		return;
 	}
+	dome = new_dome;
 
 	QFileInfo info(path);
 	dome.label = info.filePath();

relightlab/mainwindow.cpp

@@ -143,6 +143,7 @@ void MainWindow::init() {
 	lights_frame->init();
 	crop_frame->init();
 	rti_frame->init();
+	normals_frame->init();
 }
 
 void MainWindow::showHelp() {

relightlab/metadataframe.cpp

@@ -0,0 +1,8 @@
+#include "metadataframe.h"
+
+#include <QVBoxLayout>
+
+MetadataFrame::MetadataFrame(QWidget *parent): QFrame(parent) {
+	QVBoxLayout *content = new QVBoxLayout;
+
+}

relightlab/metadataframe.h

@@ -0,0 +1,14 @@
+#ifndef METADATAFRAME_H
+#define METADATAFRAME_H
+
+#include <QFrame>
+
+class MetadataFrame: public QFrame {
+public:
+	MetadataFrame(QWidget *parent = nullptr);
+	void clear();
+	void init();
+
+};
+
+#endif // METADATAFRAME_H

relightlab/normalsframe.cpp

@@ -26,6 +26,7 @@ NormalsFrame::NormalsFrame(QWidget *parent): QFrame(parent) {
 	content->addWidget(source_row = new NormalsSourceRow(parameters, this));
 	content->addWidget(flatten_row = new NormalsFlattenRow(parameters, this));
 	content->addWidget(surface_row = new NormalsSurfaceRow(parameters, this));
+	content->addWidget(export_row = new NormalsExportRow(parameters, this));
 
 
 	{
@@ -66,53 +67,10 @@ NormalsFrame::NormalsFrame(QWidget *parent): QFrame(parent) {
 
 
 	content->addStretch();
+}
 
-	return;
-	content->addWidget(jpg = new QRadioButton("JPEG: normalmap"));
-	content->addWidget(png = new QRadioButton("PNG: normalmap"));
-	{
-		QButtonGroup *group = new QButtonGroup(this);
-		group->addButton(jpg);
-		group->addButton(png);
-		jpg->setChecked(true);
-	}
-
-	content->addWidget(new QLabel("<h2>Flatten normals</h2>"));
-	content->addWidget(radial = new QCheckBox("Radial"));
-	content->addWidget(fourier = new QCheckBox("Fourier"));
-	{
-		QHBoxLayout *fourier_layout = new QHBoxLayout;
-
-		fourier_layout->addWidget(new HelpLabel("Fourier image percent: ", "normals/flatten"));
-		fourier_layout->addWidget(fourier_radius = new QSpinBox);
-		fourier_radius->setRange(0, 100);
-
-		content->addLayout(fourier_layout);
-	}
-
-	content->addSpacing(30);
-	content->addWidget(new QLabel("<h2>Export 3D surface</h2>"));
-	content->addSpacing(30);
-	{
-		QHBoxLayout *discontinuity_layout = new QHBoxLayout;
-
-		discontinuity_layout->addWidget(new HelpLabel("Disconitnuity parameter:", "normals/disconituity"));
-		discontinuity_layout->addWidget(discontinuity = new QDoubleSpinBox);
-		discontinuity->setRange(0.0, 4.0);
-		discontinuity->setValue(2.0);
-		content->addLayout(discontinuity_layout);
-	}
-
-	content->addWidget(tif = new QCheckBox("TIF: depthmap"));
-	content->addWidget(ply = new QCheckBox("PLY: mesh"));
-
-
-	QPushButton *save = new QPushButton("Export");
-	content->addWidget(save);
-
-	connect(save, SIGNAL(clicked()), this, SLOT(save()));
-
-	content->addStretch();
+void NormalsFrame::init() {
+	export_row->suggestPath();
 }
 
 void NormalsFrame::save() {
@@ -124,6 +82,7 @@ void NormalsFrame::save() {
 
 	NormalsTask *task = new NormalsTask();
 	task->parameters = parameters;
+	task->output = parameters.path;
 	task->initFromProject(qRelightApp->project());
 
 	ProcessQueue &queue = ProcessQueue::instance();

relightlab/normalsframe.h

@@ -21,6 +21,7 @@ class NormalsFrame: public QFrame {
 
 public slots:
 	void save();
+	void init();
 
 signals:
 	void processStarted();

relightlab/normalsplan.cpp

@@ -23,6 +23,7 @@ NormalsSourceRow::NormalsSourceRow(NormalsParameters &_parameters, QFrame *paren
 	label->help->setId("normals/normalmap");
 
 	compute = new QLabelButton("Compute", "Compute normals from images");
+
 	file = new QLabelButton("Normalmap", "Loat a normalmap image.");
 	buttons->addWidget(compute, 0, Qt::AlignCenter);
 
@@ -47,11 +48,14 @@ NormalsSourceRow::NormalsSourceRow(NormalsParameters &_parameters, QFrame *paren
 
 	group->addButton(compute);
 	group->addButton(file);
+
+	setComputeSource(parameters.compute);
 }
 
 
-void NormalsSourceRow::setComputeSource(bool compute) {
-	parameters.compute = compute;
+void NormalsSourceRow::setComputeSource(bool build) {
+	parameters.compute = build;
+	compute->setChecked(build);
 }
 
 
@@ -97,6 +101,8 @@ NormalsFlattenRow::NormalsFlattenRow(NormalsParameters &_parameters, QFrame *par
 	group->addButton(none);
 	group->addButton(radial);
 	group->addButton(fourier);
+
+	setFlattenMethod(parameters.flatMethod);
 }
 
 void NormalsFlattenRow::setFlattenMethod(FlatMethod method) {
@@ -171,6 +177,8 @@ NormalsSurfaceRow::NormalsSurfaceRow(NormalsParameters &_parameters, QFrame *par
 	group->addButton(none);
 	group->addButton(bni);
 	group->addButton(assm);
+
+	setSurfaceMethod(parameters.surface_integration);
 }
 
 void NormalsSurfaceRow::setSurfaceMethod(SurfaceIntegration surface) {
@@ -231,9 +239,11 @@ void NormalsExportRow::selectOutput() {
 	setPath(output);
 }
 
+
 void NormalsExportRow::suggestPath() {
 	QDir input = qRelightApp->project().dir;
 	input.cdUp();
 	QString filename = input.filePath("normals");
 	setPath(filename);
 }
+

relightlab/normalsplan.h

@@ -73,4 +73,3 @@ public slots:
 	QLineEdit *path_edit;
 };
 
-

relightlab/processqueue.cpp

@@ -88,7 +88,7 @@ void ProcessQueue::removeTask(Task *a) {
 	if(index < 0)
 		return;
 
-	Task *task = queue.takeAt(index);
+	queue.takeAt(index);
 	emit update();
 }
 
@@ -98,7 +98,7 @@ void ProcessQueue::removeTask(int id) {
 	if(index < 0)
 		return;
 
-	Task *task = queue.takeAt(index);
+	queue.takeAt(index);
 	//processqueue is never the owner!
 	//delete task;
 	emit update();

relightlab/relightapp.cpp

@@ -204,8 +204,13 @@ void RelightApp::newProject() {
 	QStringList lps = QDir(dir).entryList(img_ext);
 	if(lps.size() > 0) {
 		int answer = QMessageBox::question(mainwindow, "Found an .lp file: " + lps[0], "Do you wish to load " + lps[0] + "?", QMessageBox::Yes, QMessageBox::No);
-		if(answer != QMessageBox::No)
-			m_project.loadLP(lps[0]);
+		if(answer != QMessageBox::No) {
+			try {
+				m_project.loadLP(lps[0]);
+			} catch(QString error) {
+				QMessageBox::critical(mainwindow, "Could not load the .lp file", error);
+			}
+		}
 	}
 }
 

relightlab/relightlab.pro

@@ -110,7 +110,9 @@ SOURCES += main.cpp \
     ../src/bni_normal_integration.cpp \
     scaleframe.cpp \
     planrow.cpp \
-    normalsplan.cpp
+    normalsplan.cpp \
+    brdfframe.cpp \
+    metadataframe.cpp
 
 RESOURCES += \
     res.qrc
@@ -194,7 +196,9 @@ HEADERS += \
     scaleframe.h \
     ../src/flatnormals.h \
     planrow.h \
-    normalsplan.h
+    normalsplan.h \
+    brdfframe.h \
+    metadataframe.h
 
 FORMS +=
 

src/project.cpp

@@ -551,12 +551,7 @@ void Project::loadLP(QString filename) {
 
 
 	parseLP(filename, directions, filenames); //might throw an error.
-
-	if(size() != filenames.size()) {
-		throw QString("The folder contains %1 images, the .lp file specify %2 images.\n"
-					  "You might have some extraneous images, or just loading the wrong .lp file.")
-				.arg(size()).arg(filenames.size());
-	}
+	validateDome(filenames.size());
 
 	vector<Vector3f> ordered_dir(directions.size());
 	bool success = true;
@@ -688,3 +683,11 @@ void  Project::computeDirections() {
 	}
 	needs_saving = true;
 }
+
+void Project::validateDome(size_t n_lights) {
+	if(size() != n_lights) {
+		throw QString("The folder contains %1 images, the .lp file specify %2 images.\n"
+					  "You might have some extraneous images, or just loading the wrong .lp file.")
+				.arg(size()).arg(n_lights);
+	}
+}

src/project.h

@@ -110,6 +110,7 @@ class Project {
 		}
 		return -1;
 	}
+	void validateDome(size_t n_lights); //throw an error in case the number of lights is not consistent.
 
 };