X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_Contour.h;h=389bbdd8dcb800812d6a0b391d9f6ce713b1a317;hb=refs%2Fheads%2FrtStruct;hp=91d75d6ffb411be64962f2091527a1e169428372;hpb=5b568893e14e5d955fa14f653bd176b54c6aee0c;p=clitk.git

diff --git a/common/clitkDicomRT_Contour.h b/common/clitkDicomRT_Contour.h
index 91d75d6..389bbdd 100644
--- a/common/clitkDicomRT_Contour.h
+++ b/common/clitkDicomRT_Contour.h
@@ -22,7 +22,7 @@
 
 #include "clitkCommon.h" 
 #include <gdcmFile.h>
-#if GDCM_MAJOR_VERSION == 2
+#if GDCM_MAJOR_VERSION >= 2
 #else
 #include <gdcm.h>
 #include <gdcmSQItem.h>
@@ -30,6 +30,7 @@
 #include <vtkPoints.h>
 #include <vtkPolyData.h>
 #include <vtkSmartPointer.h>
+#include <vtkMatrix4x4.h>
 
 namespace clitk {
 
@@ -43,7 +44,7 @@ public:
 
   void Print(std::ostream & os = std::cout) const;
 
-#if GDCM_MAJOR_VERSION == 2
+#if GDCM_MAJOR_VERSION >= 2
   bool Read(gdcm::Item * item);
   void UpdateDicomItem();
 #else
@@ -54,6 +55,9 @@ public:
   void SetMesh(vtkPolyData * mesh);
   vtkPoints * GetPoints() {return mData;}
   double GetZ() const {return mZ;}
+  void SetTransformMatrix(vtkMatrix4x4* matrix);
+  double GetTolerance();
+  void SetTolerance(double tol);
   
   
 protected:
@@ -64,11 +68,17 @@ protected:
   vtkSmartPointer<vtkPoints> mData;
   vtkSmartPointer<vtkPolyData> mMesh;
   vtkSmartPointer<vtkPoints> mPoints;
+  vtkSmartPointer<vtkMatrix4x4> mTransformMatrix;
   bool mMeshIsUpToDate;
   ///Z location of the contour
   double mZ;
+  double mTolerance;
   
+#if GDCM_MAJOR_VERSION >= 2
   gdcm::Item * mItem;
+#else
+  gdcm::SQItem * mItem;
+#endif
 
 private:
   DicomRT_Contour();