X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_Contour.h;h=78a5bfde6519030fa4393eb0247a87319bb37047;hb=323952cc3c1cc5d0e4f21dd9ac74736207cc544a;hp=8596702eeb84edb2f3e086601b968c3e23cc1449;hpb=b9db5886a4d8e50a6940d7ceea622de32cfb230a;p=clitk.git

diff --git a/common/clitkDicomRT_Contour.h b/common/clitkDicomRT_Contour.h
index 8596702..78a5bfd 100644
--- a/common/clitkDicomRT_Contour.h
+++ b/common/clitkDicomRT_Contour.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
@@ -21,11 +21,15 @@
 #define CLITKDICOMRT_CONTOUR_H
 
 #include "clitkCommon.h" 
-#include "clitkDicomRT_Contour.h"
+#include <gdcmFile.h>
+#if GDCM_MAJOR_VERSION == 2
+#else
 #include <gdcm.h>
 #include <gdcmSQItem.h>
+#endif
 #include <vtkPoints.h>
 #include <vtkPolyData.h>
+#include <vtkSmartPointer.h>
 
 namespace clitk {
 
@@ -38,20 +42,37 @@ public:
   itkNewMacro(Self);
 
   void Print(std::ostream & os = std::cout) const;
+
+#if GDCM_MAJOR_VERSION == 2
+  bool Read(gdcm::Item * item);
+  void UpdateDicomItem();
+#else
   bool Read(gdcm::SQItem * item);
+#endif
+
   vtkPolyData * GetMesh();
+  void SetMesh(vtkPolyData * mesh);
   vtkPoints * GetPoints() {return mData;}
   double GetZ() const {return mZ;}
   
+  
 protected:
-  void ComputeMesh();
+  void ComputeMeshFromDataPoints();
+  void ComputeDataPointsFromMesh();
   unsigned int mNbOfPoints;
   std::string mType;
-  vtkPoints * mData;
-  vtkPolyData * mMesh;
+  vtkSmartPointer<vtkPoints> mData;
+  vtkSmartPointer<vtkPolyData> mMesh;
+  vtkSmartPointer<vtkPoints> mPoints;
   bool mMeshIsUpToDate;
   ///Z location of the contour
   double mZ;
+  
+#if GDCM_MAJOR_VERSION == 2
+  gdcm::Item * mItem;
+#else
+  gdcm::SQItem * mItem;
+#endif
 
 private:
   DicomRT_Contour();