X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.h;h=40871cc86725f24cefa18b9d10286764827e079d;hb=3a22e19184c369b130d4caa992a8e98e50c7a0ee;hp=b710bca54d2fe762b82e1fd69901276e1b70ad38;hpb=e13ea6551e8721b11998dc33ddccf3f89458f173;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h
index b710bca..40871cc 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)
@@ -69,9 +70,9 @@ namespace creaImageIO
     ///Resets the default image
     void ClearSelection();
 	///Copies selected files
-	void CopyFiles(const std::vector<std::string>& filenames);
+    void CopyFiles(const std::vector<std::string>& filenames);
 	///Add selected files to the Database
-	void AddDir(std::string dirName);
+    void AddDir(std::string dirName);
     
     
     ///Sends a request to read the currently selected node and the ones that surround it.
@@ -114,6 +115,8 @@ namespace creaImageIO
     
     
   private:
+	  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)
@@ -138,21 +141,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);
 
@@ -176,9 +186,13 @@ namespace creaImageIO
     
     /// AddProgress Gimmick callback
     void OnAddProgress( Gimmick::AddProgress& );
+
+#if defined(WIN32)
     /// Called upon to refresh the viewer once there are no actions to be done
     void OnInternalIdle();
-
+#else
+	void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
+#endif
 	/// callback to add a database
 	void OnAddDB(wxCommandEvent& event);
     
@@ -189,32 +203,40 @@ namespace creaImageIO
 
 	///Edits the fields of a given node
 	void CreateEditFieldsDialog(tree::Node* node, std::vector<std::string> names, std::vector<std::string> keys);
+
+	/// Display all Dicom Tags
+	void DumpTags(const std::string i_filename);
+ 
+	/// Export from Storage to Storage
+	void ExportToStorage(const std::vector<std::string> i_filenames);
  
     /// 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<ImagePointerHolder*> pointers;
-    
-    
+ 	std::vector< boost::shared_ptr<ImagePointerHolder> > pointers;
+
     wxString mCurrentDirectory;
     
     DECLARE_EVENT_TABLE()
       };
   // EO class WxGimmickView
   //=====================================================================
-  
- 
- 
+
 } // EO namespace creaImageIO
 
 #endif // USE_WIDGETS
 // EOF
-#endif  
+#endif