X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=2502866a80b7ee953d4566c9af076f0028668b2c;hb=21be2c50d2c1fc6f2f02beabe18831f505bdee14;hp=f83dd3d88600fa03aaeacf4dcf38e42bd752a406;hpb=f1cebc71809c5218578a58486f829980eeb29ab3;p=clitk.git diff --git a/vv/vv.cxx b/vv/vv.cxx index f83dd3d..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); @@ -169,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 @@ -178,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(); @@ -195,6 +210,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; @@ -265,14 +283,16 @@ int main( int argc, char** argv ) 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; } }