X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vv%2FvvImageContour.h;h=66473d37320063b456d9481c379f32e9f77d0476;hb=526a19406ee0edf8f062a9ec3c0c6255e33979c8;hp=5b16d3541387385fa91e20eaf49716095def2bed;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git

diff --git a/vv/vvImageContour.h b/vv/vvImageContour.h
index 5b16d35..66473d3 100644
--- a/vv/vvImageContour.h
+++ b/vv/vvImageContour.h
@@ -17,11 +17,14 @@
 ======================================================================-====*/
 #ifndef VVIMAGECONTOUR_H
 #define VVIMAGECONTOUR_H
+
 #include "clitkCommon.h"
 #include "vvSlicer.h"
+
 class vtkImageClip;
 class vtkMarchingSquares;
 class vtkActor;
+class vvImage;
 
 //------------------------------------------------------------------------------
 class vvImageContour
@@ -31,22 +34,51 @@ class vvImageContour
   vvImageContour();
   ~vvImageContour();
 
-  void setSlicer(vvSlicer * slicer);
-  void update(double value);
-  void hideActors();
-  void showActors();
-  void setColor(double r, double g, double b);
+  void SetSlicer(vvSlicer * slicer);
+  void Update(double value);
+  void HideActors();
+  void ShowActors();
+  void SetColor(double r, double g, double b);
+  void SetLineWidth(double w);
+  void SetImage(vvImage * image);
+  void SetPreserveMemoryModeEnabled(bool b);
 
  protected:
   vvSlicer * mSlicer;
   int mSlice;
   int mTSlice;
   double mValue;
+  int mPreviousTSlice;
+  double mPreviousValue;
+  bool mHiddenImageIsUsed;
+  vvImage * mHiddenImage;
+  bool mDisplayModeIsPreserveMemory;
+
+  // For preserveMemory mode
+  std::vector<vtkSmartPointer<vtkImageClip> > mClipperList;
+  std::vector<vtkSmartPointer<vtkMarchingSquares> > mSquaresList;
+  std::vector<vtkSmartPointer<vtkActor> > mSquaresActorList;
 
-  std::vector<vtkImageClip*> mClipperList;
-  std::vector<vtkMarchingSquares*> mSquaresList;
-  std::vector<vtkActor*> mSquaresActorList;
+  // For fast cache mode
+  int mPreviousSlice;
+  int mPreviousOrientation;
+  std::vector<std::vector<vtkActor*> > mListOfCachedContourActors;
 
+  // Functions
+  void InitializeCacheMode();
+  void UpdateWithPreserveMemoryMode();
+  void UpdateWithFastCacheMode();
+  void CreateNewActor(vtkActor ** actor, 
+		      vtkMarchingSquares ** squares, 
+                      vtkImageClip ** clipper, 
+                      int numImage);
+  void UpdateActor(vtkActor * actor, 
+		   vtkMarchingSquares * squares,
+		   vtkImageClip * clipper, 
+		   double threshold, int orientation, int slice);
+  void CreateActor(int orientation, int slice);
+  int ComputeCurrentOrientation();
+  
 }; // end class vvImageContour
 //------------------------------------------------------------------------------