X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxViewer.h;h=b807f7cc68aba7b9d74809cf7c717e4263eb7325;hb=8392c8e1b57464fe92e6280b88f69cabfbac58cf;hp=e64704af6c579c452e69aee775bb3483b560fe91;hpb=88745f8677503fa747963f8cd78c52f4b3deb35e;p=creaImageIO.git

diff --git a/src2/creaImageIOWxViewer.h b/src2/creaImageIOWxViewer.h
index e64704a..b807f7c 100644
--- a/src2/creaImageIOWxViewer.h
+++ b/src2/creaImageIOWxViewer.h
@@ -26,7 +26,7 @@ namespace creaImageIO
   {
  
   public:
-    /// Ctor 
+    /// Ctors 
     WxViewer();
     WxViewer(wxWindow *parent, 
 		   const wxWindowID id,
@@ -35,46 +35,63 @@ namespace creaImageIO
 		   const wxSize& size);
     /// Dtor
     virtual ~WxViewer();
-    /// 
+    /// Shows the next image in the image vector
     void ShowNextImage();
-
+	///Starts the image player
 	void StartPlayer();
-
+	///Stops the image player
     void StopPlayer();
-
+	///Refreshes the interface if the current image shown has changed
     bool RefreshIfNecessary();
+	///Sets a new image vector to be read
+	void SetImageVector(std::vector<boost::shared_ptr<ImagePointerHolder> > &pointers);
 
-	void SetImageVector(std::vector<ImagePointerHolder*>& pointers);
-  
+	/// Set value of slider control
+	void SetValue();
 
   private:
-   ///Shows the image passed as parameter
-    void ShowImage(vtkImageData* im);
 
+    /// Event to resume or start cine loop
+	void OnCineLoop(wxCommandEvent &Event);
+
+	/// Event to change displayed frames with slide control
+	void OnSlide(wxCommandEvent &Event);
+
+
+    ///Shows the image passed as parameter
+    void ShowImage(vtkImageData* im);
     /// Previewer
     vtkImageViewer2* mViewer;
+
+	///Slider
+	wxSlider *mslide ;
+
+	///CheckBox to cine loop
+	wxCheckBox  *mcheck;
+
     /// Associated wxvtk interactor
     crea::creawxVTKRenderWindowInteractor  *mInteractor;
-    
+	
     /// Current extent 
     int mx1,mx2,my1,my2,mz1,mz2;
     /// Current spacing
     double mspx,mspy,mspz;
-
-    /// 
+    /// Current image shown
     int mCurrent;
     ///The threaded movie player
     WxViewerPlayer* mPlayer;
-
     /// The mutex
     wxMutex mMutex;
-
-    /// 
+    /// Boolean that declares if the player needs to be refreshed
     bool mNeedRefresh;
-
-	
+	///Last image shown
     vtkImageData* mLastImageShown;
-	std::vector<ImagePointerHolder*> imagePointers;
+	///The vectors of images to be shown
+	std::vector< boost::shared_ptr<ImagePointerHolder> > imagePointers;
+
+	/// Sizers to preview images 
+	wxFlexGridSizer *mflexSizer;
+	wxBoxSizer *mtopSizer;
 
   };