From d4a6ce0b7fa1d6880cbdbe9234bd851f4648daca Mon Sep 17 00:00:00 2001 From: Erika Date: Thu, 19 Sep 2024 12:32:02 +0200 Subject: [PATCH] added tawny function --- relight-pano/panobuilder.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/relight-pano/panobuilder.cpp b/relight-pano/panobuilder.cpp index 0e5ed89..9aee1a5 100644 --- a/relight-pano/panobuilder.cpp +++ b/relight-pano/panobuilder.cpp @@ -624,21 +624,26 @@ void PanoBuilder::malt_ortho(){ void PanoBuilder::tawny(){ - //prende l'input dalla sottodirectory Ortho Lights? + //prende l'input dalla sottodirectory Ortho Couleur QDir currentDir = cd("photogrammetry"); - if (!currentDir.exists()) { - throw QString("Directory photogrammetry does not exist: ") + currentDir.absolutePath(); + + QDir orthoCouleur(currentDir.filePath("Ortho-Couleur")); + if (!orthoCouleur.exists()) { + throw QString("orthoCouleur directory does not exist in current directory: ") + orthoCouleur.absolutePath(); + } + cout << qPrintable(orthoCouleur.absolutePath()) << endl; - QStringList jpgFiles = currentDir.entryList(QStringList() << "plane_0_*.jpg", QDir::Files); - if (jpgFiles.isEmpty()) { - throw QString("No JPEG images found in photogrammetry directory"); + QStringList tifFiles = orthoCouleur.entryList(QStringList() << "Ort_plane_*_Face_*.tif", QDir::Files); + if (tifFiles.isEmpty()) { + throw QString("No tif images found in photogrammetry directory ") + orthoCouleur.absolutePath(); } + QString program = mm3d_path; QStringList arguments; - arguments << "Tawny" << "Ortho-Light" << "RadiomEgal=0" << "Out=plane_0.tif"; + arguments << "Tawny" << "Ortho-Couleur" << "RadiomEgal=0" << "Out=Orthophotomosaic_NewRadiom.tif"; QString command = program + " " + arguments.join(" "); cout << "Print command: " << qPrintable(command) << endl;