X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=ef8d0259bfa2bba32e0c361b8db4b46daa8c50d7;hb=4d67947110db0b85315ec010ba3db85781097a4a;hp=301521b4662a8509197d81174b348964b4e5e140;hpb=98eb0c23b8066792d7a77e571fb7d48c9fe02db6;p=clitk.git diff --git a/vv/vv.cxx b/vv/vv.cxx index 301521b..ef8d025 100644 --- a/vv/vv.cxx +++ b/vv/vv.cxx @@ -30,9 +30,13 @@ #include "clitkIO.h" #include "vvMainWindow.h" +#include "vvReadState.h" #include "vvToolsList.h" +#include "vvConfiguration.h" + #include #include + #include #include #include @@ -106,44 +110,75 @@ int main( int argc, char** argv ) window.show(); std::vector 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(""); + 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 (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") || (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); + } 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") { + open_mode = O_OVERLAY; + } else if (current=="--contour") { if (!n_image_loaded) load_image_first_error(); - window.AddROI(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 == "--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()) && @@ -168,7 +203,14 @@ int main( int argc, char** argv ) vtk_log->FlushOn(); vtk_log->AppendOn(); vtkOutputWindow::SetInstance(vtk_log); + } else if (current == "--state") { + //window.ReadSavedStateFile(argv[i+1]); + vvReadState read_state; + read_state.Run(&window, argv[i+1]); + n_image_loaded += read_state.GetNumberOfImages(); + i++; } + } else if (parse_mode == P_SEQUENCE) { sequence_filenames.push_back(current); } else if (parse_mode == P_WINDOW) { @@ -180,12 +222,30 @@ int main( int argc, char** argv ) } else { std::vector 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; } @@ -196,6 +256,8 @@ int main( int argc, char** argv ) window.ApplyWindowLevelToAllImages(); } + if (link_images) + window.LinkAllImages(); int ret = app.exec();