fixed crop regressiona and align missing updates

Author: ponchio

relightlab/alignframe.cpp

@@ -62,15 +62,18 @@ void AlignFrame::newAlign() {
 	qRelightApp->project().aligns.push_back(align);
 	AlignRow *row = addAlign(align);
 	row->findAlignment();
+}
 
+void AlignFrame::projectUpdate() {
+	qRelightApp->project().computeOffsets();
 }
 
 AlignRow *AlignFrame::addAlign(Align *align) {
 	AlignRow *row = new AlignRow(align);
 	aligns->addWidget(row);
 
 	connect(row, SIGNAL(removeme(AlignRow *)), this, SLOT(removeAlign(AlignRow *)));
-	connect(row, SIGNAL(updated()), this, SIGNAL(updated()));
+	connect(row, SIGNAL(updated()), this, SLOT(projectUpdate()));
 	return row;
 }
 
@@ -89,4 +92,5 @@ void AlignFrame::removeAlign(AlignRow *row) {
 	delete align;
 	aligns.erase(it);
 	delete row;
+	projectUpdate();
 }

relightlab/alignframe.h

@@ -19,10 +19,9 @@ Q_OBJECT
 	AlignRow *addAlign(Align *align);
 
 public slots:
+	void projectUpdate();
 	void newAlign();
 	void removeAlign(AlignRow *align);
-signals:
-	void updated();
 
 private:
 	MarkerDialog *marker_dialog = nullptr;

relightlab/rtitask.cpp

@@ -87,7 +87,9 @@ void RtiTask::run() {
 	imageset.initImages(input_folder.toStdString().c_str());
 
 	imageset.initFromDome(project.dome); //lights after images
-	imageset.setCrop(crop,project.offsets);
+	imageset.setCrop(crop, project.offsets);
+
+	qDebug() << project.offsets << endl;
 
 	//TODO too many crop locations!
 	if(!crop.isNull()) {

src/imageset.cpp

@@ -395,17 +395,17 @@ void ImageSet::setCrop(QRect &_crop, std::vector<QPointF> &_offsets) {
 
 	//find min and max of offsets to adjust the maxCrop;
 	int l = 0;
-	int r = 0;
-	int t = image_width;
+	int r = image_width;;
+	int t = 0;
 	int b = image_height;
 	for(QPoint &o: int_offsets) {
-		l = std::max(l,            -o.x());
-		r = std::min(image_width,  -o.x());
-		t = std::max(b,            -o.y());
-		b = std::min(image_height, -o.y());
+		l = std::max(l, -o.x());
+		r = std::min(r, image_width-o.x());
+		t = std::max(t, -o.y());
+		b = std::min(b, image_height-o.y());
 	}
 	//TODO check +1 problem
-	QRect max_crop(l, t, r -l, t - b);
+	QRect max_crop(l, t, r - l, b - t);
 	if(_crop.isNull())
 		_crop = max_crop;
 	else

src/project.cpp

@@ -598,6 +598,7 @@ float lineSphereDistance(const Vector3f &origin, const Vector3f &direction, cons
 	return d;
 }
 void Project::computeOffsets() {
+	offsets.clear();
 	offsets.resize(images.size(), QPointF(0,0));
 	std::vector<float> weights(offsets.size(), 0);
 	for(Align *align: aligns) {