X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickReaderDialog.cpp;h=b2e38b5cb4e530942917329eb18bb1df080fcc51;hb=b818afb24157d3474ecb598a98d92667745a6aa3;hp=44543b38408c4039cd122b9892e9d6989910414c;hpb=479c2e4dff23a83d55d78a3f6f4887c85e88bf3b;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index 44543b3..b2e38b5 100644
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -1,17 +1,23 @@
 #include <creaImageIOWxGimmickReaderDialog.h>
 #include <creaImageIOSystem.h>
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 
 namespace creaImageIO
 {
   // CTor
   WxGimmickReaderDialog::WxGimmickReaderDialog(wxWindow *parent, 
 					       wxWindowID id,
+						   const std::string i_namedescp , 
+						   const std::string i_namedb ,
 					       wxString title,
 					       const wxPoint& pos,
 					       const wxSize& size,
-					       int min_dim,
-						   int max_dim,
-						   int output_dim,
+						   int min_dim,
+					       int max_dim,
+					       int output_dim,
 					       int threads)
  :   wxDialog( parent, 
 		  id, 
@@ -25,7 +31,7 @@ namespace creaImageIO
 		  wxMINIMIZE_BOX | 
 		  wxCAPTION  
 	       ),
-     mGimmick(0),
+  //  mGimmick(0),
      mView(0)
   {
     GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
@@ -34,9 +40,9 @@ namespace creaImageIO
     
     try {
       
-      mGimmick = new Gimmick();
-      mGimmick->Initialize();
-     
+		mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
+      mGimmick->Initialize(i_namedescp,i_namedb);
+    
       
       mView = new WxGimmickView(mGimmick,
 				this,
@@ -47,6 +53,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,31 +84,25 @@ namespace creaImageIO
 			<<std::endl);
     if (mView) 
       {
-	delete mView;
+	
+		delete mView;
       }
     if (mGimmick) 
       {
 	mGimmick->Finalize();
-	delete mGimmick;
+	//delete mGimmick;
       }
   }
 
   ///Callback method on a selection
-  void WxGimmickReaderDialog::OnValid(wxCommandEvent& event)
+  void WxGimmickReaderDialog::OnValid(bool t)
   {
-    mView->SetMessage(event.GetString());
-    if (event.GetInt()==0)
-      {mOkButton->Enable(true);}
-    else
-      {mOkButton->Enable(false);}
+    mOkButton->Enable(t);
   }
-
-
-  
+ 
   //================================================================
-  BEGIN_EVENT_TABLE(WxGimmickReaderDialog, wxDialog)
-	EVT_COMMAND(wxID_ANY, 0, WxGimmickReaderDialog::OnValid) 
-  END_EVENT_TABLE()
+  //BEGIN_EVENT_TABLE(WxGimmickReaderDialog, wxDialog)
+  //END_EVENT_TABLE()
   //================================================================