tweaking reflection detection algorithm again.

Author: ponchio

relightlab/sphererow.cpp

@@ -147,6 +147,7 @@ void SphereRow::detectHighlights(bool update) {
 		connect(detect_highlights, &DetectHighlights::progress, this, &SphereRow::updateStatus); //, Qt::QueuedConnection);
 	}
 	detect_highlights->stop();
+	detect_highlights->update_positions = update;
 
 	ProcessQueue &queue = ProcessQueue::instance();
 	queue.removeTask(detect_highlights);

relightlab/task.cpp

@@ -93,7 +93,6 @@ void Task::runScript(QString program, QString script, QStringList arguments, QSt
 
 void Task::pause() {
 	mutex.lock();
-	assert(status == RUNNING);
 	status = PAUSED;
 }
 
@@ -106,7 +105,6 @@ void Task::resume() {
 
 void Task::setStatus(Status s) {
 	if(s == PAUSED) {
-		assert(status != PAUSED);
 		pause();
 		return;
 	}

relightlab/verifyview.cpp

@@ -80,7 +80,7 @@ VerifyView:: VerifyView(QImage &_image, int _height, QPointF &_pos, VerifyMarker
 	center = QPointF(image.width()/2.0f, image.height()/2.0f);
 
 	marker_item = new VerifyMarker(this, marker);
-	marker_item->radius = 8*scale;
+	marker_item->radius = 8/scale;
 	marker_item->setPos(pos + center);
 	marker_item->active = !pos.isNull();
 	scene.addItem(marker_item);
@@ -92,13 +92,23 @@ VerifyView:: VerifyView(QImage &_image, int _height, QPointF &_pos, VerifyMarker
 	font.setPointSize(pix.height()/20.0f);  // Set font size to 20
 	img_number->setFont(font);
 
+	border = new QGraphicsRectItem(img_item->boundingRect(), img_item);
+	border->setPen(QPen(Qt::transparent, 2.0*scale));
+
 	scene.addItem(img_number);
+
+	setSelected(true);
 }
 
 void VerifyView::setImageNumber(int n) {
 	img_number->setText(QString::number(n));
 }
 
+void VerifyView::setSelected(bool isSelected) {
+	selected = isSelected;
+	border->setPen(isSelected ? QPen(Qt::blue, 2) : QPen(Qt::transparent));
+}
+
 void VerifyView::update() {
 	QPointF p = marker_item->pos();
 	if(!img_item->boundingRect().contains(p)) {

relightlab/verifyview.h

@@ -31,19 +31,27 @@ class VerifyView: public QGraphicsView {
 	Q_OBJECT
 public:
 	VerifyMarker::Marker marker;
+	bool selected = false;
 
 	VerifyView(QImage &image, int height, QPointF &pos, VerifyMarker::Marker _marker, QWidget *parent = nullptr);
 	void setImageNumber(int n);
 	void update(); //update pos from marker
 	void set(); //update marker from pos
+	void setSelected(bool isSelected);
+
+signals:
+	void clicked(QMouseEvent *event);
 
 protected:
 	void resizeEvent(QResizeEvent *event) override;
 	void keyPressEvent(QKeyEvent *event) override;
-protected:
+	void mousePressEvent(QMouseEvent *event) override {
+		emit clicked(event);
+	}
 	VerifyMarker *marker_item = nullptr;
 	QGraphicsPixmapItem *img_item = nullptr;
 	QGraphicsSimpleTextItem *img_number = nullptr;
+	QGraphicsRectItem *border = nullptr;
 	QGraphicsScene scene ;
 	QImage ℑ
 	QPointF center;

src/sphere.cpp

@@ -208,14 +208,17 @@ void Sphere::findHighlight(QImage img, int n, bool skip, bool update_positions)
 	uchar threshold = 240;
 	//0.5% of the area allocated to the reflection.
 	int highlight_area = (inner.width()*inner.height())/200;
+	if(n == 0)
+		cout << "Area: " << highlight_area << endl;
 	vector<int> histo;
 
 	//lower threshold until we find something.
+	int max_luma_pixel = 0;
 	QPointF bari(0, 0); //in image coords
 	int count = 0;
 	int iter = 0;
 	while(count < highlight_area && threshold > 100) {
-		bari = QPointF(0, 0);
+		QPointF new_bari = QPointF(0, 0);
 		count = 0;
 		for(int y = inner.top(); y < inner.bottom(); y++) {
 			for(int x = inner.left(); x < inner.right(); x++) {
@@ -237,38 +240,43 @@ void Sphere::findHighlight(QImage img, int n, bool skip, bool update_positions)
 
 				assert(X >= 0 && X < sphereImg.width());
 				assert(Y >= 0 && Y < sphereImg.height());
-				int mg = qGray(sphereImg.pixel(X, Y));
-				if(g > mg) sphereImg.setPixel(X, Y, qRgb(g, g, g));
+				int thumb_g = qGray(sphereImg.pixel(X, Y));
+				if(g > thumb_g) sphereImg.setPixel(X, Y, qRgb(g, g, g));
 
+				max_luma_pixel = std::max(max_luma_pixel, g);
 				if(g < threshold) continue;
-				//sphereImg.setPixel(X, Y, qRgb(threshold, 0, 0));
-				
-				bari += QPointF(x, y);
+
+				new_bari += QPointF(x, y);
 				count++;
 
 			}
 		}
 		histo.push_back(count);
 
 		if(count > 0) {
-			bari.rx() /= count;
-			bari.ry() /= count;
+			new_bari.rx() /= count;
+			new_bari.ry() /= count;
+			bari = new_bari;
 		}
-		//sphereImg.setPixel(int(bari.x()) - inner.left(), int(bari.y()) - inner.top(), qRgb(255, 255, 255));
-		
-		
+
 		threshold -= 10;
 		iter++;
 	}
+	//threshold now is 10 lower so we get more points.
+	threshold += 10;
+
+	if(bari.isNull()) {
+		cout << "Bari null! " << n << endl;
+	}
+
 	if(!update_positions)
 		return;
 
-	//threshold now is 10 lower so we get more points.
-	threshold += 10;
 
-	if(threshold < 127) {
+	if(max_luma_pixel < 127) {
 		//highlight in the mid greys? probably all the sphere is in shadow.
 		lights[n] = QPointF(0, 0);
+		cout << "Probably in shadow: " << n << endl;
 		return;
 	}
 
@@ -306,16 +314,7 @@ void Sphere::findHighlight(QImage img, int n, bool skip, bool update_positions)
 		bari = newbari/weight;
 		radius *= 0.5;
 	}
-	//sphereImg.setPixel(int(bari.x()) - inner.left(), int(bari.y()) - inner.top(), qRgb(0, 255, 0));
-	
 
-	/*	if(!sphere) {
-		sphere = new QGraphicsPixmapItem(QPixmap::fromImage(sphereImg));
-		sphere->setZValue(-0.5);
-		sphere->setPos(inner.topLeft());
-	} else {
-		sphere->setPixmap(QPixmap::fromImage(sphereImg));
-	} */
 	lights[n] = bari;
 }