X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_ROI.h;h=7be25a76a00bd74c62ef29062661bcce5ed5c254;hb=ce0a8e0e49a805729cf3dbb4c9e1c82ee78429ce;hp=811735218d3327e982d873d71db1d301cc942dc0;hpb=6c46b5b1d02d65fdb3fdccc8174346b49a05a32f;p=clitk.git

diff --git a/common/clitkDicomRT_ROI.h b/common/clitkDicomRT_ROI.h
index 8117352..7be25a7 100644
--- a/common/clitkDicomRT_ROI.h
+++ b/common/clitkDicomRT_ROI.h
@@ -35,7 +35,7 @@ public:
   itkNewMacro(Self);
 
   void Print(std::ostream & os = std::cout) const;
-  void SetFromBinaryImage(vvImage * image, int n, 
+  void SetFromBinaryImage(vvImage::Pointer image, int n, 
         std::string name, 
         std::vector<double> color, 
         std::string filename);
@@ -56,11 +56,12 @@ public:
   double GetForegroundValueLabelImage() const;
   void SetForegroundValueLabelImage(double bg);
   
-  void SetImage(vvImage * im);
+  void SetImage(vvImage::Pointer im);
   DicomRT_Contour* GetContour(int n);
 
   // Compute a vtk mesh from the dicom contours
-  void ComputeMesh();
+  void ComputeMeshFromContour();
+  void ComputeContoursFromImage();
   
   // Indicate if the mesh is uptodate according to the dicom
   void SetDicomUptodateFlag(bool b) { m_DicomUptodateFlag = b; }
@@ -91,6 +92,7 @@ protected:
 #if GDCM_MAJOR_VERSION == 2
   gdcm::Item * mItemInfo;
   gdcm::Item * mItemContour;
+  gdcm::SmartPointer<gdcm::SequenceOfItems> mContoursSequenceOfItems;
 #endif
 
 private: