X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_Contour.h;h=78a5bfde6519030fa4393eb0247a87319bb37047;hb=d2d75b63a31a4bfbbed0c22333e34dba688e6503;hp=0484da6c3c0301517089e37874f3f30c0f46b938;hpb=573d80d0f7a17607d2ee883c21c940c0ba020282;p=clitk.git diff --git a/common/clitkDicomRT_Contour.h b/common/clitkDicomRT_Contour.h index 0484da6..78a5bfd 100644 --- a/common/clitkDicomRT_Contour.h +++ b/common/clitkDicomRT_Contour.h @@ -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();