Updated checks for applications (#202)

marip8 · web-flow · commit 7f4758b5dcc6 · 2024-08-01T19:56:00.000-05:00
diff --git a/gui/src/app/camera_intrinsic_calibration_app.cpp b/gui/src/app/camera_intrinsic_calibration_app.cpp
@@ -1,4 +1,5 @@
 #include <industrial_calibration/gui/camera_intrinsic_calibration_widget.h>
+#include <filesystem>
 #include <QApplication>
 #include <QMessageBox>
 #include <QTextStream>
@@ -65,12 +66,12 @@ int main(int argc, char** argv)
     // Attempt to load configuration and observations files if available
     try
     {
-      if (argc > 1)
+      if (argc > 1 && std::filesystem::is_regular_file(argv[1]))
       {
         w.loadConfig(argv[1]);
         QMessageBox::information(nullptr, "Configuration", "Successfully loaded calibration configuration");
       }
-      if (argc > 2)
+      if (argc > 2 && std::filesystem::is_regular_file(argv[2]))
         w.loadObservations(argv[2]);
     }
     catch (const std::exception& ex)
diff --git a/gui/src/app/extrinsic_hand_eye_calibration_app.cpp b/gui/src/app/extrinsic_hand_eye_calibration_app.cpp
@@ -1,4 +1,5 @@
 #include <industrial_calibration/gui/extrinsic_hand_eye_calibration_widget.h>
+#include <filesystem>
 #include <QApplication>
 #include <QMessageBox>
 #include <QTextStream>
@@ -58,12 +59,12 @@ int main(int argc, char** argv)
     // Attempt to load configuration and observations files if available
     try
     {
-      if (argc > 1)
+      if (argc > 1 && std::filesystem::is_regular_file(argv[1]))
       {
         w.loadConfig(argv[1]);
         QMessageBox::information(nullptr, "Configuration", "Successfully loaded calibration configuration");
       }
-      if (argc > 2)
+      if (argc > 2 && std::filesystem::is_regular_file(argv[2]))
         w.loadObservations(argv[2]);
     }
     catch (const std::exception& ex)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <industrial_calibration/gui/camera_intrinsic_calibration_widget.h>`
	`2`	`+#include <filesystem>`
`2`	`3`	`#include <QApplication>`
`3`	`4`	`#include <QMessageBox>`
`4`	`5`	`#include <QTextStream>`
`@@ -65,12 +66,12 @@ int main(int argc, char** argv)`
`65`	`66`	`// Attempt to load configuration and observations files if available`
`66`	`67`	`try`
`67`	`68`	`{`
`68`		`- if (argc > 1)`
	`69`	`+ if (argc > 1 && std::filesystem::is_regular_file(argv[1]))`
`69`	`70`	`{`
`70`	`71`	`w.loadConfig(argv[1]);`
`71`	`72`	`QMessageBox::information(nullptr, "Configuration", "Successfully loaded calibration configuration");`
`72`	`73`	`}`
`73`		`- if (argc > 2)`
	`74`	`+ if (argc > 2 && std::filesystem::is_regular_file(argv[2]))`
`74`	`75`	`w.loadObservations(argv[2]);`
`75`	`76`	`}`
`76`	`77`	`catch (const std::exception& ex)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <industrial_calibration/gui/extrinsic_hand_eye_calibration_widget.h>`
	`2`	`+#include <filesystem>`
`2`	`3`	`#include <QApplication>`
`3`	`4`	`#include <QMessageBox>`
`4`	`5`	`#include <QTextStream>`
`@@ -58,12 +59,12 @@ int main(int argc, char** argv)`
`58`	`59`	`// Attempt to load configuration and observations files if available`
`59`	`60`	`try`
`60`	`61`	`{`
`61`		`- if (argc > 1)`
	`62`	`+ if (argc > 1 && std::filesystem::is_regular_file(argv[1]))`
`62`	`63`	`{`
`63`	`64`	`w.loadConfig(argv[1]);`
`64`	`65`	`QMessageBox::information(nullptr, "Configuration", "Successfully loaded calibration configuration");`
`65`	`66`	`}`
`66`		`- if (argc > 2)`
	`67`	`+ if (argc > 2 && std::filesystem::is_regular_file(argv[2]))`
`67`	`68`	`w.loadObservations(argv[2]);`
`68`	`69`	`}`
`69`	`70`	`catch (const std::exception& ex)`