Fix for bug Bug #670: closing and opening do the same as successive

[clitk.git] / common / clitkDicomRT_ROI.h

diff --git a/common/clitkDicomRT_ROI.h b/common/clitkDicomRT_ROI.h
index c1cf9778f2ca13838137b43b4b0f441ce32e6bfe..0fb30768cae840c65d79046711017bd779b5d462 100644 (file)
--- a/common/clitkDicomRT_ROI.h
+++ b/common/clitkDicomRT_ROI.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
@@ -25,57 +25,67 @@
 
 namespace clitk {
 
-  //--------------------------------------------------------------------
-  class DicomRT_ROI {
-    
-  public:
-    DicomRT_ROI();
-    ~DicomRT_ROI();
+//--------------------------------------------------------------------
+class DicomRT_ROI : public itk::LightObject
+{
+  
+public:
+  typedef DicomRT_ROI Self;
+  typedef itk::SmartPointer<Self> Pointer;
+  itkNewMacro(Self);
 
-    void Print(std::ostream & os = std::cout) const;
-    void Read(std::map<int, std::string> & rois, gdcm::SQItem * item);
-    void SetFromBinaryImage(vvImage::Pointer image, int n, 
-                           std::string name, 
-                           std::vector<double> color, 
-                           std::string filename);
+  void Print(std::ostream & os = std::cout) const;
+#if GDCM_MAJOR_VERSION == 2
+  void Read(std::map<int, std::string> & rois, gdcm::Item const & item);
+#else
+  void Read(std::map<int, std::string> & rois, gdcm::SQItem * item);
+#endif
+  void SetFromBinaryImage(vvImage * image, int n, 
+        std::string name, 
+        std::vector<double> color, 
+        std::string filename);
 
-    int GetROINumber() const;
-    const std::string & GetName() const;
-    const std::string & GetFilename() const;
-    const std::vector<double> & GetDisplayColor() const;
-    vtkPolyData * GetMesh();
-    const vvImage::Pointer GetImage() const;
+  int GetROINumber() const;
+  const std::string & GetName() const;
+  const std::string & GetFilename() const;
+  const std::vector<double> & GetDisplayColor() const;
+  vtkPolyData * GetMesh();
+  vvImage * GetImage() const;
 
-    void SetDisplayColor(double r, double v, double b);
-    std::vector<double> & GetDisplayColor() { return mColor; }
-    
-    double GetBackgroundValueLabelImage() const;
-    void SetBackgroundValueLabelImage(double bg);
-    
-    double GetForegroundValueLabelImage() const;
-    void SetForegroundValueLabelImage(double bg);
-    
-    void SetImage(vvImage * im);
-    DicomRT_Contour* GetContour(int n);
+  void SetDisplayColor(double r, double v, double b);
+  std::vector<double> & GetDisplayColor() { return mColor; }
+  
+  double GetBackgroundValueLabelImage() const;
+  void SetBackgroundValueLabelImage(double bg);
+  
+  double GetForegroundValueLabelImage() const;
+  void SetForegroundValueLabelImage(double bg);
+  
+  void SetImage(vvImage * im);
+  DicomRT_Contour* GetContour(int n);
 
-    double GetContourSpacing() const {return mZDelta;}
-    
-  protected:
-    void ComputeMesh();
-    std::string mName;
-    std::string mFilename;
-    int mNumber;
-    std::vector<double> mColor;
-    std::vector<DicomRT_Contour*> mListOfContours;
-    vtkPolyData * mMesh;
-    bool mMeshIsUpToDate;
-    vvImage::Pointer mImage;
-    double mBackgroundValue;
-    double mForegroundValue;
-    ///Spacing between two contours
-    double mZDelta;
-  };
-  //--------------------------------------------------------------------
+  // double GetContourSpacing() const {return mZDelta;}
+  
+protected:
+  void ComputeMesh();
+  std::string mName;
+  std::string mFilename;
+  int mNumber;
+  std::vector<double> mColor;
+  std::vector<DicomRT_Contour::Pointer> mListOfContours;
+  vtkSmartPointer<vtkPolyData> mMesh;
+  bool mMeshIsUpToDate;
+  vvImage::Pointer mImage;
+  double mBackgroundValue;
+  double mForegroundValue;
+  ///Spacing between two contours
+  // double mZDelta;
+
+private:
+  DicomRT_ROI();
+  ~DicomRT_ROI();
+};
+//--------------------------------------------------------------------
 
 } // end namespace clitk
 #endif // CLITKDICOMRT_ROI_H