Add RemoveActors

diff --git a/vv/vvBinaryImageOverlayActor.cxx b/vv/vvBinaryImageOverlayActor.cxx
index 612d9c01211cdfa66cd98bb5a8399b5cd547ce16..4f2e961995f4e85655ea55244a769612769d56a7 100644 (file)
--- a/vv/vvBinaryImageOverlayActor.cxx
+++ b/vv/vvBinaryImageOverlayActor.cxx
@@ -49,9 +49,25 @@ vvBinaryImageOverlayActor::vvBinaryImageOverlayActor()
 
 //------------------------------------------------------------------------------
 vvBinaryImageOverlayActor::~vvBinaryImageOverlayActor()
+{
+  mImageActorList.clear();
+}
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+void vvBinaryImageOverlayActor::RemoveActors()
 {
   for (unsigned int i = 0; i < mImageActorList.size(); i++) {
-    mSlicer->GetRenderer()->RemoveActor(mImageActorList[i]);
+    if (mSlicer != 0) {
+      if (mSlicer != NULL) {
+        if (mSlicer->GetRenderer() != 0) {
+          if (mImageActorList[i] != 0)  {
+            mSlicer->GetRenderer()->RemoveActor(mImageActorList[i]);
+          }
+        }
+      }
+    }
   }
 }
 //------------------------------------------------------------------------------
@@ -173,7 +189,7 @@ void vvBinaryImageOverlayActor::SetOpacity(double d)
 
 
 //------------------------------------------------------------------------------
-void vvBinaryImageOverlayActor::SetImage(vvImage * image, double bg, bool modeBG)
+void vvBinaryImageOverlayActor::SetImage(vvImage::Pointer image, double bg, bool modeBG)
 {
   mImage = image;
   if (modeBG) {

diff --git a/vv/vvBinaryImageOverlayActor.h b/vv/vvBinaryImageOverlayActor.h
index 4437ec1109c0cce6d40729979df87560378ea5fe..9559bc78a0bd1e8952cfcd38df74198cc4440031 100644 (file)
--- a/vv/vvBinaryImageOverlayActor.h
+++ b/vv/vvBinaryImageOverlayActor.h
@@ -40,7 +40,7 @@ class vvBinaryImageOverlayActor : public itk::LightObject
   void SetSlicer(vvSlicer * slicer);
   void SetColor(double r, double g, double b);
   void SetOpacity(double d);
-  void SetImage(vvImage * image, double bg, bool modeBG=true);
+  void SetImage(vvImage::Pointer image, double bg, bool modeBG=true);
   void SetDepth(double d) { mDepth = d; }
   void Initialize(bool IsVisible=true);
   void UpdateColor();
@@ -55,7 +55,7 @@ class vvBinaryImageOverlayActor : public itk::LightObject
   int mTSlice;
   int mPreviousTSlice;
   int mPreviousSlice;
-  vvImage * mImage;
+  vvImage::Pointer mImage;
   std::vector<double> mColor;
   double mAlpha;
   double mBackgroundValue;