Change N formula

[clitk.git] / common / clitkDicomRT_ROI.h

diff --git a/common/clitkDicomRT_ROI.h b/common/clitkDicomRT_ROI.h
index 811735218d3327e982d873d71db1d301cc942dc0..b41793323bb67b1795da94f21050f75e3ab04b68 100644 (file)
--- a/common/clitkDicomRT_ROI.h
+++ b/common/clitkDicomRT_ROI.h
@@ -23,6 +23,13 @@
 #include "clitkDicomRT_Contour.h"
 #include "vvImage.h"
 
+#include <vtkMatrix4x4.h>
+#include "clitkConfiguration.h"
+#if CLITK_USE_SYSTEM_GDCM == 1
+#include <vtkGDCMPolyDataReader.h>
+#include <vtkRTStructSetProperties.h>
+#endif
+
 namespace clitk {
 
 //--------------------------------------------------------------------
@@ -35,12 +42,13 @@ public:
   itkNewMacro(Self);
 
   void Print(std::ostream & os = std::cout) const;
-  void SetFromBinaryImage(vvImage * image, int n, 
+  void SetFromBinaryImage(vvImage::Pointer image, int n, 
         std::string name, 
         std::vector<double> color, 
         std::string filename);
 
   int GetROINumber() const;
+  void SetROINumber(int);
   const std::string & GetName() const;
   const std::string & GetFilename() const;
   const std::vector<double> & GetDisplayColor() const;
@@ -56,11 +64,14 @@ public:
   double GetForegroundValueLabelImage() const;
   void SetForegroundValueLabelImage(double bg);
   
-  void SetImage(vvImage * im);
+  void SetImage(vvImage::Pointer im);
   DicomRT_Contour* GetContour(int n);
 
+  void SetTransformMatrix(vtkMatrix4x4* matrix);
+
   // Compute a vtk mesh from the dicom contours
-  void ComputeMesh();
+  void ComputeMeshFromContour();
+  void ComputeContoursFromImage();
   
   // Indicate if the mesh is uptodate according to the dicom
   void SetDicomUptodateFlag(bool b) { m_DicomUptodateFlag = b; }
@@ -68,13 +79,17 @@ public:
   void SetName(std::string n) { mName = n; }
 
   // Read from DICOM RT STRUCT
-#if GDCM_MAJOR_VERSION == 2
+#if GDCM_MAJOR_VERSION >= 2
   bool Read(gdcm::Item * itemInfo, gdcm::Item * itemContour);
   void UpdateDicomItem();
 #else
   void Read(std::map<int, std::string> & rois, gdcm::SQItem * item);
 #endif
 
+#if CLITK_USE_SYSTEM_GDCM == 1
+  void Read(vtkSmartPointer<vtkGDCMPolyDataReader> & reader, int roiindex);
+#endif
+
 protected:
   std::string mName;
   std::string mFilename;
@@ -82,15 +97,17 @@ protected:
   std::vector<double> mColor;
   std::vector<DicomRT_Contour::Pointer> mListOfContours;
   vtkSmartPointer<vtkPolyData> mMesh;
+  vtkSmartPointer<vtkMatrix4x4> mTransformMatrix;
   bool mMeshIsUpToDate;
   vvImage::Pointer mImage;
   double mBackgroundValue;
   double mForegroundValue;
   bool m_DicomUptodateFlag;
 
-#if GDCM_MAJOR_VERSION == 2
+#if GDCM_MAJOR_VERSION >= 2
   gdcm::Item * mItemInfo;
   gdcm::Item * mItemContour;
+  gdcm::SmartPointer<gdcm::SequenceOfItems> mContoursSequenceOfItems;
 #endif
 
 private: