X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickReaderDialog.h;h=4b3e6b663cec6ba2aef2c2a11e0b0a2c1426f869;hb=a56d83cfd745de68ef8ec4250c9ef6f9fe3ab776;hp=9526d374e428c154acc08f203113161dfc07a8a4;hpb=633701590bade8ba6d0f8c7b37c033596b4b2c2a;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h
index 9526d37..4b3e6b6 100644
--- a/src2/creaImageIOWxGimmickReaderDialog.h
+++ b/src2/creaImageIOWxGimmickReaderDialog.h
@@ -5,57 +5,59 @@
 
 #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;
 
     ~WxGimmickReaderDialog();
 
-
 	//===============================================================================================
 	//Image Selection
 	//===============================================================================================
-    vtkImageData* GetSelectedImage(int dim) 
-	{ return mView->GetSelectedImage(dim); }
+
     void GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
     { mView->GetSelectedImages(s, dim); }
 
+    void GetSelectedImagesInVector(std::vector<vtkImageData*>& s, int dim)
+    { mView->GetSelectedImagesInVector(s, dim); }
 
     void GetSelectedFiles(std::vector<std::string>& s) 
     { mView->GetSelectedFiles(s); }
-    
+
     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;
@@ -70,11 +72,11 @@ namespace creaImageIO
 
   }; // class WxGimmickReaderDialog
   //=====================================================================
-
-  
+	
 } // EO namespace creaImageIO
 
 
+
 #endif // USE_WIDGETS
 // EOF
 #endif