BUG: Fix support of interactive mode in ctkDICOMAppWidgetTest1

Switch to use of QCommandLineParser to ensure the "-I" is properly parsed independently of the order of the command line argument. Co-authored-by: Jean-Christophe Fillion-Robin <[email protected]>
commontk · Jan 13, 2024 · 7b00d52 · 7b00d52
1 parent 96c5d68
commit 7b00d52
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMAppWidgetTest1.cpp b/Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMAppWidgetTest1.cpp
@@ -20,6 +20,7 @@
 
 // Qt includes
 #include <QApplication>
+#include <QCommandLineParser>
 #include <QDebug>
 #include <QDir>
 #include <QTimer>
@@ -43,7 +44,16 @@
 int ctkDICOMAppWidgetTest1( int argc, char * argv [] )
 {
   QApplication app(argc, argv);
-
+
+  QCommandLineParser parser;
+  parser.addOption({"I", "Run in interactive mode"});
+  parser.addPositionalArgument("directory", "Directory to import");
+  parser.process(app);
+
+  QString directoryToImport = parser.positionalArguments().at(0);
+
+  qDebug() << "Importing directory " << directoryToImport;
+
   ctkDICOMAppWidget appWidget;
 
   QFileInfo tempFileInfo(QDir::tempPath() + QString("/ctkDICOMAppWidgetTest1-db"));
@@ -66,9 +76,9 @@ int ctkDICOMAppWidgetTest1( int argc, char * argv [] )
   appWidget.openQueryDialog();
 
   appWidget.openQueryDialog();
-  
+
   appWidget.setDisplayImportSummary(false);
-  appWidget.onImportDirectory(argv[argc -1]);
+  appWidget.onImportDirectory(directoryToImport);
   if ( appWidget.patientsAddedDuringImport() != 1
     || appWidget.studiesAddedDuringImport() != 1
     || appWidget.seriesAddedDuringImport() != 1
@@ -78,7 +88,7 @@ int ctkDICOMAppWidgetTest1( int argc, char * argv [] )
     return EXIT_FAILURE;
     }
 
-  if (argc <= 2 || QString(argv[1]) != "-I")
+  if (!parser.isSet("I"))
     {
     QTimer::singleShot(200, &app, SLOT(quit()));
     }