More vtkSmartPointer

[clitk.git] / vv / vvToolStructureSetManager.h

diff --git a/vv/vvToolStructureSetManager.h b/vv/vvToolStructureSetManager.h
index 4d4cf505e4dd405d3574a36ee0f353b434ec5477..7ccb50f89d7ad1de34f43def7af1f677c00245d9 100644 (file)
--- a/vv/vvToolStructureSetManager.h
+++ b/vv/vvToolStructureSetManager.h
@@ -47,7 +47,7 @@ class vvToolStructureSetManager:
   void AddRoiInTreeWidget(clitk::DicomRT_ROI * roi, QTreeWidget * w);
 
   static vvToolStructureSetManager * AddImage(vvSlicerManager * m, std::string name, vvImage::Pointer image, double BG, bool modeBG=true);    
-  void AddImage(vvImage::Pointer image, std::string filename, double BG, bool modeBG=true);
+  void AddImage(vvImage * image, std::string filename, double BG, bool modeBG=true);
   void UpdateImage();
 
 public slots:
@@ -67,21 +67,22 @@ public slots:
 
 protected:
   Ui::vvToolStructureSetManager ui;
-  clitk::DicomRT_StructureSet * mCurrentStructureSet;
+  clitk::DicomRT_StructureSet* mCurrentStructureSet;
   vvStructureSetActor * mCurrentStructureSetActor;
   int mCurrentStructureSetIndex;
-  clitk::DicomRT_ROI * mCurrentROI;
+  clitk::DicomRT_ROI::Pointer mCurrentROI;
   vvROIActor * mCurrentROIActor;
-  vtkLookupTable * mDefaultLUTColor;
+  vtkSmartPointer<vtkLookupTable> mDefaultLUTColor;
   bool mIsAllVisibleEnabled;
   int mNumberOfVisibleROI;
   int mNumberOfVisibleContourROI;
-  std::vector<clitk::DicomRT_StructureSet*>        mStructureSetsList;
+  std::vector<clitk::DicomRT_StructureSet::Pointer >       mStructureSetsList;
   std::vector<vvStructureSetActor *>               mStructureSetActorsList;
   std::map<int, QTreeWidgetItem *>                 mMapStructureSetIndexToTreeWidget;
-  std::map<clitk::DicomRT_ROI*, QTreeWidgetItem *> mMapROIToTreeWidget;
-  std::map<QTreeWidgetItem *, clitk::DicomRT_ROI*> mMapTreeWidgetToROI;
+  std::map<clitk::DicomRT_ROI::Pointer, QTreeWidgetItem *> mMapROIToTreeWidget;
+  std::map<QTreeWidgetItem *, clitk::DicomRT_ROI::Pointer> mMapTreeWidgetToROI;
   std::vector<int> mLoadedROIIndex;
+  std::vector<vvImage::Pointer> mOpenedBinaryImage;
  
   void setCurrentSelectedROI(clitk::DicomRT_ROI * roi);
   void UpdateAllROIStatus();