X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FTestWxGimmickReaderDialog%2Fmain.cxx;h=eb89c66742f88d166cba3647481acfc9f8a7d5d0;hb=a90aea2310e662216062acb6c548116958a3cc1d;hp=8c227595cfce15d30553ce5a6ca2ba3ad7171e23;hpb=fcfe92562365cb738cf919d095d2f8d3608ec389;p=creaImageIO.git

diff --git a/appli/TestWxGimmickReaderDialog/main.cxx b/appli/TestWxGimmickReaderDialog/main.cxx
index 8c22759..eb89c66 100644
--- a/appli/TestWxGimmickReaderDialog/main.cxx
+++ b/appli/TestWxGimmickReaderDialog/main.cxx
@@ -16,7 +16,7 @@ IMPLEMENT_APP(myApp);
 CREA_WXMAIN_WITH_CONSOLE
 
 bool myApp::OnInit( )
-{	 
+{
   wxApp::OnInit();
 #ifdef __WXGTK__
   //See http://www.wxwindows.org/faqgtk.htm#locale
@@ -24,49 +24,60 @@ bool myApp::OnInit( )
 #endif
    wxInitAllImageHandlers();
 
-   creaImageIO::SetGimmickMessageLevel(9);
-   creaImageIO::SetGimmickDebugMessageLevel(9);
+   creaImageIO::SetGimmickMessageLevel(5);
+   creaImageIO::SetGimmickDebugMessageLevel(0);
 
-   int image_type = GIMMICK_3D_IMAGE_SELECTION;
+   int min_dim = GIMMICK_2D_IMAGE_SELECTION;
+   int max_dim = GIMMICK_3D_IMAGE_SELECTION;
+   int output_dim = NATIVE;
    int threads = 1;
 
-   creaImageIO::WxGimmickReaderDialog w(0,
-					-1,
-					_T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
-					wxDefaultPosition,
-					wxSize(1200,800),
-					image_type,
-					threads);
+   creaImageIO::WxGimmickReaderDialog w(
+                    0,
+                   -1,
+                   _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
+                   wxDefaultPosition,
+                   wxSize(810,750),
+                   min_dim,
+                   max_dim,
+                   output_dim,
+                   threads);
    w.ShowModal();
-   
+
    if (w.GetReturnCode() == wxID_OK)
      {
        std::cout << "$$$$ main : user clicked 'OK' $$$$"<<std::endl;
        std::cout << "$$$$ selected files : "<<std::endl;
+       //Puts filenames
        std::vector<std::string> s;
        w.GetSelectedFiles(s);
        std::vector<std::string>::iterator i;
        for (i=s.begin();i!=s.end();++i) 
-	 {
-	   std::cout << *i << std::endl;
-	 }
+         {
+           std::cout << *i << std::endl;
+         }
        std::cout << "$$$$ "<<std::endl;
 
+       //Puts images
        std::vector<vtkImageData*> images;
-       w.GetSelectedImages(images);
+       w.GetSelectedImages(images,output_dim);
+       std::cout<<images.size()<<std::endl;
+
        crea::VtkBasicSlicer(images.front());
        images.front()->Delete();
+       w.OnExit();
 
      }
    else if (w.GetReturnCode() == wxID_CANCEL)
      {
+       w.OnExit();
        std::cout << "$$$$ main : user clicked 'CANCEL' $$$$"<<std::endl;
      }
    else 
      {
-        std::cout << "$$$$ main : dialog ended without return code ! $$$$"
-		  <<std::endl;
-      
+       w.OnExit();
+       std::cout << "$$$$ main : dialog ended without return code ! $$$$"
+                 <<std::endl;    
      }
 
    //   std::cout << "$$$$ main : deleting dialog"<<std::endl;