X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickView.h;h=34d605faa80444ba1eae913a3dda36e4a1606d19;hb=b124b45664473a3ad32c1c8cf680cc3355e4dbd2;hp=e472420bcd3a1e3758894714112d3cbcc363d0e8;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmickView.h b/src/creaImageIOWxGimmickView.h
index e472420..34d605f 100644
--- a/src/creaImageIOWxGimmickView.h
+++ b/src/creaImageIOWxGimmickView.h
@@ -56,7 +56,7 @@ namespace creaImageIO
   //=====================================================================
   /// Concrete derivative of GimmickView which implements a wxWidgets-based view
 
-  class WxGimmickView : public wxPanel, virtual public GimmickView
+  class CREAIMAGEIO_EXPORT WxGimmickView : public wxPanel, virtual public GimmickView
   {
   public:
     
@@ -79,7 +79,7 @@ namespace creaImageIO
     void GetSelectedFiles(std::vector<std::string>& s);
     
 	 /// Returns the selected files in output structure
-	void getSelectedFiles(std::vector<OutStrGimmick> &outG, std::vector< std::string> out_infos, bool mult = false, const std::string out_model = "");
+	void getSelectedFiles(std::vector<OutStrGimmick> &outG, std::vector< std::string> out_infos, std::vector<std::string> &outFileNames, bool mult = false, const std::string out_model = "");
 
     /// Returns the selected Images so that they comply with the 
     /// given parameter(4D) (overloaded from GimmickView)
@@ -142,7 +142,7 @@ namespace creaImageIO
 
   protected:
     /// Creates the tool bar
-    void CreateToolBar(); 
+    void CreateToolBar( ); 
     
     /// Create the tree view for TreeHandler provided 
     /// (overloaded from GimmickView)
@@ -150,35 +150,38 @@ namespace creaImageIO
     
     
   private:
-	  wxBoxSizer *mbottom_sizer;
-	  wxBoxSizer	*msizer;
+	wxBoxSizer 			*mbottom_sizer;
+	wxBoxSizer			*msizer;
     /// Is set to true at the end of constructor 
     /// (in order to lock callbacks from threaded objects or event 
     /// before everything is ok)
-    bool mConstructed;
+    bool 				mConstructed;
     /// The ToolBar and the tools
-    wxToolBar*         mToolBar;
-    wxToolBarToolBase* mToolAddFile;
-    wxToolBarToolBase* mToolAddDir;
-    wxToolBarToolBase* mToolRemove;
-    wxToolBarToolBase* mToolAddDatabase;
-    wxToolBarToolBase* mToolHelp;
-	wxToolBarToolBase* mToolSynchronize;
-	wxToolBarToolBase* mToolSettings;
-	wxToolBarToolBase* mToolTools;
+//    wxToolBar			*mToolBar;
+    wxPanel             *mToolBar;
+    wxToolBarToolBase	*mToolAddFile;
+    wxToolBarToolBase	*mToolAddDir;
+    wxToolBarToolBase	*mToolRemove;
+    wxToolBarToolBase	*mToolAddDatabase;
+    wxToolBarToolBase	*mToolHelp;
+	wxToolBarToolBase	*mToolSynchronize;
+	wxToolBarToolBase	*mToolSettings;
+	wxToolBarToolBase	*mToolTools;
     
-    wxSplitterWindow* mSplitter;
-    wxPanel*          mBottomPanel;
-    wxStaticText *    mText;
-    wxNotebook*       mNotebook;
+    wxSplitterWindow	*mSplitter;
+    wxPanel				*mBottomPanel;
+    wxStaticText 		*mText;
+    wxNotebook			*mNotebook;
     
     /// The list of icons 
-    wxImageList *    mIcon;
+    wxImageList 		*mIcon;
     void CreateIconList();
+    void AddBtnTool(wxPanel *panel, wxBoxSizer *sizerH, int id, wxString label, int idBitmap, wxString tooltip );
+
     
     boost::shared_ptr<Gimmick> mGimmick;
 		
-	Listener* mListener;
+	Listener			*mListener;
 
     /// Callback for adding files
     void OnAddFiles(wxCommandEvent& event);
@@ -247,7 +250,7 @@ namespace creaImageIO
 	void ExportToStorage(const std::vector<std::string> i_filenames);
  
     /// Progress dialog
-    wxProgressDialog* mProgressDialog;
+    wxProgressDialog	*mProgressDialog;
 
     ///The selection's maximum dimension
     int mSelectionMaxDimension;
@@ -256,10 +259,10 @@ namespace creaImageIO
     int mSelectionMinDimension;
 
     ///Image previewer
-    WxViewer* mViewer;
+    WxViewer			*mViewer;
 
     ///Currently Displayed Node
-    tree::Node* mCurImageItemToShow;
+    tree::Node			*mCurImageItemToShow;
 
     //Pointer holders for images to be shown
  	std::vector< boost::shared_ptr<ImagePointerHolder> > pointers;