X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=2502866a80b7ee953d4566c9af076f0028668b2c;hb=b8e5890d37dfd64409b9694f73c0be164a089e64;hp=6a367f7da07ccac1973ffff458bde573cbe75616;hpb=3bac8018d5b98bd02fa4c627e8a9a58cc42ba0f7;p=clitk.git diff --git a/vv/vv.cxx b/vv/vv.cxx index 6a367f7..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,6 +53,7 @@ #include #include #include +#pragma comment(lib, "ws2_32.lib") 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; @@ -77,11 +87,11 @@ void open_sequence(vvMainWindow &window, 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) + 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; @@ -273,13 +283,13 @@ 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) + 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);