removed old rti interface

clean up deepzoom files

Author: ponchio

relight/zoom.h

@@ -7,6 +7,7 @@
 #include <QMessageBox>
 
 #include <QString>
+#include <QFile>
 #include <QStringList>
 #include <QDomDocument>
 #include <QDebug>
@@ -86,10 +87,10 @@ inline QString getItarzoomPlaneData(const QString& path, ZoomData& data, QJsonAr
 }
 
 inline QString deepZoom(QString inputFolder, QString output, uint32_t quality, uint32_t overlap,
-			  uint32_t tileSize, std::function<bool(QString s, int n)> progressed)
-{
+			  uint32_t tileSize, std::function<bool(QString s, int n)> progressed) {
     int nplanes = getNFiles(inputFolder, "jpg");
 
+	bool remove = true;
 
     // Deep zoom every plane
     for(int plane = 0; plane < nplanes; plane++)
@@ -100,6 +101,8 @@ inline QString deepZoom(QString inputFolder, QString output, uint32_t quality, u
 		dz.quality = quality;
         dz.build(fileName, output + "/" + QString("plane_%1").arg(plane), tileSize, overlap);
 
+		if(remove)
+			QFile::remove(fileName);
         // Update progress bar
         if(!progressed("Deepzoom:", 100*(plane+1)/nplanes))
             break;
@@ -108,8 +111,9 @@ inline QString deepZoom(QString inputFolder, QString output, uint32_t quality, u
     return "OK";
 }
 
-inline QString tarZoom(QString inputFolder, QString output, std::function<bool(QString s, int n)> progressed)
-{
+inline QString tarZoom(QString inputFolder, QString output, std::function<bool(QString s, int n)> progressed) {
+	bool remove = true;
+
     // Find number of planes
     int nPlanes = getNFiles(inputFolder, "dzi");
     if (nPlanes == 0)
@@ -213,6 +217,11 @@ inline QString tarZoom(QString inputFolder, QString output, std::function<bool(Q
         outIndexFile.write(QJsonDocument(index).toJson());
         outIndexFile.close();
 
+		if(remove) {
+			QFile::remove(dziPath);
+			planeFolder.removeRecursively();
+		}
+
         // Update progress bar
         if(!progressed("Tarzoom:", 100*(i+1)/nPlanes))
             break;
@@ -223,6 +232,8 @@ inline QString tarZoom(QString inputFolder, QString output, std::function<bool(Q
 
 inline QString itarZoom(const QString& inputFolder, const QString& output, std::function<bool(QString s, int n)> progressed)
 {
+	bool remove = true;
+
     // Find number of planes
     int nPlanes = getNFiles(inputFolder, "tzb");
     if (nPlanes == 0)
@@ -272,7 +283,8 @@ inline QString itarZoom(const QString& inputFolder, const QString& output, std::
         std::deque<uint32_t> sizes;
 
         // Get tzi data
-        QString err = getItarzoomPlaneData(QString("%1/plane_%2.tzi").arg(inputFolder).arg(i), data, offsets);
+		QString tzi_path = QString("%1/plane_%2.tzi").arg(inputFolder).arg(i);
+		QString err = getItarzoomPlaneData(tzi_path, data, offsets);
         if (err.compare("OK") != 0)
             return err;
 
@@ -295,11 +307,15 @@ inline QString itarZoom(const QString& inputFolder, const QString& output, std::
         }
 
         // Append file to final tzb
-        QString tzbPath = QString("%1/plane_%2.tzb").arg(inputFolder).arg(i);
-        files.push_back(new QFile(tzbPath));
+		QString tzb_path = QString("%1/plane_%2.tzb").arg(inputFolder).arg(i);
+		files.push_back(new QFile(tzb_path));
         if (!files[i]->open(QIODevice::ReadOnly))
             return QString("Error while opening .tzb file %1").arg(files[i]->fileName());
 
+		if(remove) {
+			QFile::remove(tzi_path);
+		}
+
         // Update progress bar
         if(!progressed("Itarzoom:", 50*(i+1)/nPlanes))
             break;
@@ -329,8 +345,11 @@ inline QString itarZoom(const QString& inputFolder, const QString& output, std::
     outIndexFile.close();
 
     // Clean file pointers
-	for(QFile *file: files)
+	for(QFile *file: files) {
+		file->remove();
 		delete file;
+	}
+
 
     return "OK";
 }

relightlab/CMakeLists.txt

@@ -64,7 +64,6 @@ set (RELIGHT_HEADERS
     markerdialog.h
     domepanel.h 
     directionsview.h 
-    rtiexportdialog.h
     sphereframe.h 
     spherepicking.h 
     spheredialog.h 
@@ -74,7 +73,6 @@ set (RELIGHT_HEADERS
     helpbutton.h 
     cropframe.h 
     rtiframe.h
-    rticard.h
     rtitask.h
     ../relight/imagecropper.h
     ../relight-cli/rtibuilder.h
@@ -144,8 +142,6 @@ set (RELIGHTLAB_SOURCES
     rtiframe.cpp
     rtirecents.cpp
     rtiplan.cpp
-    rticard.cpp
-    rtiexportdialog.cpp
     rtitask.cpp
     ../relight/imagecropper.cpp
     ../relight-cli/rtibuilder.cpp

relightlab/relightlab.pro

@@ -75,7 +75,6 @@ SOURCES += main.cpp \
     recentprojects.cpp \
     reflectionview.cpp \
     relightapp.cpp \
-    rticard.cpp \
     rtiframe.cpp \
     rtiplan.cpp \
     rtirecents.cpp \
@@ -98,7 +97,6 @@ SOURCES += main.cpp \
     cropframe.cpp \
     ../relight/imagecropper.cpp \
     creatertidialog.cpp \
-    rtiexportdialog.cpp \
     rtitask.cpp \
     task.cpp \
     queueitem.cpp \
@@ -160,7 +158,6 @@ HEADERS += \
     recentprojects.h \
     reflectionview.h \
     relightapp.h \
-    rticard.h \
     rtiframe.h \
     rtiplan.h \
     rtirecents.h \
@@ -184,7 +181,6 @@ HEADERS += \
     cropframe.h \
     ../relight/imagecropper.h \
     creatertidialog.h \
-    rtiexportdialog.h \
     rtitask.h \
     task.h \
     queueitem.h \