Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / common / clitkDicomRT_StructureSet.h

diff --git a/common/clitkDicomRT_StructureSet.h b/common/clitkDicomRT_StructureSet.h
index 541a91c5d0a6a362e5dcec8df9aba8fc7acb44fc..3dbb8a6bbb02103c4efed5dc81933b2619aa9f6e 100644 (file)
--- a/common/clitkDicomRT_StructureSet.h
+++ b/common/clitkDicomRT_StructureSet.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
@@ -26,42 +26,46 @@
 
 namespace clitk {
 
-  //--------------------------------------------------------------------
-  class DicomRT_StructureSet {
-    
-  public:
-    DicomRT_StructureSet();
-    ~DicomRT_StructureSet();
+//--------------------------------------------------------------------
+class DicomRT_StructureSet : public itk::LightObject{
+  
+public:
+  typedef DicomRT_StructureSet Self;
+  typedef itk::SmartPointer<Self> Pointer;
+  itkNewMacro(Self);
 
-    void Print(std::ostream & os = std::cout) const;
-    void Read(const std::string & filename);
+  void Print(std::ostream & os = std::cout) const;
+  void Read(const std::string & filename);
 
-    const std::vector<clitk::DicomRT_ROI*> & GetListOfROI() const;
-    clitk::DicomRT_ROI * GetROI(int n);
-    const std::string & GetStudyID() const;
-    const std::string & GetStudyTime() const;
-    const std::string & GetStudyDate() const;
-    const std::string & GetLabel() const;
-    const std::string & GetName() const;
-    const std::string & GetDate() const;
-    const std::string & GetTime() const;
+  const std::vector<DicomRT_ROI::Pointer> & GetListOfROI() const;
+  clitk::DicomRT_ROI * GetROI(int n);
+  const std::string & GetStudyID() const;
+  const std::string & GetStudyTime() const;
+  const std::string & GetStudyDate() const;
+  const std::string & GetLabel() const;
+  const std::string & GetName() const;
+  const std::string & GetDate() const;
+  const std::string & GetTime() const;
 
-    int AddBinaryImageAsNewROI(vvImage * i, std::string name);
-    
-  protected:
-    std::string mStudyID;
-    std::string mStudyTime;
-    std::string mStudyDate;
-    std::string mLabel;
-    std::string mName;
-    std::string mDate;
-    std::string mTime;
-    std::map<int, std::string> mMapOfROIName;
-    std::map<int, int> mMapOfROIIndex;
-    std::vector<clitk::DicomRT_ROI*> mListOfROI;
+  int AddBinaryImageAsNewROI(vvImage * i, std::string name);
+  
+protected:
+  std::string mStudyID;
+  std::string mStudyTime;
+  std::string mStudyDate;
+  std::string mLabel;
+  std::string mName;
+  std::string mDate;
+  std::string mTime;
+  std::map<int, std::string> mMapOfROIName;
+  std::map<int, int> mMapOfROIIndex;
+  std::vector<clitk::DicomRT_ROI::Pointer> mListOfROI;
 
-  };
-  //--------------------------------------------------------------------
+private:
+  DicomRT_StructureSet();
+  ~DicomRT_StructureSet();
+};
+//--------------------------------------------------------------------
 
 } // end namespace clitk
 #endif // CLITKDICOMRT_STRUCTURESET_H