X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=2502866a80b7ee953d4566c9af076f0028668b2c;hb=229b5c47165370a8f34ddae0861874c4a28a2463;hp=b4beaa8dcdf7f5a18799793a3025141792fc1514;hpb=bc4b7eaef671605cb3e8077ce8a70eb7386890e5;p=clitk.git diff --git a/vv/vv.cxx b/vv/vv.cxx index b4beaa8..2502866 100644 --- a/vv/vv.cxx +++ b/vv/vv.cxx @@ -28,6 +28,15 @@ #include #include +#if VTK_MAJOR_VERSION > 5 +#include + VTK_MODULE_INIT(vtkInteractionStyle); + VTK_MODULE_INIT(vtkRenderingOpenGL); + VTK_MODULE_INIT(vtkRenderingFreeType); +#define vtkRenderingContext2D_AUTOINIT 1(vtkRenderingContextOpenGL) +#endif + + #include "clitkIO.h" #include "vvMainWindow.h" #include "vvReadState.h" @@ -44,8 +53,9 @@ #include #include #include +#pragma comment(lib, "ws2_32.lib") -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() @@ -74,11 +84,15 @@ void open_sequence(vvMainWindow &window, std::vector &sequence_filenames, int n_image_loaded) { - const std::string open_mode_names[] = {"base", "overlay", "fusion", "vf", "contour"}; + const std::string open_mode_names[] = {"base", "overlay", "fusion", "vf", "contour", "fusionSequence"}; if(open_mode==O_BASE) window.LoadImages(sequence_filenames, vvImageReader::MERGEDWITHTIME); - else if (open_mode==O_OVERLAY) + else if (open_mode==O_OVERLAY && window.CheckAddedImage(n_image_loaded-1, "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.CheckAddedImage(n_image_loaded-1, "fusion") && window.CheckAddedImage(n_image_loaded-1, "fusionSequence")) + 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); @@ -140,6 +154,8 @@ int main( int argc, char** argv ) int n_image_loaded=0; std::string win(""), lev(""); + int first_of_wl_set = -1; + bool new_wl_set = false; bool link_images = false; if (argc >1) { for (int i = 1; i < argc; i++) { @@ -150,11 +166,15 @@ int main( int argc, char** argv ) } else if (parse_mode == P_WINDOW) { // handle negative window values win=current; + window.ApplyWindowToSetOfImages(atof(win.c_str()), first_of_wl_set, n_image_loaded-1); parse_mode=P_NORMAL; + new_wl_set = false; continue; } else if (parse_mode == P_LEVEL) { // handle negative level values lev=current; + window.ApplyLevelToSetOfImages(atof(lev.c_str()), first_of_wl_set, n_image_loaded-1); parse_mode=P_NORMAL; + new_wl_set = false; continue; } if ((current=="--help") || (current=="-h")) { @@ -163,8 +183,8 @@ int main( int argc, char** argv ) << "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 + << "--window number\t Gray scale window width for set of images appearing before in the cmd line (may appear more than once)." << std::endl + << "--level number \t Gray scale window level for set of images appearing before in the cmd line (may appear more than once)." << 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 @@ -172,10 +192,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(); @@ -189,17 +210,24 @@ 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; + if (!new_wl_set) { + new_wl_set = true; + first_of_wl_set = n_image_loaded-1; + } } 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()) && @@ -236,25 +264,35 @@ int main( int argc, char** argv ) sequence_filenames.push_back(current); } else if (parse_mode == P_WINDOW) { win=current; + window.ApplyWindowToSetOfImages(atof(win.c_str()), first_of_wl_set, n_image_loaded-1); parse_mode=P_NORMAL; + new_wl_set = false; } else if (parse_mode == P_LEVEL) { lev=current; + window.ApplyLevelToSetOfImages(atof(lev.c_str()), first_of_wl_set, n_image_loaded-1); parse_mode=P_NORMAL; + new_wl_set = false; } else { std::vector image; image.push_back(current); if(open_mode==O_BASE) { window.LoadImages(image, vvImageReader::IMAGE); n_image_loaded++; + if (!new_wl_set) { + new_wl_set = true; + first_of_wl_set = n_image_loaded-1; + } } - else if (open_mode==O_VF) + else if (open_mode==O_VF && window.CheckAddedImage(n_image_loaded-1, "vector")) window.AddField(current.c_str(), n_image_loaded-1); - else if (open_mode==O_OVERLAY) + else if (open_mode==O_OVERLAY && window.CheckAddedImage(n_image_loaded-1, "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()); + else if (open_mode==O_FUSION && window.CheckAddedImage(n_image_loaded-1, "fusion") && window.CheckAddedImage(n_image_loaded-1, "fusionSequence")) + 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; } } @@ -263,10 +301,10 @@ int main( int argc, char** argv ) } } - if(win!="" && lev!="") { - window.SetWindowLevel(atof(win.c_str()), atof(lev.c_str())); - window.ApplyWindowLevelToAllImages(); - } +// if(win!="" && lev!="") { +// window.SetWindowLevel(atof(win.c_str()), atof(lev.c_str())); +// window.ApplyWindowLevelToAllImages(); +// } if (link_images) window.LinkAllImages();