X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_Contour.h;h=ab6db0d27d37565f99dc4dacb6db80e3b04a9948;hb=d55f025b18f68066a52b8f33c2dc6481e82c2580;hp=88100f4f9ee213d40ce2c7d869c4251fdac77e14;hpb=c93a32f96e61514b8b945d515ffcf11c2a12ae66;p=clitk.git

diff --git a/common/clitkDicomRT_Contour.h b/common/clitkDicomRT_Contour.h
index 88100f4..ab6db0d 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,16 @@
 #define CLITKDICOMRT_CONTOUR_H
 
 #include "clitkCommon.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>
+#include <vtkMatrix4x4.h>
 
 namespace clitk {
 
@@ -38,21 +43,39 @@ 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;}
+  void SetTransformMatrix(vtkMatrix4x4* matrix);
+  
   
 protected:
-  void ComputeMesh();
+  void ComputeMeshFromDataPoints();
+  void ComputeDataPointsFromMesh();
   unsigned int mNbOfPoints;
   std::string mType;
   vtkSmartPointer<vtkPoints> mData;
   vtkSmartPointer<vtkPolyData> mMesh;
   vtkSmartPointer<vtkPoints> mPoints;
+  vtkSmartPointer<vtkMatrix4x4> mTransformMatrix;
   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();