Cleaned the viewer and deactivated color function

[creaImageIO.git] / src2 / creaImageIOWxViewer.h

diff --git a/src2/creaImageIOWxViewer.h b/src2/creaImageIOWxViewer.h
index aa0079c320e7ebe202f0cf22a61928c5c99ac982..e64704af6c579c452e69aee775bb3483b560fe91 100644 (file)
--- a/src2/creaImageIOWxViewer.h
+++ b/src2/creaImageIOWxViewer.h
@@ -10,6 +10,7 @@
 #include <wx/splitter.h>
 
 #include <creaImageIOSystem.h>
+#include <creaImageIOImagePointerHolder.h>
 
 // For image preview 
 // vtk and wxvtk classes
@@ -23,9 +24,8 @@ namespace creaImageIO
 
   class WxViewer : public wxPanel
   {
-
+ 
   public:
-    //   friend class ThreadedMovie;
     /// Ctor 
     WxViewer();
     WxViewer(wxWindow *parent, 
@@ -35,25 +35,18 @@ namespace creaImageIO
                   const wxSize& size);
     /// Dtor
     virtual ~WxViewer();
-    ///Shows the image in the vector as a movie
-    //void ShowImages();
-    /// Sets the movie size
-    void SetMovieSize(unsigned int);
-    ///Sets the ith image of the movie
-    void SetImage(int i, vtkImageData* im);
-    ///Clears the selection of images
-    //  void ClearImages();
-    ///Returns true if the image vector is empty
-    bool ImagesEmpty();
     /// 
     void ShowNextImage();
-    
-    void OnInternalIdle();
+
+       void StartPlayer();
 
     void StopPlayer();
 
     bool RefreshIfNecessary();
 
+       void SetImageVector(std::vector<ImagePointerHolder*>& pointers);
+  
+
   private:
    ///Shows the image passed as parameter
     void ShowImage(vtkImageData* im);
@@ -68,8 +61,6 @@ namespace creaImageIO
     /// Current spacing
     double mspx,mspy,mspz;
 
-    /// The vector of images to show
-    std::vector<vtkImageData*> images;
     /// 
     int mCurrent;
     ///The threaded movie player
@@ -80,7 +71,10 @@ namespace creaImageIO
 
     /// 
     bool mNeedRefresh;
+
+       
     vtkImageData* mLastImageShown;
+       std::vector<ImagePointerHolder*> imagePointers;
 
   };