X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=6a367f7da07ccac1973ffff458bde573cbe75616;hb=c74c7098e31ec54ac50aa2aff5dc1c21bc4179c8;hp=8ad9140ea628c1b488fb74b271fac18d6c394889;hpb=1548a47199250d3819961adb37becac65bc72f3c;p=clitk.git

diff --git a/vv/vv.cxx b/vv/vv.cxx
index 8ad9140..6a367f7 100644
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -45,7 +45,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-typedef enum {O_BASE,O_OVERLAY,O_FUSION,O_VF,O_CONTOUR} OpenModeType;
+typedef enum {O_BASE,O_OVERLAY,O_FUSION,O_VF,O_CONTOUR,O_LANDMARKS} OpenModeType;
 typedef enum {P_NORMAL,P_SEQUENCE,P_WINDOW,P_LEVEL} ParseModeType;
 
 void load_image_first_error()
@@ -79,6 +79,10 @@ void open_sequence(vvMainWindow &window,
     window.LoadImages(sequence_filenames, vvImageReader::MERGEDWITHTIME);
   else if (open_mode==O_OVERLAY)
     window.AddOverlayImage(n_image_loaded-1,sequence_filenames,vvImageReader::MERGEDWITHTIME);
+  else if (open_mode==O_LANDMARKS)
+    window.AddLandmarks(n_image_loaded-1,sequence_filenames);
+  else if (open_mode==O_FUSION)
+    window.AddFusionImage(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);
@@ -178,10 +182,11 @@ int main( int argc, char** argv )
                     << std::endl
                     << "These last options must follow a file name since they overlay something on an image:" << std::endl
                     << "--vf file      \t Overlay the vector field in file." << std::endl
-                    << "--overlay file \t Overlay the image in file with complementary colors." << std::endl
-                    << "--fusion file  \t Overlay the image in file with alpha blending and colormap." << std::endl
+                    << "--overlay [--sequence] file(s) \t Overlay the image in file with complementary colors." << std::endl
+                    << "--fusion [--sequence] file(s)  \t Overlay the image in file with alpha blending and colormap." << std::endl
                     //<< "--roi file     \t Overlay binary mask images. Option may be repeated on a single base image." << std::endl
-                    << "--contour file \t Overlay DICOM RT-STRUCT contours." << std::endl;
+                    << "--contour file \t Overlay DICOM RT-STRUCT contours." << std::endl
+                    << "--landmarks [--sequence] file(s)  \t Overlay the landmarks in file(s) (.txt or .pts)." << std::endl;
           exit(0);
         } else if (current=="--vf") {
           if (!n_image_loaded) load_image_first_error();
@@ -195,6 +200,9 @@ int main( int argc, char** argv )
         } else if (current=="--fusion") {
           if (!n_image_loaded) load_image_first_error();
           open_mode = O_FUSION;
+        } else if (current=="--landmarks") {
+          if (!n_image_loaded) load_image_first_error();
+          open_mode = O_LANDMARKS;
         } else if (current == "--sequence") {
           if(open_mode==O_BASE) n_image_loaded++; //count only one for the whole sequence
           parse_mode=P_SEQUENCE;
@@ -272,7 +280,9 @@ int main( int argc, char** argv )
         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());
+          window.AddFusionImage(n_image_loaded-1,image,vvImageReader::IMAGE);
+        else if (open_mode==O_LANDMARKS)
+          window.AddLandmarks(n_image_loaded-1,image);
         open_mode = O_BASE;
       }
     }