X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_StructureSet.h;h=dff4d75276aa3196dca59941661007f7da497733;hb=7d4e77191e55f668f316ba3ddf0fddb63e59bd25;hp=145e0a0f324d95bd986d604fa21eba7e0fa271b0;hpb=fddfefca695764eac5d921342d1f764a6465cbde;p=clitk.git diff --git a/common/clitkDicomRT_StructureSet.h b/common/clitkDicomRT_StructureSet.h index 145e0a0..dff4d75 100644 --- a/common/clitkDicomRT_StructureSet.h +++ b/common/clitkDicomRT_StructureSet.h @@ -24,6 +24,9 @@ #include "clitkCommon.h" #include "clitkDicomRT_ROI.h" +//vtk +#include "vtkMatrix4x4.h" + // vv #include "vvImage.h" @@ -35,7 +38,8 @@ #endif // gdcm -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 +// This is not use if CLITK_USE_SYSTEM_GDCM==1 #include "gdcmReader.h" #include "gdcmWriter.h" #include "gdcmAttribute.h" @@ -57,6 +61,7 @@ public: void Print(std::ostream & os = std::cout) const; void Read(const std::string & filename); + void SetTransformMatrix(vtkMatrix4x4* matrix); bool IsDicomRTStruct(const std::string & filename); void Write(const std::string & filename); @@ -76,7 +81,7 @@ public: int AddBinaryImageAsNewROI(vvImage * i, std::string name); -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 // Static static int ReadROINumber(const gdcm::Item & item); #endif @@ -89,10 +94,11 @@ protected: std::string mName; std::string mDate; std::string mTime; + vtkSmartPointer mTransformMatrix; std::map mROIs; std::map mMapOfROIName; -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 gdcm::Reader * mReader; gdcm::SmartPointer mROIInfoSequenceOfItems; gdcm::SmartPointer mROIContoursSequenceOfItems;