X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxGimmickReaderDialog.h;h=069b6a09eb911fa57600f4b51011af191554b27a;hb=37692ca5ea7fb8414cb70bcae0ce16e51da57568;hp=4d932214bebf7229f295268cae49481a14ead351;hpb=10480b68ab85e5e7a4ddcf56ebfc83f5870061b5;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h
index 4d93221..069b6a0 100644
--- a/src2/creaImageIOWxGimmickReaderDialog.h
+++ b/src2/creaImageIOWxGimmickReaderDialog.h
@@ -6,59 +6,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, 
+  public:	
+    WxGimmickReaderDialog();
+    WxGimmickReaderDialog(wxWindow *parent,
 			  const wxWindowID id,
+			  const std::string i_namedescp , 
+			  const std::string i_namedb ,
 			  wxString title,
-			  const wxPoint& pos, 
+			  const wxPoint& pos,
 			  const wxSize& size,
 			  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;
@@ -77,7 +77,6 @@ namespace creaImageIO
 } // EO namespace creaImageIO
 
 
-
 #endif // USE_WIDGETS
 // EOF
 #endif