images size compatible

[creaImageIO.git] / src2 / creaImageIOWxGimmickReaderDialog.cpp

diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index d223e2c77b553dc7dbc4ec498ebe701bd70cb8cf..933a72312d11b5a1a185835d6fa0a74de39dbce1 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -1,5 +1,9 @@
 #include <creaImageIOWxGimmickReaderDialog.h>
 #include <creaImageIOSystem.h>
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 
 namespace creaImageIO
 {
@@ -25,7 +29,7 @@ namespace creaImageIO
                  wxMINIMIZE_BOX | 
                  wxCAPTION  
               ),
-     mGimmick(0),
+  //  mGimmick(0),
      mView(0)
   {
     GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
@@ -34,9 +38,9 @@ namespace creaImageIO
     
     try {
       
-      mGimmick = new Gimmick();
+               mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
       mGimmick->Initialize();
-     
+    
       
       mView = new WxGimmickView(mGimmick,
                                this,
@@ -47,6 +51,9 @@ namespace creaImageIO
                                max_dim,
                                threads);
       mView->Initialize();
+          // Connect the AddProgress callback
+      mView->ConnectValidationObserver
+      ( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) );
     }
     catch (crea::Exception e)
     {
@@ -75,19 +82,21 @@ namespace creaImageIO
                        <<std::endl);
     if (mView) 
       {
-       delete mView;
+       
+               delete mView;
       }
     if (mGimmick) 
       {
-       mGimmick->Finalize();
-       delete mGimmick;
+                        mGimmick->Finalize();
+       //mGimmick->Finalize();
+//     delete mGimmick;
       }
+
   }
 
   ///Callback method on a selection
-  void WxGimmickReaderDialog::OnValid(wxCommandEvent& event)
+  void WxGimmickReaderDialog::OnValid(bool t)
   {
-         bool t=mView->ValidateSelection(event.GetClientData());
     mOkButton->Enable(t);
   }
 
@@ -95,9 +104,8 @@ namespace creaImageIO
 
  
   //================================================================
-  BEGIN_EVENT_TABLE(WxGimmickReaderDialog, wxDialog)
-       EVT_COMMAND(wxID_ANY, 0, WxGimmickReaderDialog::OnValid) 
-  END_EVENT_TABLE()
+  //BEGIN_EVENT_TABLE(WxGimmickReaderDialog, wxDialog)
+  //END_EVENT_TABLE()
   //================================================================