X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_Contour.h;h=78a5bfde6519030fa4393eb0247a87319bb37047;hb=29c90b5fbd7ecd5d8375e02b7a03734c4fdbc806;hp=abf069fce65a25b96a5745decbf455843247edbe;hpb=b3f649f6e833485a45e94f99bd78d1dce03b3852;p=clitk.git diff --git a/common/clitkDicomRT_Contour.h b/common/clitkDicomRT_Contour.h index abf069f..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 @@ -42,17 +42,23 @@ public: itkNewMacro(Self); void Print(std::ostream & os = std::cout) const; + #if GDCM_MAJOR_VERSION == 2 - bool Read(gdcm::Item const & item); + 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; vtkSmartPointer mData; @@ -61,6 +67,12 @@ protected: 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();