minor interface changes

align/main.cpp

@@ -6,6 +6,9 @@
 #include <QImage>
 #include <QPoint>
 #include <QDir>
+#include <QTextStream>
+
+#include <assert.h>
 //#include <QGuiApplication>
 
 //#include "aligndialog.h"
@@ -69,14 +72,15 @@ QPoint align(QImage a, QImage b, int max, double &best_info, double &initial) {
 	best_info = 0.0;
 	double worst_info = 1e20;
 	QPoint best(0, 0);
-	int side = 2*max_side;
+	int side = 2*max_side + 1;
 	std::vector<double> values(side*side);
 	for(int dy = -max_side; dy <= max_side; dy++) {
 		for(int dx = -max_side; dx <= max_side; dx++) {
 			double info = mutualInformation(a, b, max, dx, dy);
 			if(dx == 0 && dy == 0) {
 				initial = info;
 			}
+			assert(dx+max_side + (dy+max_side)*side < values.size());
 			values[dx+max_side + (dy+max_side)*side] = info;
 			worst_info = std::min(worst_info, info);
 			//cout << info << " ";
@@ -122,7 +126,7 @@ std::vector<Offset> readOffsetsCSV(const QString &filePath) {
 			firstLine = false;
 			continue;
 		}
-		QStringList values = line.split(",", Qt::SkipEmptyParts);
+		QStringList values = line.split(",");
 		if (values.size() >= 2) {
 			offsets.push_back({values[0].trimmed().toInt(), values[1].trimmed().toInt()});
 		}
@@ -243,6 +247,11 @@ int main(int argc, char *argv[]) {
 		samples.push_back(sub);
 	}
 
+	/*for(int i = 0; i < samples.size(); i++) {
+		samples[i].save(QString("/home/ponchio/tmp/aligntest/%1.jpg").arg(i));
+	}
+	exit(0); */
+
 	int reference = 0;
 	vector<QPoint> offsets;
 	QPoint origin(0,0);

relightlab/alignpicking.cpp

@@ -92,3 +92,15 @@ void AlignPicking::updateAlignPoint() {
 	align->rect = rect->getRect();
 }
 
+void AlignPicking::keyPressEvent(QKeyEvent *event) {
+	if(event->key() == Qt::Key_Plus)
+		marker_side += 5;
+	if(event->key() == Qt::Key_Minus)
+		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));
+	rect->update();
+	updateAlignPoint();
+}

relightlab/alignpicking.h

@@ -53,6 +53,9 @@ class AlignPicking: public ImageViewer {
 public slots:
 	void click(QPoint);
 	void updateAlignPoint();
+
+protected:
+	void keyPressEvent(QKeyEvent *event) override;
 };
 
 #endif

relightlab/alignrow.cpp

@@ -12,7 +12,6 @@
 #include <QLabel>
 #include <QProgressBar>
 #include <QPushButton>
-#include <QDebug>
 
 FindAlignment::FindAlignment(Align *_align, bool update) {
 	align = _align;
@@ -68,16 +67,28 @@ AlignRow::AlignRow(Align *_align, QWidget *parent): QWidget(parent) {
 	status_layout->addWidget(progress);
 	status_layout->addStretch();
 
-	QPushButton *edit = new QPushButton(QIcon::fromTheme("edit"), "Edit...");
-	columns->addWidget(edit, 1);
+	QGridLayout *edit_layout = new QGridLayout;
+	columns->addLayout(edit_layout, 2);
+
+
+	edit_layout->setRowStretch(0,1);
+
+	region= new QLabel;
+	updateRegion();
+	edit_layout->addWidget(region, 1, 0, 1, 3);
+
+	edit_button = new QPushButton(QIcon::fromTheme("edit"), "Edit...");
+	edit_layout->addWidget(edit_button, 2, 0);
 	verify_button = new QPushButton(QIcon::fromTheme("check"), "Verify...");
 	verify_button->setEnabled(false);
-	columns->addWidget(verify_button, 1);
-	QPushButton *remove = new QPushButton(QIcon::fromTheme("trash-2"), "Delete");
-	columns->addWidget(remove, 1);
+	edit_layout->addWidget(verify_button, 2, 1);
+	QPushButton *remove_button = new QPushButton(QIcon::fromTheme("trash-2"), "Delete");
+	edit_layout->addWidget(remove_button, 2, 2);
 
-	connect(edit, SIGNAL(clicked()), this, SLOT(edit()));
-	connect(remove, SIGNAL(clicked()), this, SLOT(remove()));
+	edit_layout->setRowStretch(3,1);
+
+	connect(edit_button, SIGNAL(clicked()), this, SLOT(edit()));
+	connect(remove_button, SIGNAL(clicked()), this, SLOT(remove()));
 	connect(verify_button, SIGNAL(clicked()), this, SLOT(verify()));
 
 
@@ -89,6 +100,7 @@ void AlignRow::edit() {
 	if(answer == QDialog::Accepted) {
 		position->rect = align->rect;
 		position->update();
+		updateRegion();
 		//reflections->init();
 		findAlignment();
 	}
@@ -103,6 +115,11 @@ 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::updateStatus(QString msg, int percent) {
 	status->setText(msg);
 	progress->setValue(percent);

relightlab/alignrow.h

@@ -32,13 +32,16 @@ class AlignRow: public QWidget {
 	QLabel *thumb = nullptr;
 	AlignOverview *position = nullptr;
 	QLabel *status = nullptr;
+	QLabel *region = nullptr;
 	QProgressBar *progress = nullptr;
+	QPushButton *edit_button = nullptr;
 	QPushButton *verify_button = nullptr;
 	FindAlignment *find_alignment = nullptr;
 
 	AlignRow(Align *align, QWidget *parent = nullptr);
 	void findAlignment(bool update = true);
 	void stopFinding();
+	void updateRegion();
 
 signals:
 	void removeme(AlignRow *row);

relightlab/canvas.cpp

@@ -3,7 +3,6 @@
 #include <QMouseEvent>
 #include <QApplication>
 #include <QScrollBar>
-#include <QDebug>
 
 #include <qmath.h>
 

relightlab/cropframe.cpp

@@ -11,7 +11,6 @@
 #include <QGroupBox>
 #include <QComboBox>
 #include <QMessageBox>
-#include <QDebug>
 
 CropFrame::CropFrame(QWidget *parent): QFrame(parent) {
 

relightlab/directionsview.cpp

@@ -2,7 +2,6 @@
 #include "../src/dome.h"
 
 #include <QGraphicsEllipseItem>
-#include <QDebug>
 
 using namespace Eigen;
 

relightlab/helpbutton.cpp

@@ -18,8 +18,6 @@
 #include <QUrl>
 #include <QFile>
 
-#include <QDebug>
-
 
 HelpDialog* HelpDialog::m_instance = nullptr; // Initialize static instance to nullptr
 

relightlab/imageframe.cpp

@@ -5,7 +5,6 @@
 #include <QGraphicsPixmapItem>
 #include <QGraphicsScene>
 #include <QResizeEvent>
-#include <QDebug>
 
 #include "relightapp.h"
 #include "imageframe.h"

relightlab/mainwindow.cpp

@@ -19,7 +19,6 @@
 #include "helpbutton.h"
 
 #include <QMessageBox>
-#include <QDebug>
 #include <QScrollArea>
 #include <QVBoxLayout>
 

relightlab/normalsplan.cpp

@@ -6,6 +6,7 @@
 #include <QButtonGroup>
 #include <QPushButton>
 #include <QLineEdit>
+#include <QLabel>
 #include <QHBoxLayout>
 #include <QDoubleSpinBox>
 #include <QMessageBox>

relightlab/normalstask.cpp

@@ -17,8 +17,8 @@
 
 #include <QJsonArray>
 #include <QJsonDocument>
-#include <QDebug>
 #include <QImage>
+#include <QTextStream>
 #include <vector>
 #include <iostream>
 #include <time.h>

relightlab/qlabelbutton.h

@@ -2,8 +2,6 @@
 #define QLABELBUTTON_H
 
 #include <QCommandLinkButton>
-#include <QLabel>
-#include <QDebug>
 
 class QLabelButton: public QCommandLinkButton {
 public:

relightlab/reflectionview.cpp

@@ -5,7 +5,6 @@
 #include <QGraphicsPixmapItem>
 #include <QScrollBar>
 #include <QRectF>
-#include <QDebug>
 
 MarkerOverview::MarkerOverview(int _height, QWidget *parent): QGraphicsView(parent) {
 	height = _height;

relightlab/rtiplan.cpp

@@ -13,6 +13,7 @@
 #include <QComboBox>
 #include <QStandardItemModel>
 #include <QLineEdit>
+#include <QLabel>
 #include <QFileDialog>
 #include <QMessageBox>
 

relightlab/rtitask.cpp

@@ -89,8 +89,6 @@ void RtiTask::run() {
 	imageset.initFromDome(project.dome); //lights after images
 	imageset.setCrop(crop, project.offsets);
 
-	qDebug() << "offsets: " << project.offsets;
-
 	//TODO too many crop locations!
 	if(!crop.isNull()) {
 		builder->crop[0] = imageset.left;

relightlab/spherepanel.cpp

@@ -8,7 +8,6 @@
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QPushButton>
-#include <QDebug>
 
 #include <assert.h>
 

relightlab/sphererow.cpp

@@ -11,7 +11,6 @@
 #include <QLabel>
 #include <QProgressBar>
 #include <QPushButton>
-#include <QDebug>
 
 DetectHighlights::DetectHighlights(Sphere *_sphere, bool update) {
 	sphere = _sphere;

relightlab/verifyview.cpp

@@ -8,7 +8,6 @@
 #include <QGraphicsPathItem>
 #include <QKeyEvent>
 #include <QRectF>
-#include <QDebug>
 #include <assert.h>
 
 

src/deepzoom.cpp

@@ -3,7 +3,6 @@
 #include "jpeg_decoder.h"
 
 #include <QDir>
-#include <QDebug>
 
 #include <iostream>
 #include <fstream>