*** empty log message ***

[creaImageIO.git] / src2 / creaImageIOWxGimmickReaderDialog.cpp

diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index 6c311fbb95bea391f79f1740db0c01707305c579..b2e38b5cb4e530942917329eb18bb1df080fcc51 100644 (file)
--- 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,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,
@@ -78,12 +84,13 @@ namespace creaImageIO
                        <<std::endl);
     if (mView) 
       {
-       delete mView;
+       
+               delete mView;
       }
     if (mGimmick) 
       {
        mGimmick->Finalize();
-       delete mGimmick;
+       //delete mGimmick;
       }
   }
 
@@ -92,9 +99,6 @@ namespace creaImageIO
   {
     mOkButton->Enable(t);
   }
-
-
-
  
   //================================================================
   //BEGIN_EVENT_TABLE(WxGimmickReaderDialog, wxDialog)