From: Eduardo Davila Date: Wed, 6 Oct 2010 21:04:47 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~2 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=aa695aa4b50c77c1a4faa2cc6f71154057a87b98;p=creaImageIO.git *** empty log message *** --- diff --git a/src/creaImageIOExternalGimmick.cpp b/src/creaImageIOExternalGimmick.cpp index 8201a81..1808d23 100644 --- a/src/creaImageIOExternalGimmick.cpp +++ b/src/creaImageIOExternalGimmick.cpp @@ -1,6 +1,34 @@ -#include +#include +//EED Borrame +//#include + + +vtkImageData* getImageDataDialog() +{ + wxString infoImage; + std::vector images; + creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB"); + w.ShowModal(); + if(w.GetReturnCode() == wxID_OK) + { + std::vector s; + images = w.getImagesSelected(); + infoImage = w.getInfoImage(); + } // if + + vtkImageData *result=NULL; + if (images.size()>0) + { + result=images[0]; + } + + return result; +} + + +/*EED Borrame vtkImageData* getImageDataDialog() { // wxApp::OnInit(); #ifdef __WXGTK__ @@ -15,11 +43,11 @@ vtkImageData* getImageDataDialog() { int min_dim = GIMMICK_2D_IMAGE_SELECTION; int max_dim = GIMMICK_3D_IMAGE_SELECTION; int output_dim = NATIVE; - int threads = 1; + int threads = 1; creaImageIO::WxGimmickReaderDialog w( 0, - -1, + -1, "localdatabase_Descriptor.dscp", "Local Database", _T("Select image(s) - Gimmick! (c) CREATIS-LRMN 2008"), @@ -39,7 +67,7 @@ vtkImageData* getImageDataDialog() { std::vector s; w.GetSelectedFiles(s); std::vector::iterator i; - for (i=s.begin();i!=s.end();++i) + for (i=s.begin();i!=s.end();++i) { std::cout << *i << std::endl; } @@ -55,7 +83,7 @@ vtkImageData* getImageDataDialog() { //crea::VtkBasicSlicer(images.front()); //images.front()->Delete(); - + } else if (w.GetReturnCode() == wxID_CANCEL) @@ -63,11 +91,11 @@ vtkImageData* getImageDataDialog() { w.OnExit(); std::cout << "$$$$ main : user clicked 'CANCEL' $$$$"<