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

diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index fe84eff..b2e38b5 100644
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -1,18 +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, 
@@ -26,7 +31,7 @@ namespace creaImageIO
 		  wxMINIMIZE_BOX | 
 		  wxCAPTION  
 	       ),
-    mGimmick(0),
+  //  mGimmick(0),
      mView(0)
   {
     GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
@@ -35,8 +40,8 @@ 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,
@@ -79,14 +84,14 @@ namespace creaImageIO
 			<<std::endl);
     if (mView) 
       {
+	
 		delete mView;
       }
     if (mGimmick) 
       {
 	mGimmick->Finalize();
-	delete mGimmick;
+	//delete mGimmick;
       }
-
   }
 
   ///Callback method on a selection
@@ -94,9 +99,6 @@ namespace creaImageIO
   {
     mOkButton->Enable(t);
   }
-
-
-
  
   //================================================================
   //BEGIN_EVENT_TABLE(WxGimmickReaderDialog, wxDialog)