malt_mec issues

cnr-isti-vclab · Sep 13, 2024 · 5322c64 · 5322c64
1 parent 1f7c4a3
commit 5322c64
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 35 deletions.
diff --git a/relight-pano/main.cpp b/relight-pano/main.cpp
@@ -37,6 +37,10 @@ int main(int argc, char *argv[])
 										 "starting step (rti, tapioca, )", "rti");
 	parser.addOption(stepOption);
 
+	QCommandLineOption stopOption(QStringList() << "S" << "stop",
+								  "stop after first step");
+	parser.addOption(stopOption);
+
 	// Process the actual command line arguments given by the user
 	parser.process(app);
 
@@ -54,6 +58,7 @@ int main(int argc, char *argv[])
 	}
 
 	bool interactive = parser.isSet(interactiveOption);
+	bool stop = parser.isSet(stopOption);
 	PanoBuilder::Steps startingStep = PanoBuilder::RTI;
 	bool steps = parser.isSet(stepOption);
 	if (interactive && steps) {
@@ -79,7 +84,7 @@ int main(int argc, char *argv[])
 			//builder.setRelightMerge("/home/ponchio/devel/relight/relight-merge/relight-merge");
 			builder.setRelightMerge("/Users/erika/Desktop/projects/relight/build/relight-merge/relight-merge");
 
-			builder.process(startingStep);
+			builder.process(startingStep, stop);
 		}
 		catch(QString error){
 			cerr << qPrintable(error) << endl;

diff --git a/relight-pano/panobuilder.cpp b/relight-pano/panobuilder.cpp
@@ -81,20 +81,20 @@ int PanoBuilder::findStep(QString step){
  *		...
  *
  */
-void PanoBuilder::process(Steps starting_step){
+void PanoBuilder::process(Steps starting_step, bool stop){
 	switch (starting_step) {
-	case RTI: rti();
-	case TAPIOCA: tapioca();
-	case SCHNAPS: schnaps();
-	case TAPAS: tapas();
-	case APERICLOUD: apericloud();
-	case ORTHOPLANE: orthoplane();
-	case TARAMA: tarama();
-	case MALT_MEC: malt_mec();
-	case C3DC: c3dc();
-	case MALT_ORTHO: malt_ortho();
-	case TAWNY: tawny();
-	case JPG: jpg();
+	case RTI:        rti();        if(stop) break;
+	case TAPIOCA:    tapioca();    if(stop) break;
+	case SCHNAPS:    schnaps();    if(stop) break;
+	case TAPAS:      tapas();      if(stop) break;
+	case APERICLOUD: apericloud(); if(stop) break;
+	case ORTHOPLANE: orthoplane(); if(stop) break;
+	case TARAMA:     tarama();     if(stop) break;
+	case MALT_MEC:   malt_mec();   if(stop) break;
+	case C3DC:       c3dc();       if(stop) break;
+	case MALT_ORTHO: malt_ortho(); if(stop) break;
+	case TAWNY:      tawny();      if(stop) break;
+	case JPG:        jpg();        if(stop) break;
 
 	}
 }
@@ -444,6 +444,7 @@ void PanoBuilder::tarama(){
 void PanoBuilder::malt_mec(){
 	//prende l'input dalla sottodirectory TA
 	QDir currentDir = cd("photogrammetry");
+	rmdir("Tmp-MM-Dir");
 
 	QDir taDir(currentDir.filePath("TA"));
 	if (!taDir.exists()) {
@@ -460,7 +461,7 @@ void PanoBuilder::malt_mec(){
 	QString program = mm3d_path;
 	QStringList arguments;
 	arguments << "Malt" << "Ortho" << ".*jpg" << "Abs" << "ZoomF=4" << "DirMEC=Malt"
-			  << "DirTA=TA" << "ImOrtho='Face.*JPG'" << "DirOF=Ortho-RTI";
+			  << "DirTA=TA" << "ImOrtho='.*jpg'" << "DirOF=Ortho-Lights";
 
 	QString command = program + " " + arguments.join(" ");
 	cout << "Print command: " << qPrintable(command) << endl;
@@ -514,16 +515,16 @@ void PanoBuilder::c3dc(){
 	cout << qPrintable(process.readAllStandardOutput()) << endl;
 }
 
-void PanoBuilder::malt_ortho(){
-	//prende l'input dalla sottodirectory
+void PanoBuilder::tawny(){
+	//prende l'input dalla sottodirectory Malt
 	QDir currentDir = cd("photogrammetry");
 
-	//QDir (currentDir.filePath(""));
-	//if (!.exists()) {
-	//	throw QString("TA directory does not exist in current directory: ") + .absolutePath();
+	QDir maltDir(currentDir.filePath("Malt"));
+	if (!maltDir.exists()) {
+		throw QString("Ortho-lights directory does not exist in current directory: ") + maltDir.absolutePath();
 
-//	}
-//	cout << qPrintable(.absolutePath()) << endl;
+	}
+	cout << qPrintable(maltDir.absolutePath()) << endl;
 
 	QStringList jpgFiles = currentDir.entryList(QStringList() << "*.jpg" << "*.JPG", QDir::Files);
 	if (jpgFiles.isEmpty()) {
@@ -532,8 +533,7 @@ void PanoBuilder::malt_ortho(){
 
 	QString program = mm3d_path;
 	QStringList arguments;
-	arguments << "Malt" << "Ortho" << ".*jpg" << "Abs" << "ZoomF=4" << "DirMEC=Malt"
-			  << "DirTA=TA" << "DoMEC=0" << "DoOrtho=1" << "ImOrtho='Face.*JPG'" << "DirOF=Ortho-Couleur";
+	arguments << "Tawny" << "Ortho-Lights" << "RadiomEgal=0";
 
 	QString command = program + " " + arguments.join(" ");
 	cout << "Print command: " << qPrintable(command) << endl;
@@ -551,16 +551,17 @@ void PanoBuilder::malt_ortho(){
 	cout << qPrintable(process.readAllStandardOutput()) << endl;
 }
 
-void PanoBuilder::tawny(){
-	//prende l'input dalla sottodirectory Malt
+
+void PanoBuilder::malt_ortho(){
+	//prende l'input dalla sottodirectory
 	QDir currentDir = cd("photogrammetry");
 
-	QDir maltDir(currentDir.filePath("Malt"));
-	if (!maltDir.exists()) {
-		throw QString("Ortho-rti directory does not exist in current directory: ") + maltDir.absolutePath();
+	//QDir (currentDir.filePath(""));
+	//if (!.exists()) {
+	//	throw QString("TA directory does not exist in current directory: ") + .absolutePath();
 
-	}
-	cout << qPrintable(maltDir.absolutePath()) << endl;
+//	}
+//	cout << qPrintable(.absolutePath()) << endl;
 
 	QStringList jpgFiles = currentDir.entryList(QStringList() << "*.jpg" << "*.JPG", QDir::Files);
 	if (jpgFiles.isEmpty()) {
@@ -569,7 +570,8 @@ void PanoBuilder::tawny(){
 
 	QString program = mm3d_path;
 	QStringList arguments;
-	arguments << "Tawny" << "Ortho-Couleur" << "RadiomEgal=0" << "" <<"";
+	arguments << "Malt" << "Ortho" << ".*jpg" << "Abs" << "ZoomF=4" << "DirMEC=Malt"
+			  << "DirTA=TA" << "DoMEC=0" << "DoOrtho=1" << "ImOrtho='Face.*JPG'" << "DirOF=Ortho-Couleur";
 
 	QString command = program + " " + arguments.join(" ");
 	cout << "Print command: " << qPrintable(command) << endl;

diff --git a/relight-pano/panobuilder.h b/relight-pano/panobuilder.h
@@ -24,7 +24,7 @@ class PanoBuilder : public QObject
 		JPG //convert to jpg
 	};
 
-	QStringList steps = {"rti", "tapioca", "schnaps", "tapas", "apericloud", "orthoplane", "tarama", "malt_mec", "c3dc", "malt_ortho"};
+	QStringList steps = {"rti", "tapioca", "schnaps", "tapas", "apericloud", "orthoplane", "tarama", "malt_mec", "c3dc", "malt_ortho", "tawny"};
 	QDir base_dir;
 	QDir datasets_dir;
 	QString mm3d_path;
@@ -39,7 +39,7 @@ class PanoBuilder : public QObject
 	void setRelightMerge(QString path);
 	int findStep(QString step);
 
-	void process(Steps starting_step = RTI);
+	void process(Steps starting_step = RTI, bool stop = false);
 	//create the directory rti process the datasets and relight-merge the rti planes
 	void rti();
 	void tapioca();
@@ -50,8 +50,8 @@ class PanoBuilder : public QObject
 	void tarama();
 	void malt_mec();
 	void c3dc();
-	void malt_ortho();
 	void tawny();
+	void malt_ortho();
 	void jpg(){};