X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=ef8d0259bfa2bba32e0c361b8db4b46daa8c50d7;hb=4d67947110db0b85315ec010ba3db85781097a4a;hp=f9430fe7ab12c79f7a3ba6c82c4ad8d8a8a4cd2a;hpb=35fba665ddd51b6365673748907606b787899720;p=clitk.git

diff --git a/vv/vv.cxx b/vv/vv.cxx
index f9430fe..ef8d025 100644
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -110,8 +110,11 @@ int main( int argc, char** argv )
   window.show();
 
   std::vector<std::string> sequence_filenames;
-  enum {P_NORMAL,P_SEQUENCE,P_WINDOW,P_LEVEL};
-  int parse_mode=P_NORMAL;
+  enum {P_NORMAL,P_SEQUENCE,P_WINDOW,P_LEVEL} parse_mode;
+  parse_mode=P_NORMAL;
+  enum {O_BASE,O_OVERLAY,O_FUSION,O_VF,O_CONTOUR} open_mode;
+  std::string open_mode_names[] = {"base", "overlay", "fusion", "vf", "contour"};
+  open_mode=O_BASE;
   int n_image_loaded=0;
   std::string win(""), lev("");
 
@@ -121,11 +124,18 @@ int main( int argc, char** argv )
       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, vvImageReader::MERGEDWITHTIME);
+          if(open_mode==O_BASE)
+            window.LoadImages(sequence_filenames, vvImageReader::MERGEDWITHTIME);
+          else if (open_mode==O_OVERLAY)
+            window.AddOverlayImage(n_image_loaded-1,sequence_filenames,vvImageReader::IMAGE);
+          else {
+            std::cerr << "Sequences are not managed for opening " << open_mode_names[open_mode] << std::endl;
+            exit(1);
+          }
           sequence_filenames.clear();
           parse_mode=P_NORMAL;
         }
-        if (current=="--help") {
+        if ((current=="--help") || (current=="-h")) {
           std::cout << "vv " << VV_VERSION << ", the 2D, 2D+t, 3D and 3D+t (or 4D) image viewer" << std::endl << std::endl
                     << "Synopsis: vv file(s) [OPTIONS] file(s)" << std::endl << std::endl
                     << "Open file(s) for visualization." << std::endl << std::endl
@@ -148,35 +158,27 @@ int main( int argc, char** argv )
         }
         if (current=="--vf") {
           if (!n_image_loaded) load_image_first_error();
-          window.AddField(argv[i+1],n_image_loaded-1);
-          i++; //skip vf name
+          open_mode = O_VF;
         } 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=="--contour") {
+          open_mode = O_OVERLAY;
+        } else if (current=="--contour") {
           if (!n_image_loaded) load_image_first_error();
-          window.AddDCStructContour(n_image_loaded-1,argv[i+1]);
-          i++; //skip roi name
+          open_mode = O_CONTOUR;
         } 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
+          open_mode = O_FUSION;
         } else if (current == "--sequence") {
-          n_image_loaded++; //count only one for the sequence
+          if(open_mode==O_BASE) n_image_loaded++; //count only one for the whole sequence
           parse_mode=P_SEQUENCE;
         } else if (current == "--window") {
           parse_mode=P_WINDOW;
         } else if (current == "--level") {
           parse_mode=P_LEVEL;
         } else if (current == "--linkall") {
-					link_images = true;
-				}
-				else if (current == "--log") {
+	  link_images = true;
+	}
+	else if (current == "--log") {
           std::string log_dir = QDir::tempPath().toStdString() + std::string("/vv-log");
 
           if(itksys::SystemTools::FileExists(log_dir.c_str()) &&
@@ -220,12 +222,30 @@ int main( int argc, char** argv )
       } else {
         std::vector<std::string> image;
         image.push_back(current);
-        window.LoadImages(image, vvImageReader::IMAGE);
-        n_image_loaded++;
+        if(open_mode==O_BASE) {
+          window.LoadImages(image, vvImageReader::IMAGE);
+          n_image_loaded++;
+        }
+        else if (open_mode==O_VF)
+          window.AddField(current.c_str(), n_image_loaded-1);
+        else if (open_mode==O_OVERLAY)
+          window.AddOverlayImage(n_image_loaded-1,image,vvImageReader::IMAGE);
+        else if (open_mode==O_CONTOUR)
+          window.AddDCStructContour(n_image_loaded-1,current.c_str());
+        else if (open_mode==O_FUSION)
+          window.AddFusionImage(n_image_loaded-1,current.c_str());
+        open_mode = O_BASE;
       }
     }
     if (parse_mode == P_SEQUENCE) { //Finish any current sequence
-      window.LoadImages(sequence_filenames, vvImageReader::MERGEDWITHTIME);
+      if(open_mode==O_BASE)
+        window.LoadImages(sequence_filenames, vvImageReader::MERGEDWITHTIME);
+      else if (open_mode==O_OVERLAY)
+        window.AddOverlayImage(n_image_loaded-1,sequence_filenames, vvImageReader::MERGEDWITHTIME);
+      else {
+        std::cerr << "Sequences are not managed for opening " << open_mode_names[open_mode] << std::endl;
+        exit(1);
+      }
       sequence_filenames.clear();
       parse_mode=P_NORMAL;
     }
@@ -236,8 +256,8 @@ int main( int argc, char** argv )
     window.ApplyWindowLevelToAllImages();
   }
 
-	if (link_images)
-		window.LinkAllImages();
+  if (link_images)
+    window.LinkAllImages();
 
   int ret = app.exec();