X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=7071a1b8e22a78e23f5cd6271b21df7c191f0418;hb=da2e843f73cad8d9116fce78361076c2e59a8941;hp=7506aa94b81d792f1f0d359ffe49ca0185e5bae9;hpb=259619f9c388b34a9bbb22ace79e9320300f812f;p=clitk.git diff --git a/vv/vv.cxx b/vv/vv.cxx index 7506aa9..7071a1b 100644 --- a/vv/vv.cxx +++ b/vv/vv.cxx @@ -44,6 +44,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; @@ -81,6 +82,8 @@ void open_sequence(vvMainWindow &window, 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.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); @@ -278,7 +281,7 @@ int main( int argc, char** argv ) 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()); + 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;