X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.h;h=b16fdd03f5f6c59bd6dc123fa6887dad61d43f9e;hb=da80530068246081505e9649523d10e8da8e6acd;hp=53dcf77c5e540a36f07a5baf1f71cae2e3f38a34;hpb=6b4e3e7339b74e8ed5d77b22dc6af8b2cee30a5a;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h
index 53dcf77..b16fdd0 100644
--- a/src2/creaImageIOWxGimmickView.h
+++ b/src2/creaImageIOWxGimmickView.h
@@ -34,7 +34,7 @@ namespace creaImageIO
     typedef int EventType;
     
     /// Ctor
-    WxGimmickView(Gimmick*, 
+    WxGimmickView(boost::shared_ptr<Gimmick>, 
 		  wxWindow *parent, 
 		  const wxWindowID id,
 		  const wxPoint& pos, const wxSize& size,
@@ -51,6 +51,7 @@ namespace creaImageIO
     /// Returns the selected Images so that they comply with the 
     /// given parameter(4D) (overloaded from GimmickView)
     void GetSelectedImages(std::vector<vtkImageData*>& s, int dim);
+    void GetSelectedImagesInVector(std::vector<vtkImageData*>& s, int dim);
 
     /// Returns the images indicated by the filenames in the vector 
     /// so that they comply with the given parameter(dim)
@@ -138,21 +139,28 @@ namespace creaImageIO
     wxImageList *    mIcon;
     void CreateIconList();
     
-    Gimmick * mGimmick;
+    boost::shared_ptr<Gimmick> mGimmick;
 	
 	Listener* mListener;
+
     /// Callback for adding files
     void OnAddFiles(wxCommandEvent& event);
+
     /// Callback for adding dir
     void OnAddDir(wxCommandEvent& event);
+
     /// Callback for removing files
     void OnRemove(wxCommandEvent& event);
+
 	/// Callback for synchronization
     void OnSynchronize(wxCommandEvent& event);
+
 	/// Callback for settings edition
     void OnSettings(wxCommandEvent& event);
+
 	/// Callback for settings edition
     void OnTools(wxCommandEvent& event);
+
 	/// Callback for Import/Export images
     void OnImportExport(wxCommandEvent& event);
 
@@ -192,29 +200,31 @@ namespace creaImageIO
  
     /// Progress dialog
     wxProgressDialog* mProgressDialog;
+
     ///The selection's maximum dimension
     int mSelectionMaxDimension;
+
     ///The selection's minimum dimension
     int mSelectionMinDimension;
+
     ///Image previewer
     WxViewer* mViewer;
+
     ///Currently Displayed Node
     tree::Node* mCurImageItemToShow;
+
     //Pointer holders for images to be shown
  	std::vector< boost::shared_ptr<ImagePointerHolder> > pointers;
-    
-    
+
     wxString mCurrentDirectory;
     
     DECLARE_EVENT_TABLE()
       };
   // EO class WxGimmickView
   //=====================================================================
-  
- 
- 
+
 } // EO namespace creaImageIO
 
 #endif // USE_WIDGETS
 // EOF
-#endif  
+#endif