X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=f9c9d2abf110756df5efa84b2f6ba075374f5ec5;hb=fdc97293cc66a4894a2c1c4f04f53d6473ab8ab2;hp=141b915d76a9d5c156f571f9ef33cd9618e6ebaf;hpb=1e034c70105f0926939acaaa27ddb46e904ae8bf;p=clitk.git

diff --git a/vv/vv.cxx b/vv/vv.cxx
index 141b915..f9c9d2a 100644
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -27,14 +27,15 @@
 #include "vvMainWindow.h"
 #include "vvConstants.h"
 
+void load_image_first_error()
+{
+  std::cerr << "You need to load an image before adding an overlay!" << std::endl;
+  exit(1);
+}
+
 //------------------------------------------------------------------------------
 int main( int argc, char** argv )
 {
-#ifdef _WIN32
-  HWND hWnd = GetConsoleWindow();
-  ShowWindow( hWnd, SW_HIDE );
-#endif
-
   CLITK_INIT;
 
   QApplication app( argc, argv );
@@ -58,30 +59,57 @@ int main( int argc, char** argv )
 
   window.show();
 
-  std::vector<std::string> filenames;
-  std::vector<std::pair<int ,std::string> > overlays;
-  std::vector<std::pair<int ,std::string> > vector_fields;
+  std::vector<std::string> sequence_filenames;
+  enum {P_NORMAL,P_SEQUENCE};
+  int parse_mode=P_NORMAL;
+  int n_image_loaded=0;
+
   if (argc >1) {
     for (int i = 1; i < argc; i++) {
-      std::string temp = argv[i];
-      if (temp=="--vf") {
-        assert(filenames.size()>=1);
-        vector_fields.push_back(std::make_pair(filenames.size()-1,argv[i+1]));
-        i++; //skip vf name
-      } else if (temp=="--overlay") {
-        assert(filenames.size()>=1);
-        overlays.push_back(std::make_pair(filenames.size()-1,argv[i+1]));
-        i++; //skip overlay name
-      } else
-        filenames.push_back(temp);
+      std::string current = argv[i];
+      if (!current.compare(0,2,"--")) { //We are parsing an option
+        if (parse_mode == P_SEQUENCE) {//First finish the current sequence
+          window.LoadImages(sequence_filenames,MERGEDWITHTIME);
+          sequence_filenames.clear();
+          parse_mode=P_NORMAL;
+        }
+        if (current=="--vf") {
+          if (!n_image_loaded) load_image_first_error();
+          window.AddField(argv[i+1],n_image_loaded-1);
+          i++; //skip vf name
+        } 
+        else if (current=="--overlay") {
+            if (!n_image_loaded) load_image_first_error();
+            window.AddOverlayImage(n_image_loaded-1,argv[i+1]);
+            i++; //skip overlay name
+          } 
+        else if (current=="--roi") {
+            if (!n_image_loaded) load_image_first_error();
+            window.AddROI(n_image_loaded-1,argv[i+1]);
+            i++; //skip roi name
+          }
+        else if (current=="--fusion") {
+            if (!n_image_loaded) load_image_first_error();
+            window.AddFusionImage(n_image_loaded-1,argv[i+1]);
+            i++; //skip fusion name
+          }
+        else if (current == "--sequence") {
+          n_image_loaded++; //count only one for the sequence
+          parse_mode=P_SEQUENCE; }
+      }
+      else if (parse_mode == P_SEQUENCE)
+        sequence_filenames.push_back(current);
+      else {
+        std::vector<std::string> image; image.push_back(current);
+        window.LoadImages(image,IMAGE);
+        n_image_loaded++;
+      }
+    }
+    if (parse_mode == P_SEQUENCE) {//Finish any current sequence
+      window.LoadImages(sequence_filenames,MERGEDWITHTIME);
+      sequence_filenames.clear();
+      parse_mode=P_NORMAL;
     }
-    window.LoadImages(filenames,IMAGE);
-    for (std::vector<std::pair<int ,std::string> >::iterator i=overlays.begin();
-         i!=overlays.end(); i++)
-      window.AddOverlayImage((*i).first,(*i).second.c_str());
-    for (std::vector<std::pair<int ,std::string> >::iterator i=vector_fields.begin();
-         i!=vector_fields.end(); i++)
-      window.AddField((*i).second.c_str(), (*i).first);
 
   }