dealing with disabled images

Author: ponchio

relightlab/lightgeometry.cpp

@@ -139,7 +139,7 @@ void LightsGeometry::setFromSpheres() {
 	//call appropriate compute directions/positions
 	Dome &dome = project.dome;
 	dome.label = "";
-	dome.fromSpheres(project.spheres, project.lens);
+	dome.fromSpheres(project.images, project.spheres, project.lens);
 
 	init();
 }

relightlab/relightapp.cpp

@@ -118,6 +118,7 @@ RelightApp::RelightApp(int &argc, char **argv): QApplication(argc, argv) {
 		systemTray->setVisible(false);
 	}
 
+	m_project = new Project;
 
 }
 void RelightApp::notify(const QString &title, const QString &msg, int ms) {
@@ -148,16 +149,18 @@ void RelightApp::setDarkTheme(bool dark) {
 	QSettings().setValue("dark", dark);
 }
 
-void RelightApp::setProject(const Project &_project) {
+void RelightApp::setProject(Project *_project) {
 	//cleanup interface and stop (and remove) project related tasks.
 	mainwindow->clear();
 
+	delete m_project;
+
 	m_project = _project;
 	loadThumbnails();
 
 	mainwindow->init();
 	mainwindow->setTabIndex(1);
-	qRelightApp->setLastProjectDir(m_project.dir.path());
+	qRelightApp->setLastProjectDir(m_project->dir.path());
 	qRelightApp->clearLastOutputDir();
 }
 
@@ -169,28 +172,28 @@ void RelightApp::newProject() {
 	if(dir.isNull()) return;
 
 
-	Project project;
-	project.setDir(QDir(dir));
-	bool ok = project.scanDir();
-	if(!project.size()) {
-		QMessageBox::critical(mainwindow, "Houston we have a problem!", "Could not find images in directory: " + project.dir.path());
+	Project *project = new Project;
+	project->setDir(QDir(dir));
+	bool ok = project->scanDir();
+	if(!project->size()) {
+		QMessageBox::critical(mainwindow, "Houston we have a problem!", "Could not find images in directory: " + project->dir.path());
 		return;
 	}
 
 	if(!ok) {
 		//check if we can rotate a few images.
 		bool canrotate = false;
-		for(Image &image: project.images) {
-			if(image.size == project.imgsize)
+		for(Image &image: project->images) {
+			if(image.size == project->imgsize)
 				continue;
 
-			if(image.isRotated(project.imgsize))
+			if(image.isRotated(project->imgsize))
 				canrotate = true;
 		}
 		if(canrotate) {
 			int answer = QMessageBox::question(mainwindow, "Some images are rotated.", "Do you wish to uniform image rotation?", QMessageBox::Yes, QMessageBox::No);
 			if(answer != QMessageBox::No)
-				project.rotateImages();
+				project->rotateImages();
 		} else
 			QMessageBox::critical(mainwindow, "Resolution problem", "Not all of the images in the folder have the same resolution,\nyou might need to fix this problem manually.");
 	}
@@ -206,7 +209,7 @@ void RelightApp::newProject() {
 		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) {
 			try {
-				m_project.loadLP(lps[0]);
+				m_project->loadLP(lps[0]);
 			} catch(QString error) {
 				QMessageBox::critical(mainwindow, "Could not load the .lp file", error);
 			}
@@ -224,9 +227,9 @@ void RelightApp::openProject() {
 }
 
 void RelightApp::openProject(const QString &filename) {
-	Project project;
+	Project *project = new Project;
 	try {
-		project.load(filename);
+		project->load(filename);
 	} catch(QString e) {
 		QMessageBox::critical(mainwindow, "Could not load project", e);
 		return;
@@ -235,11 +238,11 @@ void RelightApp::openProject(const QString &filename) {
 	QFileInfo info(filename);
 	QDir::setCurrent(info.canonicalPath());
 
-	while(project.missing.size() != 0) {
+	while(project->missing.size() != 0) {
 
 		QString msg = "Could not find this images:\n";
-		for(int i: project.missing)
-			msg += "\t" + project.images[i].filename + "\n";
+		for(int i: project->missing)
+			msg += "\t" + project->images[i].filename + "\n";
 
 		QMessageBox box(mainwindow);
 		box.setText(msg);
@@ -251,21 +254,21 @@ void RelightApp::openProject(const QString &filename) {
 
 		switch(ret) {
 		case 1: {
-			QString imagefolder = QFileDialog::getExistingDirectory(mainwindow, "Could not find the images, please select the image folder:", project.dir.absolutePath());
+			QString imagefolder = QFileDialog::getExistingDirectory(mainwindow, "Could not find the images, please select the image folder:", project->dir.absolutePath());
 			if(imagefolder.isNull()) {
 				QMessageBox::critical(mainwindow, "No folder selected", "No folder selected.");
 				return;
 			}
-			project.dir.setPath(imagefolder);
+			project->dir.setPath(imagefolder);
 			QDir::setCurrent(imagefolder);
-			project.checkMissingImages();
-			project.checkImages();
+			project->checkMissingImages();
+			project->checkImages();
 			}
 			break;
 		case 2: //cancel
 			return;
 		case 3: //ignore
-			project.missing.clear();
+			project->missing.clear();
 			break;
 		}
 	}
@@ -288,7 +291,7 @@ void RelightApp::saveProject() {
 		project_filename = filename;
 	}
 
-	m_project.save(project_filename);
+	m_project->save(project_filename);
 
 	QFileInfo info(project_filename);
 	mainwindow->setWindowTitle("Relight - " + info.fileName());
@@ -304,7 +307,7 @@ void RelightApp::saveProjectAs() {
 		filename += ".relight";
 	project_filename = filename;
 
-	m_project.save(project_filename);
+	m_project->save(project_filename);
 	QFileInfo info(project_filename);
 	mainwindow->setWindowTitle("Relight - " + info.fileName());
 	addRecentProject(project_filename);
@@ -319,10 +322,10 @@ void RelightApp::loadThumbnails() {
 		delete loader;
 		loader = nullptr;
 	}
-	m_thumbnails.resize(m_project.images.size());
+	m_thumbnails.resize(m_project->images.size());
 	QStringList paths;
-	for(size_t i = 0; i < m_project.images.size(); i++) {
-		Image &image = m_project.images[i];
+	for(size_t i = 0; i < m_project->images.size(); i++) {
+		Image &image = m_project->images[i];
 		if(i == 0) {
 			QImage img(image.filename);
 			if(img.isNull()) {
@@ -399,7 +402,7 @@ void RelightApp::close() {
 
 
 bool RelightApp::needsSavingProceed() {
-	if(!m_project.needs_saving)
+	if(!m_project->needs_saving)
 		return true;
 	auto answer = QMessageBox::question(mainwindow, "Current project is unsaved", "Do you want to proceed without saving?");
 	return answer == QMessageBox::Yes;

relightlab/relightapp.h

@@ -53,7 +53,7 @@ class ThumbailLoader: public QThread {
 class RelightApp: public QApplication {
 	Q_OBJECT
 public:
-	Project m_project;
+	Project *m_project = nullptr;
 	std::vector<QImage> m_thumbnails;
 
 	QMap<QString, QAction *> actions;
@@ -62,7 +62,7 @@ class RelightApp: public QApplication {
 	QSystemTrayIcon *systemTray = nullptr;
 
 	RelightApp(int &argc, char **argv);
-	virtual ~RelightApp() {}
+	virtual ~RelightApp() { delete m_project; }
 	void run();
 
 public slots:
@@ -81,8 +81,8 @@ public slots:
 	void updateThumbnail(int pos);
 
 public:
-	void setProject(const Project &project);
-	Project &project() { return m_project; }
+	void setProject(Project *project);
+	Project &project() { return *m_project; }
 
 	QMutex thumbails_lock;
 	std::vector<QImage> &thumbnails() { return m_thumbnails; }
@@ -99,7 +99,7 @@ public slots:
 	QString lastOutputDir() {
 		if(!last_output_dir.isEmpty())
 			return last_output_dir;
-		QDir out = m_project.dir;
+		QDir out = m_project->dir;
 		out.cdUp();
 		return out.absolutePath();
 	}

relightlab/spherepanel.cpp

@@ -45,7 +45,6 @@ void SpherePanel::clear() {
 
 void SpherePanel::init() {
 	auto &project_spheres = qRelightApp->project().spheres;
-	//setVisible(project_spheres.size() > 0);
 	for(Sphere *sphere: project_spheres) {
 		sphere->fit();
 		SphereRow * row = addSphere(sphere);
@@ -58,7 +57,6 @@ void SpherePanel::newSphere() {
 	if(!sphere_dialog)
 		sphere_dialog = new SphereDialog(this);
 
-	//TODO ACTUALLY images might be skipped!
 	Sphere *sphere = new Sphere(qRelightApp->project().images.size());
 	sphere_dialog->setSphere(sphere);
 	int answer = sphere_dialog->exec();

relightlab/sphererow.cpp

@@ -24,14 +24,16 @@ void DetectHighlights::run() {
 	status = RUNNING;
 	mutex.unlock();
 
+	sphere->sphereImg.fill(0);
+	sphere->thumbs.clear();
+
 	Project &project = qRelightApp->project();
 	for(size_t i = 0; i < project.images.size(); i++) {
 
 		Image &image = project.images[i];
-		if(image.skip) continue;
 
 		QImage img(image.filename);
-		sphere->findHighlight(img, i, update_positions);
+		sphere->findHighlight(img, i, image.skip, update_positions);
 
 		int progress = std::min(99, (int)(100*(i+1) / project.images.size()));
 		progressed(QString("Detecting highlights"), progress);
@@ -128,11 +130,10 @@ void SphereRow::updateStatus(QString /*msg*/, int percent) {
 
 void SphereRow::detectHighlights(bool update) {
 
-
 	if(sphere->center.isNull()) {
-//		status->setText("Needs at least 3 points.");
 		return;
 	}
+	//look for cached data.
 	verify_button->setEnabled(false);
 	if(!detect_highlights) {
 		detect_highlights = new DetectHighlights(sphere, update);

relightlab/sphererow.h

@@ -35,6 +35,7 @@ class SphereRow: public QWidget {
 	QPushButton *verify_button = nullptr;
 	DetectHighlights *detect_highlights = nullptr;
 
+
 	SphereRow(Sphere *sphere, QWidget *parent = nullptr);
 	virtual ~SphereRow();
 	void detectHighlights(bool update = true);

src/dome.cpp

@@ -1,4 +1,5 @@
 #include "dome.h"
+#include "image.h"
 #include "sphere.h"
 #include "lens.h"
 #include "lp.h"
@@ -56,17 +57,17 @@ void Dome::updateSphereDirections() {
 	positions3d = positionsSphere;
 }
 
-void Dome::fromSpheres(std::vector<Sphere *> &spheres, Lens &lens) {
+void Dome::fromSpheres(std::vector<Image> &images, std::vector<Sphere *> &spheres, Lens &lens) {
 	switch(lightConfiguration) {
 	case Dome::DIRECTIONAL:
-		computeDirections(spheres, lens, directions);
+		computeDirections(images, spheres, lens, directions);
 		break;
 	case Dome::SPHERICAL:
-		computeDirections(spheres, lens, directions);
+		computeDirections(images, spheres, lens, directions);
 		updateSphereDirections();
 		break;
 	case Dome::LIGHTS3D:
-		computeParallaxPositions(spheres, lens, positions3d);
+		computeParallaxPositions(images, spheres, lens, positions3d);
 		directions = positions3d;
 		for(size_t i = 0; i < directions.size(); i++) {
 			float len = directions[i].norm();

src/dome.h

@@ -8,6 +8,7 @@
 #include <QString>
 
 class QJsonObject;
+class Image;
 class Lens;
 class Sphere;
 
@@ -46,7 +47,7 @@ class Dome {
 
 	Dome();
 	Dome(const QString &filename) { load(filename); }
-	void fromSpheres(std::vector<Sphere *> &spheres, Lens &lens);
+	void fromSpheres(std::vector<Image> &images, std::vector<Sphere *> &spheres, Lens &lens);
 	void updateSphereDirections();
 	void parseLP(const QString &lp_path);
 	//TODO: move savelp here from project