X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_ROI.h;h=0fb30768cae840c65d79046711017bd779b5d462;hb=efd0988e42a0a892cf2df9de90214c8ab3a6537d;hp=d69ec1e9461100f161e3efaed1e05a5374797149;hpb=b9db5886a4d8e50a6940d7ceea622de32cfb230a;p=clitk.git

diff --git a/common/clitkDicomRT_ROI.h b/common/clitkDicomRT_ROI.h
index d69ec1e..0fb3076 100644
--- a/common/clitkDicomRT_ROI.h
+++ b/common/clitkDicomRT_ROI.h
@@ -4,7 +4,7 @@
 
   Authors belongs to: 
   - University of LYON           http://www.universite-lyon.fr/
-  - Léon Bérard cancer center    http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center    http://www.centreleonberard.fr
   - CREATIS CNRS laboratory      http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -35,7 +35,11 @@ public:
   itkNewMacro(Self);
 
   void Print(std::ostream & os = std::cout) const;
+#if GDCM_MAJOR_VERSION == 2
+  void Read(std::map<int, std::string> & rois, gdcm::Item const & item);
+#else
   void Read(std::map<int, std::string> & rois, gdcm::SQItem * item);
+#endif
   void SetFromBinaryImage(vvImage * image, int n, 
         std::string name, 
         std::vector<double> color, 
@@ -60,7 +64,7 @@ public:
   void SetImage(vvImage * im);
   DicomRT_Contour* GetContour(int n);
 
-  double GetContourSpacing() const {return mZDelta;}
+  // double GetContourSpacing() const {return mZDelta;}
   
 protected:
   void ComputeMesh();
@@ -69,13 +73,13 @@ protected:
   int mNumber;
   std::vector<double> mColor;
   std::vector<DicomRT_Contour::Pointer> mListOfContours;
-  vtkPolyData * mMesh;
+  vtkSmartPointer<vtkPolyData> mMesh;
   bool mMeshIsUpToDate;
   vvImage::Pointer mImage;
   double mBackgroundValue;
   double mForegroundValue;
   ///Spacing between two contours
-  double mZDelta;
+  // double mZDelta;
 
 private:
   DicomRT_ROI();