refactoring align edit dialog

Author: ponchio

relightlab/alignframe.cpp

@@ -11,27 +11,47 @@
 #include <QHBoxLayout>
 #include <QGraphicsRectItem>
 #include <QPushButton>
+#include <QStackedWidget>
 
 #include <iostream>
 using namespace std;
 
 AlignFrame::AlignFrame(QWidget *parent): QFrame(parent) {
-	QVBoxLayout *content = new QVBoxLayout(this);
-
-	content->addSpacing(10);
-	QPushButton *new_align = new QPushButton("New alignment...");
-	new_align->setProperty("class", "large");
-	content->addWidget(new_align);
-	new_align->setMinimumWidth(200);
-	new_align->setMaximumWidth(300);
-
-	QFrame *aligns_frame = new QFrame;
-	content->addWidget(aligns_frame, 0);
-	aligns = new QVBoxLayout(aligns_frame);
-
-	content->addStretch(1);
-	//content->addStretch();
-	connect(new_align, SIGNAL(clicked()), this, SLOT(newAlign()));
+
+	stack = new QStackedWidget;
+
+	{
+		QFrame *align_rows = new QFrame;
+		QVBoxLayout *content = new QVBoxLayout(align_rows);
+		content->addSpacing(10);
+		{
+			QPushButton *new_align = new QPushButton("New alignment...");
+			new_align->setProperty("class", "large");
+			new_align->setMinimumWidth(200);
+			new_align->setMaximumWidth(300);
+			connect(new_align, SIGNAL(clicked()), this, SLOT(newAlign()));
+			content->addWidget(new_align);
+		}
+		{
+			QFrame *aligns_frame = new QFrame;
+			content->addWidget(aligns_frame, 0);
+			aligns = new QVBoxLayout(aligns_frame);
+		}
+		content->addStretch(1);
+
+		stack->addWidget(align_rows);
+	}
+
+	{
+		marker_dialog = new MarkerDialog(MarkerDialog::ALIGN, this);
+		marker_dialog->setWindowFlags(Qt::Widget);
+		connect(marker_dialog, SIGNAL(accepted()), this, SLOT(okMarker()));
+		connect(marker_dialog, SIGNAL(rejected()), this, SLOT(cancelMarker()));
+		stack->addWidget(marker_dialog);
+	}
+
+	QVBoxLayout *layout = new QVBoxLayout(this);
+	layout->addWidget(stack);
 }
 
 void AlignFrame::clear() {
@@ -50,39 +70,61 @@ void AlignFrame::init() {
 	}
 }
 
-/* on user button press */
-void AlignFrame::newAlign() {
-	if(!marker_dialog)
-		marker_dialog = new MarkerDialog(MarkerDialog::ALIGN, this);
+void AlignFrame::okMarker() {
+
+	AlignRow *row = findRow(provisional_align);
 
-	Align *align = new Align(qRelightApp->project().images.size());
-	marker_dialog->setAlign(align);
-	int answer = marker_dialog->exec();
-	if(answer == QDialog::Rejected) {
-		delete align;
-		return;
+	provisional_align->rect = marker_dialog->getAlign();
+	if(!row) { //new align
+		qRelightApp->project().aligns.push_back(provisional_align);
+		row = addAlign(provisional_align);
+	} else {
+		row->setRect(provisional_align->rect);
 	}
-	qRelightApp->project().aligns.push_back(align);
-	AlignRow *row = addAlign(align);
 	row->findAlignment();
+
+	provisional_align = nullptr;
+	stack->setCurrentIndex(0);
+
+}
+
+void AlignFrame::cancelMarker() {
+	AlignRow *row = findRow(provisional_align);
+
+	if(!row) //this was a new align cancelled
+		delete provisional_align;
+
+	provisional_align = nullptr;
+	stack->setCurrentIndex(0);
+}
+
+
+/* on user button press */
+void AlignFrame::newAlign() {
+	stack->setCurrentIndex(1);
+	provisional_align = new Align(qRelightApp->project().images.size());
+	marker_dialog->setAlign(provisional_align);
+}
+
+
+void AlignFrame::editAlign(AlignRow *row) {
+	stack->setCurrentIndex(1); //needs to be called before setAlign, for correct resize.
+	provisional_align = row->align;
+	marker_dialog->setAlign(provisional_align);
 }
 
 void AlignFrame::projectUpdate() {
 	auto &project = qRelightApp->project();
 	project.computeOffsets();
-
-	auto offsets = qRelightApp->project().offsets;
-	for(auto &o: offsets) {
-		o -= project.offsets[0];
-		cout << o.x() << " " << o.y() << endl;
-	}
-
 }
 
 AlignRow *AlignFrame::addAlign(Align *align) {
 	AlignRow *row = new AlignRow(align);
 	aligns->addWidget(row);
 
+	cout << aligns->children().size() << endl;
+
+	connect(row, SIGNAL(edit(AlignRow *)), this, SLOT(editAlign(AlignRow *)));
 	connect(row, SIGNAL(removeme(AlignRow *)), this, SLOT(removeAlign(AlignRow *)));
 	connect(row, SIGNAL(updated()), this, SLOT(projectUpdate()));
 	return row;
@@ -105,3 +147,12 @@ void AlignFrame::removeAlign(AlignRow *row) {
 	delete row;
 	projectUpdate();
 }
+
+AlignRow *AlignFrame::findRow(Align *align) {
+	for(int i = 0; i < aligns->count(); i++) {
+		AlignRow *r = static_cast<AlignRow *>(aligns->itemAt(i)->widget());
+		if(r->align == align)
+			return r;
+	}
+	return nullptr;
+}

relightlab/alignframe.h

@@ -9,6 +9,7 @@ class Align;
 class AlignRow;
 class MarkerDialog;
 class QVBoxLayout;
+class QStackedWidget;
 
 class AlignFrame: public QFrame {
 Q_OBJECT
@@ -21,11 +22,18 @@ Q_OBJECT
 public slots:
 	void projectUpdate();
 	void newAlign();
+	void editAlign(AlignRow *align);
 	void removeAlign(AlignRow *align);
+	void okMarker();
+	void cancelMarker();
 
 private:
+	Align *provisional_align = nullptr;
+	QStackedWidget *stack = nullptr;
 	MarkerDialog *marker_dialog = nullptr;
 	QVBoxLayout *aligns = nullptr;
+
+	AlignRow *findRow(Align *align);
 };
 
 #endif // ALIGNFRAME_H

relightlab/alignpicking.cpp

@@ -33,11 +33,18 @@ void AlignRect::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidg
 
 QVariant AlignRect::itemChange(GraphicsItemChange change, const QVariant &value)	{
 	if ((change == ItemPositionChange  && scene()) || change == ItemScenePositionHasChanged) {
-		picker->updateAlignPoint();
+//		picker->updateAlignPoint();
 	}
 	return QGraphicsItem::itemChange(change, value);
 }
 
+void AlignRect::setRect(QRectF r) {
+	prepareGeometryChange();  // Notify the scene about bounding rect change
+	QRectF oldRect = boundingRect();
+	rect = r;
+	update(oldRect.united(boundingRect()));  // Repaint both old and new areas
+}
+
 
 
 
@@ -55,13 +62,14 @@ void AlignPicking::clear() {
 	if(rect) {
 		scene().removeItem(rect);
 	}
+//	align = nullptr;
 }
 
-void AlignPicking::setAlign(Align *a) {
+void AlignPicking::setAlign(QRectF align_rect) {
 	clear();
-	align = a;
-	rect->setPos(align->rect.center());
-	rect->side = align->rect.width();
+//	align = a;
+	rect->setPos(align_rect.center());
+	rect->side = align_rect.width();
 
 	scene().addItem(rect);
 
@@ -85,12 +93,12 @@ void AlignPicking::click(QPoint p) {
 
 	rect->setPos(pos);
 	rect->update();
-	updateAlignPoint();
+//	updateAlignPoint();
 }
 
-void AlignPicking::updateAlignPoint() {
+/*void AlignPicking::updateAlignPoint() {
 	align->rect = rect->getRect();
-}
+}*/
 
 void AlignPicking::keyPressEvent(QKeyEvent *event) {
 	if(event->key() == Qt::Key_Plus)
@@ -99,8 +107,9 @@ void AlignPicking::keyPressEvent(QKeyEvent *event) {
 		marker_side -= 5;
 	QPointF center = rect->rect.center();
 
-	rect->rect.setTopLeft(center - QPointF(marker_side, marker_side));
-	rect->rect.setBottomRight(center + QPointF(marker_side, marker_side));
+	QRectF r(center - QPointF(marker_side/2.0, marker_side/2.0),
+			center + QPointF(marker_side/2.0, marker_side/2.0));
+	rect->setRect(r);
 	rect->update();
-	updateAlignPoint();
+//	updateAlignPoint();
 }

relightlab/alignpicking.h

@@ -41,18 +41,19 @@ class AlignPicking: public ImageViewer {
 	Q_OBJECT
 public:
 	int marker_side = 40;
-	Align *align = nullptr;
+	//Align *align = nullptr;
 
 	AlignRect *rect = nullptr;
 
 	AlignPicking(QWidget *parent = nullptr);
-	void setAlign(Align *sphere);
+	void setAlign(QRectF r);
 	void updateAlign();
 	void clear();
+	QRectF getRect() { return rect->getRect(); }
 
 public slots:
 	void click(QPoint);
-	void updateAlignPoint();
+	//void updateAlignPoint();
 
 protected:
 	void keyPressEvent(QKeyEvent *event) override;

relightlab/alignrow.cpp

@@ -88,8 +88,8 @@ AlignRow::AlignRow(Align *_align, QWidget *parent): QWidget(parent) {
 
 	edit_layout->setRowStretch(3,1);
 
-	connect(edit_button, SIGNAL(clicked()), this, SLOT(edit()));
-	connect(remove_button, SIGNAL(clicked()), this, SLOT(remove()));
+	connect(edit_button, &QPushButton::clicked, [this]() { emit edit(this); });
+	connect(remove_button, &QPushButton::clicked, [this]() { emit removeme(this); });
 	connect(verify_button, SIGNAL(clicked()), this, SLOT(verify()));
 }
 
@@ -99,7 +99,7 @@ AlignRow::~AlignRow() {
 	}
 	delete find_alignment;
 }
-
+/*
 void AlignRow::edit() {
 	MarkerDialog *marker_dialog = new MarkerDialog(MarkerDialog::ALIGN, this);
 	marker_dialog->setAlign(align);
@@ -110,22 +110,26 @@ void AlignRow::edit() {
 		updateRegion();
 		findAlignment();
 	}
-}
+}*/
 
 void AlignRow::verify() {
 	VerifyDialog *verify_dialog = new VerifyDialog(align->thumbs, align->offsets, VerifyDialog::ALIGN, this);
 	verify_dialog->exec();
 }
 
-void AlignRow::remove() {
-	emit removeme(this);
-}
 
 void AlignRow::updateRegion() {
 	QRectF r = align->rect;
 	region->setText(QString("Sample region: %1x%2+%3+%4").arg(r.width()).arg(r.height()).arg(r.left()).arg(r.top()));
 }
 
+void AlignRow::setRect(QRectF rect) {
+	position->rect = align->rect;
+	position->update();
+	updateRegion();
+	findAlignment();
+}
+
 void AlignRow::updateStatus(QString msg, int percent) {
 	status->setText(msg);
 	progress->setValue(percent);

relightlab/alignrow.h

@@ -43,14 +43,14 @@ class AlignRow: public QWidget {
 	void findAlignment(bool update = true);
 	void stopFinding();
 	void updateRegion();
+	void setRect(QRectF rect);
 
 signals:
+	void edit(AlignRow *row);
 	void removeme(AlignRow *row);
 	void updated(); //emit when status changes
 
 public slots:
-	void edit();
-	void remove();
 	void verify();
 	void updateStatus(QString msg, int percent);
 };

relightlab/markerdialog.cpp

@@ -5,6 +5,7 @@
 
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
+#include "../src/align.h"
 
 MarkerDialog::MarkerDialog(Marker marker, QWidget *parent): QDialog(parent) {
 
@@ -32,14 +33,27 @@ MarkerDialog::MarkerDialog(Marker marker, QWidget *parent): QDialog(parent) {
 	showMaximized();
 }
 
+
 void MarkerDialog::setAlign(Align *align) {
-	align_picking->setAlign(align);
+	align_picking->setAlign(align->rect);
 }
 
+QRectF MarkerDialog::getAlign() {
+	return align_picking->getRect();
+
+}
 void MarkerDialog::setSphere(Sphere *sphere) {
 	sphere_picking->setSphere(sphere);
 }
 
+void  MarkerDialog::clear() {
+	if(align_picking) {
+		align_picking->clear();
+	}
+	if(sphere_picking)
+		sphere_picking->clear();
+
+}
 
 void MarkerDialog::accept() {
 	QDialog::accept();

relightlab/markerdialog.h

@@ -15,6 +15,8 @@ class MarkerDialog: public QDialog {
 	MarkerDialog(Marker marker, QWidget *parent = nullptr);
 	void setAlign(Align *align);
 	void setSphere(Sphere *sphere);
+	QRectF getAlign();
+	void clear();
 
 public slots:
 	void accept();

relightlab/relightlab.pro

@@ -6,7 +6,7 @@ CONFIG += c++17
 #target_link_libraries( ${APP_NAME} Qt5::Svg )
 
 DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += _USE_MATH_DEFINES
+DEFINES += _USE_MATH_DEFINES WITH_OPENCV
 DEFINES += NOMINMAX
 
 INCLUDEPATH += ../external/