X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_StructureSet.h;h=c26122ee1976884fe0fa8c0ce887bc370150ef69;hb=f3457815210ffe8646f3288be3362d34fcc7c3af;hp=5761e14dc28e167bf13ae0d3e92b68c5b448cc12;hpb=957a4c21ae6aa291c6ad57a45e35c14f5c5d05bb;p=clitk.git

diff --git a/common/clitkDicomRT_StructureSet.h b/common/clitkDicomRT_StructureSet.h
index 5761e14..c26122e 100644
--- a/common/clitkDicomRT_StructureSet.h
+++ b/common/clitkDicomRT_StructureSet.h
@@ -27,8 +27,16 @@
 // vv
 #include "vvImage.h"
 
+// gdcm
+#include "clitkConfiguration.h"
+#if CLITK_USE_SYSTEM_GDCM == 1
+#include <vtkGDCMPolyDataReader.h>
+#include <vtkRTStructSetProperties.h>
+#endif
+
 // gdcm
 #if GDCM_MAJOR_VERSION == 2
+// This is not use if CLITK_USE_SYSTEM_GDCM==1
 #include "gdcmReader.h"
 #include "gdcmWriter.h"
 #include "gdcmAttribute.h"
@@ -44,8 +52,9 @@ public:
   typedef itk::SmartPointer<Self> Pointer;
   itkNewMacro(Self);
 
-  typedef std::map<int, clitk::DicomRT_ROI::Pointer>::iterator ROIIteratorType;
-  typedef std::map<int, clitk::DicomRT_ROI::Pointer>::const_iterator ROIConstIteratorType;
+  typedef std::map<int, clitk::DicomRT_ROI::Pointer> ROIMapContainer;
+  typedef ROIMapContainer::iterator ROIIteratorType;
+  typedef ROIMapContainer::const_iterator ROIConstIteratorType;
 
   void Print(std::ostream & os = std::cout) const;
   void Read(const std::string & filename);
@@ -53,7 +62,11 @@ public:
   void Write(const std::string & filename);
 
   clitk::DicomRT_ROI * GetROIFromROINumber(int n);
-  std::map<int, clitk::DicomRT_ROI::Pointer> & GetROIs() { return mROIs; }
+  clitk::DicomRT_ROI* GetROIFromROIName(const std::string& name);
+  //clitk::DicomRT_ROI* GetROIFromROINameRegEx(const std::string& regEx);
+  clitk::DicomRT_ROI* GetROIFromROINameSubstr(const std::string& s);
+  ROIMapContainer * GetROIsFromROINameSubstr(const std::string& s);
+  ROIMapContainer & GetROIs() { return mROIs; }
   const std::string & GetStudyID() const;
   const std::string & GetStudyTime() const;
   const std::string & GetStudyDate() const;