set vectors of pointers (with many memory leak) as vectors of shared_ptr

[creaImageIO.git] / src2 / creaImageIOWxGimmickReaderDialog.h

diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h
index 9526d374e428c154acc08f203113161dfc07a8a4..8137a73b7d2af91e6e117ed32a102d0b42aad7c4 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.h
+++ b/src2/creaImageIOWxGimmickReaderDialog.h
@@ -5,28 +5,30 @@
 
 #include <creaImageIOWxGimmickView.h>
 #include <creaWx.h>
-
+#include "wx/wx.h"
 namespace creaImageIO
 {
   /**
    * \ingroup GUI
    */
+
   //=====================================================================
  //=====================================================================
-  class /*CREAIMAGEIO_EXPORT*/ WxGimmickReaderDialog : public wxDialog
+  class CREAIMAGEIO_EXPORT  WxGimmickReaderDialog : public wxDialog
   {
   public:
-    WxGimmickReaderDialog();    
-    WxGimmickReaderDialog(wxWindow *parent, 
+    WxGimmickReaderDialog();
+    WxGimmickReaderDialog(wxWindow *parent,
                          const wxWindowID id,
                          wxString title,
-                         const wxPoint& pos, 
+                         const wxPoint& pos,
                          const wxSize& size,
-                         int image_min_type = GIMMICK_2D_IMAGE_SELECTION,
-                         int image_max_type = GIMMICK_3D_IMAGE_SELECTION,
+                         int image_min_dim = GIMMICK_2D_IMAGE_SELECTION,
+                         int image_max_dim = GIMMICK_3D_IMAGE_SELECTION,
+                         int output_dim = NATIVE,
                          int threads = 0);
-    
-    Gimmick* GetGimmick() { return mGimmick; }
+
+       boost::shared_ptr<Gimmick> GetGimmick() { return mGimmick; }
     //    typedef WxGimmick ViewType;
     typedef WxGimmickView::EventType EventType;
 
@@ -36,8 +38,7 @@ namespace creaImageIO
        //===============================================================================================
        //Image Selection
        //===============================================================================================
-    vtkImageData* GetSelectedImage(int dim) 
-       { return mView->GetSelectedImage(dim); }
+
     void GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
     { mView->GetSelectedImages(s, dim); }
 
@@ -48,18 +49,19 @@ namespace creaImageIO
     void OnSelChanged(EventType& event);
     void OnContextualMenu(EventType& event);
     void OnMenuTest(wxCommandEvent& event);
-       //    void OnValid(wxCommandEvent& event);
-    //    void OnButtonOk(wxCommandEvent& event);
-    //    void OnButtonCancel(wxCommandEvent& event);
+    void OnValid(bool valid);
+    void OnExit(){ mView->StopPlayer(); }
+    // void OnButtonOk(wxCommandEvent& event);
+    // void OnButtonCancel(wxCommandEvent& event);
 
-    DECLARE_EVENT_TABLE();
   private :
     
-    Gimmick*       mGimmick;
+         boost::shared_ptr<Gimmick>      mGimmick;
     WxGimmickView* mView;
 
     wxButton* mOkButton;
     wxButton* mCancelButton;
+       
 
     enum 
       {
@@ -70,11 +72,11 @@ namespace creaImageIO
 
   }; // class WxGimmickReaderDialog
   //=====================================================================
-
-  
+       
 } // EO namespace creaImageIO
 
 
+
 #endif // USE_WIDGETS
 // EOF
 #endif