Remove warning.

[clitk.git] / vv / vv.cxx

diff --git a/vv/vv.cxx b/vv/vv.cxx
index 7f640a52a0579d660b251643a0357c8a7ad42327..f5029b1d6c9114a0d03d9768364eba90a14af8b4 100644 (file)
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -32,8 +32,11 @@
 #include "vvMainWindow.h"
 #include "vvReadState.h"
 #include "vvToolsList.h"
+#include "vvConfiguration.h"
+
 #include <vtkFileOutputWindow.h>
 #include <vtkSmartPointer.h>
+
 #include <itkFileOutputWindow.h>
 #include <itkSmartPointer.h>
 #include <itksys/SystemTools.hxx>
@@ -112,16 +115,46 @@ int main( int argc, char** argv )
   int n_image_loaded=0;
   std::string win(""), lev("");
 
+       bool link_images = false;
   if (argc >1) {
     for (int i = 1; i < argc; i++) {
       std::string current = argv[i];
-      if (!current.compare(0,2,"--")) { //We are parsing an option
+      if (!current.compare(0,1,"-")) { // && !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);
           sequence_filenames.clear();
           parse_mode=P_NORMAL;
+        } 
+        else if (parse_mode == P_WINDOW) { // handle negative window values
+          win=current;
+          parse_mode=P_NORMAL;
+          continue;
+        } else if (parse_mode == P_LEVEL) { // handle negative level values
+          lev=current;
+          parse_mode=P_NORMAL;
+          continue;
         }
-        if (current=="--vf") {
+        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
+                    << "OPTIONS may be:" << std::endl
+                    << "--help         \t Print command line help and exit." << std::endl
+                    << "--window number\t Gray scale window width for all images." << std::endl
+                    << "--level number \t Gray scale window level for all images." << std::endl
+                    << "--linkall      \t Link pan, zoom and spatial position of crosshair in images." << std::endl
+                    << "--log          \t Log output messages in vv-log directory." << std::endl
+                    << "--state file   \t Read display parameters from file." << std::endl
+                    << "--sequence file\t Read all file(s) until next option in a single temporal sequence." << std::endl
+                    << 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
+                    //<< "--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;
+          exit(0);
+        } else if (current=="--vf") {
           if (!n_image_loaded) load_image_first_error();
           window.AddField(argv[i+1],n_image_loaded-1);
           i++; //skip vf name
@@ -129,10 +162,14 @@ int main( int argc, char** argv )
           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") {
+        } /*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") {
+          if (!n_image_loaded) load_image_first_error();
+          window.AddDCStructContour(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]);
@@ -144,7 +181,10 @@ int main( int argc, char** argv )
           parse_mode=P_WINDOW;
         } else if (current == "--level") {
           parse_mode=P_LEVEL;
-        } else if (current == "--log") {
+        } else if (current == "--linkall") {
+         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()) &&
@@ -204,6 +244,8 @@ int main( int argc, char** argv )
     window.ApplyWindowLevelToAllImages();
   }
 
+  if (link_images)
+    window.LinkAllImages();
 
   int ret = app.exec();