*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5532c133afe3f14ecfeb21a53feb6c72b3188729..857728b9e4eb8bff2bfdf1574c7d7061370a0343 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ SET(USE_GDCM_VTK ON)
 SET(USE_VTK ON)
 SET(USE_ITK OFF)
 SET(USE_BOOST ON)
+SET(USE_WXWIDGETS ON)
 
 CREA_FIND_AND_USE_LIBRARIES()
 

diff --git a/appli/TestGimmickReaderDialog/main.cxx b/appli/TestGimmickReaderDialog/main.cxx
index 7cb25b52656011a9d48d0b927100d3d0329820da..4aa1c8411d1cc95ad26d5ebeb5e6e484433a2c16 100644 (file)
--- a/appli/TestGimmickReaderDialog/main.cxx
+++ b/appli/TestGimmickReaderDialog/main.cxx
@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
       creaImageIO::SetGimmickMessageLevel(l);
     }
 
-  std::vector<vtkImageData*> images;
+  std::vector<vtkImageData*> images;  
   bool r = creaImageIO::GimmickReaderDialog(images,
                                            "GimmickReaderDialog test",
                                                "localdatabase_Descriptor.dscp",

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index cf4b820121ce18c3328adb712b9fbb37eda90d9c..602e0bfefb6bba7b34de1ce66d891a6200a7efae 100644 (file)
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -21,7 +21,7 @@ FILE(GLOB SOURCES_CREAIMAGEIO
   creaImageIOWxViewer.cpp
   creaImageIOGimmickView.cpp
   creaImageIOListener.cpp
-
+)
  
  # Attributed tree data structure
 FILE(GLOB SOURCES_CREAIMAGEIO_TREE

diff --git a/src2/creaImageIOGimmickReaderDialog.cpp b/src2/creaImageIOGimmickReaderDialog.cpp
index f2c18d941135492c0f7041a1f8a9daffa5e75ca2..3bf6f22122bf2771be8343665cbc4f55b2b13277 100644 (file)
--- a/src2/creaImageIOGimmickReaderDialog.cpp
+++ b/src2/creaImageIOGimmickReaderDialog.cpp
@@ -5,8 +5,87 @@
 #define new DEBUG_NEW
 #endif
 
+
+
+CREAIMAGEIO_EXPORT vtkImageData* getImageDataDialog() {
+       //      wxApp::OnInit();
+       #ifdef __WXGTK__
+         //See http://www.wxwindows.org/faqgtk.htm#locale
+         setlocale(LC_NUMERIC, "C");
+       #endif
+          wxInitAllImageHandlers();
+
+          creaImageIO::SetGimmickMessageLevel(5);
+          creaImageIO::SetGimmickDebugMessageLevel(0);
+
+          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, 
+                                          "localdatabase_Descriptor.dscp",
+                                          "Local Database",
+                                          _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 << "$$$$ "<<std::endl;
+
+                  //Puts images
+                  std::vector<vtkImageData*> images;
+                  w.GetSelectedImages(images,output_dim);
+                  std::cout<<images.size()<<std::endl;
+
+                  w.OnExit();
+                  return images[0];
+
+                  //crea::VtkBasicSlicer(images.front());
+                  //images.front()->Delete();
+                  
+
+                }
+          else if (w.GetReturnCode() == wxID_CANCEL)
+                {
+                  w.OnExit();
+                  std::cout << "$$$$ main : user clicked 'CANCEL' $$$$"<<std::endl;
+                }
+          else 
+                {
+                  w.OnExit();
+                  std::cout << "$$$$ main : dialog ended without return code ! $$$$"
+                                        <<std::endl;    
+                }
+
+          //   std::cout << "$$$$ main : deleting dialog"<<std::endl;
+          //   delete w;
+          std::cout << "$$$$$$$$$$$$$$$$$$$$ main ended "<<std::endl;
+          return NULL;
+       }
+//             
+
 namespace creaImageIO
 {
+       
 
   bool GimmickReaderDialog(std::vector<vtkImageData*>& images,
                           const std::string i_namedescp , 
@@ -21,8 +100,7 @@ namespace creaImageIO
                           int image_out_dim,
                           int nb_threads)
   {
-
-    
+         
     creaImageIO::WxGimmickReaderDialog w(0,
                                         -1,
                                         i_namedescp,

diff --git a/src2/creaImageIOGimmickReaderDialog.h b/src2/creaImageIOGimmickReaderDialog.h
index b5a86ab27ac9f18210ad2c5fea88941112611c01..a9fdf0ab7c5f0112a9784405388d46ad4a575ad0 100644 (file)
--- a/src2/creaImageIOGimmickReaderDialog.h
+++ b/src2/creaImageIOGimmickReaderDialog.h
@@ -6,6 +6,8 @@
 #include <vector>
 
 
+CREAIMAGEIO_EXPORT vtkImageData* getImageDataDialog();
+
 namespace creaImageIO
 {
   /**

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index 4cf4cb5be6f37bab2e910cdf4b509a49f8d8e104..643ede98c41beed5424a00e555f3afc4bea898af 100644 (file)
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -209,7 +209,7 @@ namespace creaImageIO
                                                                        ""));
        if(mImageExtent==0)
        {
-               mImageExtent=ie;
+               mImageExtent=ie;                
                if((mImageExtent->Get(min_dim-1)<2)||(mImageExtent->Get(max_dim)>1))
                {
                        valid=false;
@@ -224,7 +224,7 @@ namespace creaImageIO
                }
        }
        else
-       {
+       {               
                if(mImageExtent->IsCompatible(*ie))
                {
                        if(mImageExtent->GetDimension()==max_dim && mImageExtent->Get(max_dim)>2)

diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index bdf1f6687c34e65ccc308f1042d2e6eb7a652c81..82c728d8f15d596a812c086e3b217c0a411be1ec 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -23,7 +23,7 @@ namespace creaImageIO
                                               int max_dim,
                                               int output_dim,  // never used ?!? // JPR
                                               int threads)
- :   wxDialog( parent, 
+ : wxDialog( parent, 
                  id, 
                  title,
                  pos,

diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h
index 1755be8e8e97bbb872a0d20537769ea7acaba8f3..069b6a09eb911fa57600f4b51011af191554b27a 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.h
+++ b/src2/creaImageIOWxGimmickReaderDialog.h
@@ -6,17 +6,16 @@
 #include <creaImageIOWxGimmickView.h>
 #include <creaWx.h>
 #include "wx/wx.h"
+
+
+
 namespace creaImageIO
 {
-  /**
-   * \ingroup GUI
-   */
-
-  //=====================================================================
+    //=====================================================================
  //=====================================================================
   class CREAIMAGEIO_EXPORT  WxGimmickReaderDialog : public wxDialog
   {
-  public:
+  public:      
     WxGimmickReaderDialog();
     WxGimmickReaderDialog(wxWindow *parent,
                          const wxWindowID id,