dome radius instead of diameter

sphere initialization wrong directory fixed

Author: ponchio

relightlab/lightgeometry.cpp

@@ -68,15 +68,15 @@ LightsGeometry::LightsGeometry(QWidget *parent): QFrame(parent) {
 	grid->setColumnMinimumWidth(0, 200);
 	grid->addWidget(new QLabel("Image width:"), 2, 0);
 	grid->addWidget(image_width = new QDoubleSpinBox, 2, 1);
-	image_width->setRange(0, 1000);
+	image_width->setRange(0, 10000);
 	grid->addWidget(new QLabel("mm"), 2, 2);
 	connect(image_width, QOverload<double>::of(&QDoubleSpinBox::valueChanged), [&](double v) { qRelightApp->project().dome.imageWidth = v; });
 
-	grid->addWidget(new QLabel("Diameter:"), 3, 0);
+	grid->addWidget(new QLabel("Dome radius:"), 3, 0);
 	grid->addWidget(diameter = new QDoubleSpinBox, 3, 1);
-	diameter->setRange(0, 1000);
+	diameter->setRange(0, 10000);
 	grid->addWidget(new QLabel("mm"), 3, 2);
-	connect(diameter, QOverload<double>::of(&QDoubleSpinBox::valueChanged), [&](double v) { qRelightApp->project().dome.domeDiameter = v; });
+	connect(diameter, QOverload<double>::of(&QDoubleSpinBox::valueChanged), [&](double v) { qRelightApp->project().dome.domeDiameter = v*2.0; });
 
 	grid->addWidget(new QLabel("Vertical offset:"), 4, 0);
 	grid->addWidget(vertical_offset = new QDoubleSpinBox, 4, 1);
@@ -127,7 +127,7 @@ void LightsGeometry::init() {
 	vertical_offset->setEnabled(spherical);
 
 	image_width->setValue(dome.imageWidth);
-	diameter->setValue(dome.domeDiameter);
+	diameter->setValue(dome.domeDiameter/2.0);
 	vertical_offset->setValue(dome.verticalOffset);
 	directions_view->initFromDome(dome);
 }

relightlab/mainwindow.cpp

@@ -146,6 +146,7 @@ void MainWindow::init() {
 	image_frame->init();
 	align_frame->init();
 	scale_frame->init();
+	sphere_frame->init();
 	lights_frame->init();
 	crop_frame->init();
 	rti_frame->init();

relightlab/sphererow.cpp

@@ -11,6 +11,7 @@
 #include <QLabel>
 #include <QProgressBar>
 #include <QPushButton>
+#include <QMessageBox>
 
 DetectHighlights::DetectHighlights(Sphere *_sphere, bool update) {
 	sphere = _sphere;
@@ -20,6 +21,7 @@ DetectHighlights::DetectHighlights(Sphere *_sphere, bool update) {
 }
 
 void DetectHighlights::run() {
+	//TODO: create a setStatus function in Task.
 	mutex.lock();
 	status = RUNNING;
 	mutex.unlock();
@@ -32,7 +34,14 @@ void DetectHighlights::run() {
 
 		Image &image = project.images[i];
 
-		QImage img(image.filename);
+		QImage img(project.dir.filePath(image.filename));
+		if(img.isNull()) {
+			mutex.lock();
+			status = FAILED;
+			mutex.unlock();
+			progressed(QString("Failed loading image: %1").arg(image.filename), 100);
+			return;
+		}
 		sphere->findHighlight(img, i, image.skip, update_positions);
 
 		int progress = std::min(99, (int)(100*(i+1) / project.images.size()));
@@ -118,8 +127,12 @@ void SphereRow::remove() {
 	emit removeme(this);
 }
 
-void SphereRow::updateStatus(QString /*msg*/, int percent) {
-//	status->setText(msg);
+void SphereRow::updateStatus(QString msg, int percent) {
+	if(detect_highlights->status == Task::FAILED) {
+		QMessageBox::critical(this, "Could not detect highlights!", msg);
+		progress->setValue(0);
+		return;
+	}
 	progress->setValue(percent);
 	reflections->update();
 	if(percent == 100) {

src/sphere.cpp

@@ -230,7 +230,8 @@ 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);