added some checks.

Author: ponchio

relightlab/alignrow.cpp

@@ -31,6 +31,13 @@ void FindAlignment::run() {
 		if(image.skip) continue;
 
 		QImage img(image.filename);
+		if(img.isNull()) {
+			mutex.lock();
+			status = FAILED;
+			mutex.unlock();
+			progressed(QString("Failed loading image: %1").arg(image.filename), 100);
+			return;
+		}
 		align->readThumb(img, i);
 
 		int progress = std::min(99, (int)(100*(i+1) / project.images.size()));

relightlab/imageview.cpp

@@ -26,7 +26,7 @@ void ImageView::showImage(int id) {
 
 	QString filename = project.images[id].filename;
 
-	QImage img(project.dir.filePath(filename));
+	QImage img(filename);
 	if(img.isNull()) {
 		QMessageBox::critical(this, "Houston we have a problem!", "Could not load image " + filename);
 		return;

relightlab/main.cpp

@@ -10,24 +10,27 @@
 
 #include <locale.h>
 
+#include <iostream>
+using namespace std;
+
 #define RELIGHT_STRINGIFY0(v) #v
 #define RELIGHT_STRINGIFY(v) RELIGHT_STRINGIFY0(v)
 
 Project project;
 
 int main(int argc, char *argv[]) {
 
+
 	RelightApp app(argc, argv);
 
 	QApplication::setAttribute(Qt::AA_MacDontSwapCtrlAndMeta);
 	setlocale(LC_ALL, "en_US.UTF8"); //needs to be called AFTER QApplication creation.
 
 #if QT_VERSION >= 0x060000
 	//large images wont load because of this limit!
-	QImageReader::setAllocationLimit(uint64_t(1)<<31);
+	QImageReader::setAllocationLimit(0);
 #endif
 
-
 	QCoreApplication::setOrganizationName("VCG");
 	QCoreApplication::setOrganizationDomain("vcg.isti.cnr.it");
 	QCoreApplication::setApplicationName("RelightLab");

relightlab/relightapp.cpp

@@ -227,55 +227,52 @@ void RelightApp::openProject() {
 }
 
 void RelightApp::openProject(const QString &filename) {
+
+	QString current = QDir::currentPath();
+
 	Project *project = new Project;
 	try {
 		project->load(filename);
 	} catch(QString e) {
 		QMessageBox::critical(mainwindow, "Could not load project", e);
+		QDir::setCurrent(current);
 		return;
 	}
 
-	QFileInfo info(filename);
-	QDir::setCurrent(info.canonicalPath());
-
 	while(project->missing.size() != 0) {
-
-		QString msg = "Could not find this images:\n";
+		QString msg = "Could not find these images:\n";
 		for(int i: project->missing)
 			msg += "\t" + project->images[i].filename + "\n";
 
+		if(msg.size() > 300)
+		msg = msg.left(297) + "...";
+
 		QMessageBox box(mainwindow);
 		box.setText(msg);
 		box.setWindowTitle("Missing images");
-		box.addButton("Ignore missing images", QMessageBox::AcceptRole);
 		box.addButton("Select a different folder...", QMessageBox::ActionRole);
 		box.addButton("Cancel", QMessageBox::RejectRole);
 		int ret = box.exec();
 
-		switch(ret) {
-		case 1: {
-			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);
-			QDir::setCurrent(imagefolder);
-			project->checkMissingImages();
-			project->checkImages();
-			}
-			break;
-		case 2: //cancel
+		if(ret == 2) {
+			QDir::setCurrent(current);
 			return;
-		case 3: //ignore
-			project->missing.clear();
-			break;
 		}
-	}
 
+		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.");
+			QDir::setCurrent(current);
+			return;
+		}
+		project->dir.setPath(imagefolder);
+		QDir::setCurrent(imagefolder);
+		project->checkMissingImages();
+		project->checkImages();
+	}
 	qRelightApp->setProject(project);
 
-	project_filename = filename; //project.dir.relativeFilePath(filename);
+	project_filename = filename;
 	addRecentProject(filename);
 	mainwindow->updateRecentProjectsMenu();
 }

relightlab/rtiframe.cpp

@@ -123,12 +123,21 @@ void RtiFrame::exportRti() {
 		if(answer == QMessageBox::No)
 			return;
 	}
+	Dome::LightConfiguration previous = project.dome.lightConfiguration;
+
+	if(parameters.basis == Rti::RBF && project.dome.lightConfiguration == Dome::SPHERICAL) {
+		QMessageBox::warning(this, "RBF limitations",
+			"RBF basis do not support positional lights. (BLN does)\n"
+			"Using directiona lights instead.");
+		project.dome.lightConfiguration = Dome::DIRECTIONAL;
+	}
 
 	RtiTask *rti_task = new RtiTask();
 	try {
 		rti_task->setProject(project);
 		rti_task->setParameters(parameters);
 		rti_task->output = parameters.path;
+		project.dome.lightConfiguration = previous;
 
 	} catch(QString error) {
 		QMessageBox::critical(this, "Something went wrong", error);

relightlab/sphererow.cpp

@@ -34,7 +34,7 @@ void DetectHighlights::run() {
 
 		Image &image = project.images[i];
 
-		QImage img(project.dir.filePath(image.filename));
+		QImage img(image.filename);
 		if(img.isNull()) {
 			mutex.lock();
 			status = FAILED;

src/imageset.cpp

@@ -65,11 +65,12 @@ bool ImageSet::initFromProject(Project &project) {
 		throw QString("Number of lights in dome needs to be equal to the number of images");
 	}
 	int count = 0;
-	for(int i = 0; i < lights1.size(); i++) {
+	for(size_t i = 0; i < lights1.size(); i++) {
 		if(visibles[i])
 			lights1[count++] = lights1[i];
 	}
 	lights1.resize(count);
+	return true;
 }
 
 bool ImageSet::initFromProject(QJsonObject &obj, const QString &filename) {

src/project.cpp

@@ -254,6 +254,7 @@ void Project::load(QString filename) {
 	if(!file.open(QFile::ReadOnly))
 		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();
 
@@ -340,16 +341,17 @@ void Project::checkMissingImages() {
 	missing.clear();
 	for(size_t i = 0; i < images.size(); i++) {
 		Image &image = images[i];
-		QFileInfo imginfo(image.filename);
+		QFileInfo imginfo(dir.filePath(image.filename));
 		if(!imginfo.exists()) {
 			missing.push_back(int(i));
-			throw "Could not find the image:\n" + image.filename + " in folder: " + dir.absolutePath();
 		}
 	}
 }
 void Project::checkImages() {
 	for(Image &image:images) {
 		QImageReader reader(image.filename);
+		if(!reader.canRead())
+			continue;
 		QSize size = reader.size();
 		image.valid = (size == imgsize);
 		if(!image.valid) image.skip = true;

src/sphere.cpp

@@ -196,6 +196,7 @@ bool inEllipse(double x, double y, double a, double b, double theta) {
 void Sphere::findHighlight(QImage img, int n, bool skip, bool update_positions) {
 	if(sphereImg.isNull()) {
 		sphereImg = QImage(inner.width(), inner.height(), QImage::Format_ARGB32);
+		sphereImg.fill(0);
 	}
 
 
@@ -230,8 +231,6 @@ void Sphere::findHighlight(QImage img, int n, bool skip, bool update_positions)
 					float d = sqrt(cx*cx + cy*cy);
 					if(d > smallradius) continue;
 				}
-				assert(x < img.width());
-				assert(y < img.height());
 				QRgb c = img.pixel(x, y);
 				int g = qGray(c);