moved light number and images number checks to a safer place

image list selection adjusted

Author: ponchio

relightlab/imageframe.cpp

@@ -99,6 +99,7 @@ void ImageFrame::init() {
 
 	if(qRelightApp->project().images.size()) {
 		showImage(0);
+		image_list->setCurrentRow(0);
 		image_view->fit();
 	}
 	listMode(); //TODO actually use last used mode used by the user but only in imageframe
@@ -113,7 +114,7 @@ void ImageFrame::showImage(int id) {
 
 	Project &project = qRelightApp->project();
 
-	image_list->setCurrentRow(id);
+	//image_list->setCurrentRow(id);
 	qRelightApp->action("previous_image")->setEnabled(id != 0);
 	qRelightApp->action("next_image")->setEnabled(id != (int)project.images.size()-1);
 

relightlab/imagelist.cpp

@@ -5,6 +5,8 @@
 #include <assert.h>
 
 void ImageList::init() {
+	setSelectionMode(QAbstractItemView::ExtendedSelection);
+
 	Project &project = qRelightApp->project();
 	clear();
 	int count =0;
@@ -31,7 +33,6 @@ void ImageList::verifyItem(QListWidgetItem *item) {
 	project.images[img_number].skip = skip;
 
 	emit skipChanged(img_number, skip);
-
 }
 
 void ImageList::setSkipped(int img_number, bool skip) {

relightlab/normalsframe.cpp

@@ -93,10 +93,18 @@ void NormalsFrame::save() {
 		}
 	}
 	NormalsTask *task = new NormalsTask();
-	task->setParameters(parameters);
-	task->output = parameters.path;
-	if(parameters.compute)
-		task->initFromProject(qRelightApp->project());
+	try {
+
+		task->setParameters(parameters);
+		task->output = parameters.path;
+		if(parameters.compute)
+			task->initFromProject(qRelightApp->project());
+
+	} catch(QString error) {
+		QMessageBox::critical(this, "Something went wrong", error);
+		delete task;
+		return;
+	}
 
 	ProcessQueue &queue = ProcessQueue::instance();
 	queue.addTask(task);

relightlab/rtiframe.cpp

@@ -116,10 +116,18 @@ void RtiFrame::exportRti() {
 		QMessageBox::warning(this, "Destination path is missing.", "Fill in the output folder or the filename for the RTI.");
 		return;
 	}
-	RtiTask *rti_task = new RtiTask(project);
-	rti_task->setParameters(parameters);
-	rti_task->output = parameters.path;
-	rti_task->crop = project.crop;
+	RtiTask *rti_task = new RtiTask();
+	try {
+		rti_task->setProject(project);
+		rti_task->setParameters(parameters);
+		rti_task->output = parameters.path;
+		rti_task->crop = project.crop;
+
+	} catch(QString error) {
+		QMessageBox::critical(this, "Something went wrong", error);
+		delete rti_task;
+		return;
+	}
 
 	ProcessQueue &queue = ProcessQueue::instance();
 	queue.addTask(rti_task);

relightlab/rtitask.cpp

@@ -42,7 +42,37 @@ QString RtiParameters::summary() {
 	return txt;
 }
 
-RtiTask::RtiTask(const Project &_project): Task(), project(_project) {}
+RtiTask::RtiTask(): Task() {
+	builder = new RtiBuilder;
+}
+
+void RtiTask::setProject(Project &project) {
+	builder->imageset.pixel_size = project.pixelSize;
+
+	builder->nworkers = QSettings().value("nworkers", 8).toInt();
+	builder->samplingram = QSettings().value("ram", 512).toInt();
+
+
+	ImageSet &imageset = builder->imageset;
+
+	imageset.images = project.getImages();
+	imageset.initImages(project.dir.absolutePath().toStdString().c_str());
+
+	imageset.initFromDome(project.dome); //lights after images
+	imageset.setCrop(crop, project.offsets);
+	imageset.pixel_size = project.pixelSize;
+
+	//TODO too many crop locations!
+	if(!crop.isNull()) {
+		builder->crop[0] = imageset.left;
+		builder->crop[1] = imageset.top;
+		builder->crop[2] = imageset.width;
+		builder->crop[3] = imageset.height;
+	}
+
+	builder->width  = imageset.width;
+	builder->height = imageset.height;
+}
 
 RtiTask::~RtiTask() {
 	if(builder)
@@ -52,20 +82,6 @@ RtiTask::~RtiTask() {
 void RtiTask::setParameters(RtiParameters &p) {
 	parameters = p;
 	label = parameters.summary();
-}
-
-void RtiTask::run() {
-	label = parameters.summary();
-
-	status = RUNNING;	
-	std::function<bool(QString s, int d)> callback = [this](QString s, int n)->bool { return this->progressed(s, n); };
-
-	//TODO mnove all this to the constructor (except what parameters can set.
-	builder = new RtiBuilder;
-	builder->imageset.pixel_size = project.pixelSize;
-
-	builder->nworkers = QSettings().value("nworkers", 8).toInt();
-	builder->samplingram = QSettings().value("ram", 512).toInt();
 
 	builder->type         = parameters.basis;
 	builder->colorspace   = parameters.colorspace;
@@ -81,24 +97,12 @@ void RtiTask::run() {
 	if(parameters.format == RtiParameters::RTI)
 		builder->commonMinMax = true;
 
-	ImageSet &imageset = builder->imageset;
-	imageset.images = project.getImages();
-	imageset.pixel_size = project.pixelSize;
-	imageset.initImages(input_folder.toStdString().c_str());
-
-	imageset.initFromDome(project.dome); //lights after images
-	imageset.setCrop(crop, project.offsets);
+}
 
-	//TODO too many crop locations!
-	if(!crop.isNull()) {
-		builder->crop[0] = imageset.left;
-		builder->crop[1] = imageset.top;
-		builder->crop[2] = imageset.width;
-		builder->crop[3] = imageset.height;
-	}
+void RtiTask::run() {
 
-	builder->width  = imageset.width;
-	builder->height = imageset.height;
+	status = RUNNING;	
+	std::function<bool(QString s, int d)> callback = [this](QString s, int n)->bool { return this->progressed(s, n); };
 
 	QString output = parameters.path; //masking Task::output.
 	try {

relightlab/rtitask.h

@@ -36,14 +36,16 @@ class RtiParameters {
 class RtiTask: public Task {
 	Q_OBJECT
 public:
-	Project project;
 	RtiParameters parameters;
 	QRect crop;
 
-	RtiTask(const Project &_project);
+	RtiTask();
 	virtual ~RtiTask();
-	virtual void run() override;
+
+	void setProject(Project &_project);
 	void setParameters(RtiParameters &p);
+	virtual void run() override;
+
 
 public slots:
 

src/imageset.cpp

@@ -105,7 +105,7 @@ void ImageSet::initFromDome(Dome &dome) {
 	}
 }
 
-void ImageSet::setLights(std::vector<Eigen::Vector3f> &lights, Dome::LightConfiguration configuration) {
+void ImageSet::setLights(const std::vector<Eigen::Vector3f> &lights, const Dome::LightConfiguration configuration) {
 	lights1 = lights;
 	light3d = (configuration != Dome::DIRECTIONAL);
 	if(light3d) {
@@ -388,9 +388,9 @@ void ImageSet::restart() {
 	current_line = 0;
 }
 
-void ImageSet::setCrop(QRect &_crop, std::vector<QPointF> &_offsets) {
+void ImageSet::setCrop(QRect &_crop, const std::vector<QPointF> &_offsets) {
 	std::vector<QPoint> int_offsets;
-	for(QPointF &p: _offsets)
+	for(const QPointF &p: _offsets)
 		int_offsets.push_back(p.toPoint());
 
 	//find min and max of offsets to adjust the maxCrop;

src/imageset.h

@@ -54,10 +54,10 @@ class ImageSet {
 	//open images and starts the decoders
 	bool initImages(const char *path); //path points to the dir of the images.
 
-	void setCrop(QRect &crop, std::vector<QPointF> &offsets);
+	void setCrop(QRect &crop, const std::vector<QPointF> &offsets);
 
 
-	void setLights(std::vector<Eigen::Vector3f> &lights, Dome::LightConfiguration configuration);
+	void setLights(const std::vector<Eigen::Vector3f> &lights, const Dome::LightConfiguration configuration);
 	std::vector<Eigen::Vector3f> &lights() { return lights1; }
 
 	size_t size() { return size_t(images.size()); }

src/project.h

@@ -82,9 +82,9 @@ class Project {
 	}
 	size_t size() { return images.size(); }
 
-	QStringList getImages() {
+	QStringList getImages() const {
 		QStringList imgs;
-		for(Image &img: images)
+		for(Image img: images)
 			if(!img.skip)
 				imgs.push_back(img.filename);
 		return imgs;