X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.h;h=a156b164fdf3d91fced2062258cadb466ab3f119;hb=b2e15b58dfa9d444764952a94e37164f2cea58c2;hp=b6e41215cea2cb081e81375640ccf53587b05911;hpb=79be5edd158476cd0f21d3146223594234ef06fc;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h
index b6e4121..a156b16 100644
--- a/src2/creaImageIOWxGimmickView.h
+++ b/src2/creaImageIOWxGimmickView.h
@@ -30,11 +30,24 @@ namespace creaImageIO
 		    wxWindow *parent, 
 		    const wxWindowID id,
 		    const wxPoint& pos, const wxSize& size,
-		    int image_type = GIMMICK_3D_IMAGE_SELECTION,
+		    int min_dim = GIMMICK_2D_IMAGE_SELECTION,
+			int max_dim = GIMMICK_3D_IMAGE_SELECTION,
 		    int number_of_threads = 0);
       /// Virtual destructor
       virtual ~WxGimmickView();
 
+	  /// Returns the selected Images so that they comply with the given parameter(<4D)
+	  ///(overloaded from GimmickView)
+	  vtkImageData* GetSelectedImage(int dim);
+	  /// Returns the selected files
+	  ///(overloaded from GimmickView)
+	  void GetSelectedFiles(std::vector<std::string>& s);
+      /// Returns the selected Images so that they comply with the given parameter(4D)
+      //(overloaded from GimmickView)
+	  void GetSelectedImages(std::vector<vtkImageData*>& s, int dim);
+	  /// Validates the selected images
+	  bool ValidateSelection(void *);
+
     protected:
       /// Creates the tool bar
       void CreateToolBar(); 
@@ -43,19 +56,51 @@ namespace creaImageIO
       /// (overloaded from GimmickView)
       void CreateTreeView( TreeHandler* );
 
+
     private:
       /// The ToolBar and the tools
       wxToolBar*         mToolBar;
       wxToolBarToolBase* mToolAddFile;
+      wxToolBarToolBase* mToolAddDir;
+      wxToolBarToolBase* mToolRemove;
+      wxToolBarToolBase* mToolAddDatabase;
+      wxToolBarToolBase* mToolHelp;
 
       wxSplitterWindow* mSplitter;
       wxPanel*          mBottomPanel;
+	  wxStaticText *    mText;
       wxNotebook*       mNotebook;
 
       /// The list of icons 
       wxImageList *    mIcon;
       void CreateIconList();
 
+      Gimmick * mGimmick;
+      /// Callback for adding files
+      void OnAddFiles(wxCommandEvent& event);
+      /// Callback for adding dir
+      void OnAddDir(wxCommandEvent& event);
+	  /// Callback for removing files
+      void OnRemove(wxCommandEvent& event);
+	
+	  /// Display a message box with the last addition statistics
+      void DisplayAddSummary();
+
+
+      /// AddProgress Gimmick callback
+      void OnAddProgress( Gimmick::AddProgress& );
+     
+      /// Progress dialog
+      wxProgressDialog* mProgressDialog;
+	  ///The selection's maximum dimension
+	  int mSelectionMaxDimension;
+	  ///The selection's minimum dimension
+	  int mSelectionMinDimension;
+
+
+      wxString mCurrentDirectory;
+
+      DECLARE_EVENT_TABLE()
    };
     // EO class WxGimmickView
     //=====================================================================