Delete widget first, the image data after

[clitk.git] / vv / vvImageContour.h

diff --git a/vv/vvImageContour.h b/vv/vvImageContour.h
index 747ecd89fe927f233297b86f80176a6f078cbe2c..66473d37320063b456d9481c379f32e9f77d0476 100644 (file)
--- a/vv/vvImageContour.h
+++ b/vv/vvImageContour.h
@@ -34,14 +34,14 @@ 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::Pointer image);
-  void setPreserveMemoryModeEnabled(bool b);
+  void SetImage(vvImage * image);
+  void SetPreserveMemoryModeEnabled(bool b);
 
  protected:
   vvSlicer * mSlicer;
@@ -51,13 +51,13 @@ class vvImageContour
   int mPreviousTSlice;
   double mPreviousValue;
   bool mHiddenImageIsUsed;
-  vvImage::Pointer mHiddenImage;
+  vvImage * mHiddenImage;
   bool mDisplayModeIsPreserveMemory;
 
   // For preserveMemory mode
-  std::vector<vtkImageClip*> mClipperList;
-  std::vector<vtkMarchingSquares*> mSquaresList;
-  std::vector<vtkActor*> mSquaresActorList;
+  std::vector<vtkSmartPointer<vtkImageClip> > mClipperList;
+  std::vector<vtkSmartPointer<vtkMarchingSquares> > mSquaresList;
+  std::vector<vtkSmartPointer<vtkActor> > mSquaresActorList;
 
   // For fast cache mode
   int mPreviousSlice;
@@ -65,18 +65,19 @@ class vvImageContour
   std::vector<std::vector<vtkActor*> > mListOfCachedContourActors;
 
   // Functions
-  void initializeCacheMode();
-  void updateWithPreserveMemoryMode();
-  void updateWithFastCacheMode();
-  void createNewActor(vtkActor ** actor, 
+  void InitializeCacheMode();
+  void UpdateWithPreserveMemoryMode();
+  void UpdateWithFastCacheMode();
+  void CreateNewActor(vtkActor ** actor, 
                      vtkMarchingSquares ** squares, 
-                     vtkImageClip ** clipper, int numImage);
-  void updateActor(vtkActor * actor, 
+                      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();
+  void CreateActor(int orientation, int slice);
+  int ComputeCurrentOrientation();
   
 }; // end class vvImageContour
 //------------------------------------------------------------------------------