Selaa lähdekoodia

Changed how the CLI works

Ioannis Agtzidis 4 vuotta sitten
vanhempi
commit
3ae0a7c6bc
4 muutettua tiedostoa jossa 23 lisäystä ja 20 poistoa
  1. 9 14
      GTA-VI/GTA-VI.cpp
  2. 12 4
      GTA-VI/MainWindow.cpp
  3. 1 1
      GTA-VI/MediaPlayer.cpp
  4. 1 1
      arffHelper/ArffBase.cpp

+ 9 - 14
GTA-VI/GTA-VI.cpp

@@ -81,20 +81,15 @@ int main(int argc, char *argv[])
     if (parser.isSet("head-only-motion"))
         setup.gazeType = GazeType::HEAD;
 
-    if (parser.isSet("video-file") && parser.isSet("arff-file") && parser.isSet("save-file") && parser.isSet("primary-label"))
-    {
-        setup.arffFile = parser.value(arffFileOption);
-        setup.saveFile = parser.value(saveFileOption);
-        setup.videoFile = parser.value(videoFileOption);
-        setup.primaryLabel = parser.value(primaryLabelOption);
-        setup.primaryLabelValues = parser.value(primaryLabelValueOption);
-        setup.secondaryLabel = parser.value(secondaryLabelOption);
-        setup.secondaryLabelValues = parser.value(secondaryLabelValueOption);
-
-        pMainWindow = new MainWindow(setup);
-    }
-    else
-        pMainWindow = new MainWindow;
+    setup.arffFile = parser.value(arffFileOption);
+    setup.saveFile = parser.value(saveFileOption);
+    setup.videoFile = parser.value(videoFileOption);
+    setup.primaryLabel = parser.value(primaryLabelOption);
+    setup.primaryLabelValues = parser.value(primaryLabelValueOption);
+    setup.secondaryLabel = parser.value(secondaryLabelOption);
+    setup.secondaryLabelValues = parser.value(secondaryLabelValueOption);
+
+    pMainWindow = new MainWindow(setup);
 
     if (parser.isSet(fullScreenOption))
         pMainWindow->showFullScreen();

+ 12 - 4
GTA-VI/MainWindow.cpp

@@ -27,12 +27,20 @@ MainWindow::MainWindow(SetupValues setup) : m_setup(setup), m_pMainWidget(0), m_
     InitializeMenu();
 
     // assign values
-    m_setup.arffFile = QFileInfo(m_setup.arffFile).absoluteFilePath();
-    m_setup.saveFile = QFileInfo(m_setup.saveFile).absoluteFilePath();
-    m_setup.videoFile = QFileInfo(m_setup.videoFile).absoluteFilePath();
+    if (!m_setup.arffFile.isEmpty())
+        m_setup.arffFile = QFileInfo(m_setup.arffFile).absoluteFilePath();
+    else
+    {
+       cerr << "ERROR: your should provide an ARFF file with the --af option" << endl;
+       exit(-1);
+    }
+    if (!m_setup.saveFile.isEmpty())
+        m_setup.saveFile = QFileInfo(m_setup.saveFile).absoluteFilePath();
+    if (!m_setup.videoFile.isEmpty())
+        m_setup.videoFile = QFileInfo(m_setup.videoFile).absoluteFilePath();
 
     // Load Files
-    if (!m_pVideoWidget->SetMedia(m_setup.videoFile))
+    if (!m_setup.videoFile.isEmpty() &&!m_pVideoWidget->SetMedia(m_setup.videoFile))
         exit(-1);
 
     if (!m_pArff->Load(m_setup.arffFile.toStdString().c_str()))

+ 1 - 1
GTA-VI/MediaPlayer.cpp

@@ -69,7 +69,7 @@ bool MediaPlayer::setMedia(QUrl videoFile)
     {
         if (!VideoExtractor::ExtractFrames(sVideoFile))
         {
-            cerr << "Could not open file: " << sVideoFile << endl;
+            cerr << "Could not open video file: " << sVideoFile << endl;
             return false;
         }
     }

+ 1 - 1
arffHelper/ArffBase.cpp

@@ -32,7 +32,7 @@ bool ArffBase::Load(const char* filename)
 
     if (ifs.fail())
     {
-        cerr << "Could not open file: " << filename << endl;
+        cerr << "Could not open provided ARFF file: " << filename << endl;
         return false;
     }