fixed crop, deepzoom bugs

Author: ponchio

relightlab/metadataframe.cpp

@@ -1,8 +1,18 @@
 #include "metadataframe.h"
+#include "relightapp.h"
 
 #include <QVBoxLayout>
 
 MetadataFrame::MetadataFrame(QWidget *parent): QFrame(parent) {
 	QVBoxLayout *content = new QVBoxLayout;
 
 }
+
+
+void MetadataFrame::clear() {
+
+}
+
+void MetadataFrame::init() {
+	auto project = qRelightApp->project();
+}

relightlab/relightlab.pro

@@ -113,7 +113,8 @@ SOURCES += main.cpp \
     normalsplan.cpp \
     brdfframe.cpp \
     metadataframe.cpp \
-    ../src/fft_normal_integration.cpp
+    ../src/fft_normal_integration.cpp \
+    ../src/deepzoom.cpp
 
 RESOURCES += \
     res.qrc
@@ -201,7 +202,8 @@ HEADERS += \
     brdfframe.h \
     metadataframe.h \
     ../src/fft_normal_integration.h \
-    ../src/pocketfft.h
+    ../src/pocketfft.h \
+    ../src/deepzoom.h
 
 FORMS +=
 

relightlab/rtiframe.cpp

@@ -104,8 +104,9 @@ void RtiFrame::init() {
 
 void RtiFrame::exportRti() {
 
+	Project &project = qRelightApp->project();
 	//check for lights
-	if(qRelightApp->project().dome.directions.size() == 0) {
+	if(project.dome.directions.size() == 0) {
 		QMessageBox::warning(this, "Missing light directions.", "You need light directions for this dataset to build an RTI.\n"
 																"You can either load a dome or .lp file or mark a reflective sphere in the 'Lights' tab.");
 		return;
@@ -118,6 +119,7 @@ void RtiFrame::exportRti() {
 	RtiTask *rti_task = new RtiTask(qRelightApp->project());
 	rti_task->setParameters(parameters);
 	rti_task->output = parameters.path;
+	rti_task->crop = project.crop;
 
 	ProcessQueue &queue = ProcessQueue::instance();
 	queue.addTask(rti_task);

relightlab/rtitask.cpp

@@ -118,37 +118,23 @@ void RtiTask::run() {
 		if(parameters.openlime)
 			openlime();
 
+		if(parameters.web_layout != RtiParameters::PLAIN) {
+			deepZoom(output, output, parameters.quality, 0, 256, callback);
+		}
+		if(parameters.web_layout == RtiParameters::TARZOOM) {
+			tarZoom(output, output, callback);
+		}
+		if(parameters.web_layout == RtiParameters::ITARZOOM) {
+			itarZoom(output, output, callback);
+		}
+
+
 	} catch(std::string e) {
 		error = e.c_str();
 		status = STOPPED;
 		return;
 	}
 
-/*
-		else if(step == "fromRTI")
-			fromRTI();
-		//TODO! deepZOOM should set error and status?
-		else if(step == "deepzoom") {
-			if ((err = deepZoom(output, output, 95, 0, 256, callback)).compare("OK") != 0) {
-				error = err;
-				status = FAILED;
-			}
-		}
-		else if(step == "tarzoom") {
-			if ((err = tarZoom(output, output, callback)).compare("OK") != 0) {
-				error = err;
-				status = FAILED;
-			}
-		}
-		else if(step == "itarzoom") {
-			if ((err = itarZoom(output, output, callback)).compare("OK") != 0) {
-				error = err;
-				status = FAILED;
-			}
-		}
-		else if(step == "openlime")
-			openlime();
-	} */
 	if(status != FAILED)
 		status = DONE;
 }

src/project.cpp

@@ -381,6 +381,15 @@ void Project::checkImages() {
 
 void Project::save(QString filename) {
 
+	QFile file(filename);
+	bool opened  = file.open(QFile::WriteOnly | QFile::Truncate);
+	if(!opened) {
+		QString error = file.errorString();
+		throw error;
+	}
+
+	lastUpdated = QDateTime::currentDateTime();
+
 	QJsonObject project;
 	version = RELIGHT_STRINGIFY(RELIGHT_VERSION);
 
@@ -457,12 +466,7 @@ void Project::save(QString filename) {
 	QJsonDocument doc(project);
 
 
-	QFile file(filename);
-	bool opened  = file.open(QFile::WriteOnly | QFile::Truncate);
-	if(!opened) {
-		QString error = file.errorString();
-		throw error;
-	}
+
 	file.write(doc.toJson());
 
 	needs_saving = false;