Tweaked highlight algorithm, fixed some concurrency problem.

Author: ponchio

relightlab/alignrow.cpp

@@ -20,9 +20,7 @@ FindAlignment::FindAlignment(Align *_align, bool update) {
 }
 
 void FindAlignment::run() {
-	mutex.lock();
-	status = RUNNING;
-	mutex.unlock();
+	setStatus(RUNNING);
 
 	Project &project = qRelightApp->project();
 	for(size_t i = 0; i < project.images.size(); i++) {
@@ -32,21 +30,18 @@ void FindAlignment::run() {
 
 		QImage img(image.filename);
 		if(img.isNull()) {
-			mutex.lock();
-			status = FAILED;
-			mutex.unlock();
+			setStatus(FAILED);
 			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()));
-		progressed(QString("Collecting patches"), progress);
+		if(!progressed(QString("Collecting patches"), progress))
+			return;
 	}
 	progressed(QString("Done"), 100);
-	mutex.lock();
-	status = DONE;
-	mutex.unlock();
+	setStatus(DONE);
 }
 
 

relightlab/sphererow.cpp

@@ -21,10 +21,7 @@ DetectHighlights::DetectHighlights(Sphere *_sphere, bool update) {
 }
 
 void DetectHighlights::run() {
-	//TODO: create a setStatus function in Task.
-	mutex.lock();
-	status = RUNNING;
-	mutex.unlock();
+	setStatus(RUNNING);
 
 	sphere->sphereImg.fill(0);
 	sphere->thumbs.clear();
@@ -36,21 +33,18 @@ void DetectHighlights::run() {
 
 		QImage img(image.filename);
 		if(img.isNull()) {
-			mutex.lock();
-			status = FAILED;
-			mutex.unlock();
+			setStatus(FAILED);
 			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()));
-		progressed(QString("Detecting highlights"), progress);
+		if(!progressed(QString("Detecting highlights"), progress))
+			return;
 	}
 	progressed(QString("Done."), 100);
-	mutex.lock();
-	status = DONE;
-	mutex.unlock();
+	setStatus(DONE);
 }
 
 

relightlab/task.cpp

@@ -93,6 +93,7 @@ void Task::runScript(QString program, QString script, QStringList arguments, QSt
 
 void Task::pause() {
 	mutex.lock();
+	assert(status == RUNNING);
 	status = PAUSED;
 }
 
@@ -103,10 +104,24 @@ void Task::resume() {
 	}
 }
 
+void Task::setStatus(Status s) {
+	if(s == PAUSED) {
+		assert(status != PAUSED);
+		pause();
+		return;
+	}
+	if(status != PAUSED) {
+		mutex.lock();
+	}
+	status = s;
+	mutex.unlock();
+}
+
 void Task::stop() {
 	if(status == PAUSED) { //we were already locked then.
 		status = STOPPED;
 		mutex.unlock();
+		return;
 	}
 	status = STOPPED;
 }

relightlab/task.h

@@ -27,6 +27,7 @@ class Task: public QThread {
 	virtual void stop();
 	virtual void pause();
 	virtual void resume();
+	virtual void setStatus(Status s);
 
 
 	void runPythonScript(QString script, QStringList arguments, QString workingdir = QString());

src/sphere.cpp

@@ -206,14 +206,15 @@ void Sphere::findHighlight(QImage img, int n, bool skip, bool update_positions)
 		return;
 
 	uchar threshold = 240;
-
+	//0.5% of the area allocated to the reflection.
+	int highlight_area = (inner.width()*inner.height())/200;
 	vector<int> histo;
 
 	//lower threshold until we find something.
 	QPointF bari(0, 0); //in image coords
 	int count = 0;
 	int iter = 0;
-	while(count < 10 && threshold > 100) {
+	while(count < highlight_area && threshold > 100) {
 		bari = QPointF(0, 0);
 		count = 0;
 		for(int y = inner.top(); y < inner.bottom(); y++) {
@@ -265,7 +266,7 @@ void Sphere::findHighlight(QImage img, int n, bool skip, bool update_positions)
 	//threshold now is 10 lower so we get more points.
 	threshold += 10;
 
-	if(threshold < 200) {
+	if(threshold < 127) {
 		//highlight in the mid greys? probably all the sphere is in shadow.
 		lights[n] = QPointF(0, 0);
 		return;