X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_ROI.h;h=b41793323bb67b1795da94f21050f75e3ab04b68;hb=babf100c0d140f6b2525532d001b7794fb47a625;hp=0fb30768cae840c65d79046711017bd779b5d462;hpb=a515cd4eb114c9310570341ca29f35484356a1e8;p=clitk.git

diff --git a/common/clitkDicomRT_ROI.h b/common/clitkDicomRT_ROI.h
index 0fb3076..b417933 100644
--- 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,17 +42,13 @@ public:
   itkNewMacro(Self);
 
   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, 
+  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;
@@ -61,25 +64,51 @@ public:
   double GetForegroundValueLabelImage() const;
   void SetForegroundValueLabelImage(double bg);
   
-  void SetImage(vvImage * im);
+  void SetImage(vvImage::Pointer im);
   DicomRT_Contour* GetContour(int n);
 
-  // double GetContourSpacing() const {return mZDelta;}
+  void SetTransformMatrix(vtkMatrix4x4* matrix);
+
+  // Compute a vtk mesh from the dicom contours
+  void ComputeMeshFromContour();
+  void ComputeContoursFromImage();
   
+  // Indicate if the mesh is uptodate according to the dicom
+  void SetDicomUptodateFlag(bool b) { m_DicomUptodateFlag = b; }
+  bool GetDicomUptoDateFlag() const { return m_DicomUptodateFlag; }
+  void SetName(std::string n) { mName = n; }
+
+  // Read from DICOM RT STRUCT
+#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:
-  void ComputeMesh();
   std::string mName;
   std::string mFilename;
   int mNumber;
   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;
-  ///Spacing between two contours
-  // double mZDelta;
+  bool m_DicomUptodateFlag;
+
+#if GDCM_MAJOR_VERSION >= 2
+  gdcm::Item * mItemInfo;
+  gdcm::Item * mItemContour;
+  gdcm::SmartPointer<gdcm::SequenceOfItems> mContoursSequenceOfItems;
+#endif
 
 private:
   DicomRT_ROI();