X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_ROI.cxx;h=67e534108187a743313a373db6a9ef88c99753ba;hb=c69e6ac8e16ac42d32f3a13d60396ddf65616188;hp=7aca4be0ae911cb65d3d92c68b52dada4b0dc4ea;hpb=85fa943b3ae5ae15297f3469817f98a930977bfb;p=clitk.git

diff --git a/common/clitkDicomRT_ROI.cxx b/common/clitkDicomRT_ROI.cxx
index 7aca4be..67e5341 100644
--- a/common/clitkDicomRT_ROI.cxx
+++ b/common/clitkDicomRT_ROI.cxx
@@ -2,7 +2,7 @@
   Program:         vv http://www.creatis.insa-lyon.fr/rio/vv
   Main authors :   XX XX XX
 
-  Authors belongs to: 
+  Authors belongs to:
   - University of LYON           http://www.universite-lyon.fr/
   - Léon Bérard cancer center    http://oncora1.lyon.fnclcc.fr
   - CREATIS CNRS laboratory      http://www.creatis.insa-lyon.fr
@@ -17,30 +17,35 @@
 
   =========================================================================*/
 
-#include "clitkDicomRT_ROI.h" 
+#include "clitkDicomRT_ROI.h"
 #include <vtkSmartPointer.h>
 #include <vtkAppendPolyData.h>
 
 //--------------------------------------------------------------------
-clitk::DicomRT_ROI::DicomRT_ROI() {
+clitk::DicomRT_ROI::DicomRT_ROI()
+{
   mName = "NoName";
   mNumber = -1;
   mColor.resize(3);
   mColor[0] = mColor[1] = mColor[2] = 0;
   mMeshIsUpToDate = false;
+  mBackgroundValue = 0;
+  mForegroundValue = 1;
+  mZDelta = 0;
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-clitk::DicomRT_ROI::~DicomRT_ROI() {
-  
+clitk::DicomRT_ROI::~DicomRT_ROI()
+{
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-void clitk::DicomRT_ROI::SetDisplayColor(double r, double v, double b) {
+void clitk::DicomRT_ROI::SetDisplayColor(double r, double v, double b)
+{
   mColor.resize(3);
   mColor[0] = r;
   mColor[1] = v;
@@ -50,30 +55,41 @@ void clitk::DicomRT_ROI::SetDisplayColor(double r, double v, double b) {
 
 
 //--------------------------------------------------------------------
-int clitk::DicomRT_ROI::GetROINumber() const {
+int clitk::DicomRT_ROI::GetROINumber() const
+{
   return mNumber;
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-const std::string & clitk::DicomRT_ROI::GetName() const {
+const std::string & clitk::DicomRT_ROI::GetName() const
+{
   return mName;
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-const std::vector<double> & clitk::DicomRT_ROI::GetDisplayColor() const {
+const std::string & clitk::DicomRT_ROI::GetFilename() const
+{
+  return mFilename;
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+const std::vector<double> & clitk::DicomRT_ROI::GetDisplayColor() const
+{
   return mColor;
 }
 //--------------------------------------------------------------------
 
 
- 
 //--------------------------------------------------------------------
-void clitk::DicomRT_ROI::Print(std::ostream & os) const {
-  os << "ROI " << mNumber << "\t" << mName 
+void clitk::DicomRT_ROI::Print(std::ostream & os) const
+{
+  os << "ROI " << mNumber << "\t" << mName
      << "\t(" << mColor[0] << " " << mColor[1] << " " << mColor[2] << ")"
      << "\t Contours = " << mListOfContours.size() << std::endl;
 }
@@ -81,15 +97,50 @@ void clitk::DicomRT_ROI::Print(std::ostream & os) const {
 
 
 //--------------------------------------------------------------------
-void clitk::DicomRT_ROI::Read(std::map<int, std::string> & rois, gdcm::SQItem * item) {
-  
+void clitk::DicomRT_ROI::SetBackgroundValueLabelImage(double bg)
+{
+  mBackgroundValue = bg;
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+double clitk::DicomRT_ROI::GetBackgroundValueLabelImage() const
+{
+  return mBackgroundValue;
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+void clitk::DicomRT_ROI::SetForegroundValueLabelImage(double bg)
+{
+  mForegroundValue = bg;
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+double clitk::DicomRT_ROI::GetForegroundValueLabelImage() const
+{
+  return mForegroundValue;
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+#if GDCM_MAJOR_VERSION == 2
+#else
+void clitk::DicomRT_ROI::Read(std::map<int, std::string> & rois, gdcm::SQItem * item)
+{
+
   // Change number if needed
-  
+
   // TODO
 
   // ROI number [Referenced ROI Number]
   mNumber = atoi(item->GetEntryValue(0x3006,0x0084).c_str());
-  
+
   // Retrieve ROI Name
   mName = rois[mNumber];
 
@@ -98,49 +149,82 @@ void clitk::DicomRT_ROI::Read(std::map<int, std::string> & rois, gdcm::SQItem *
 
   // Read contours [Contour Sequence]
   gdcm::SeqEntry * contours=item->GetSeqEntry(0x3006,0x0040);
-  for(gdcm::SQItem* j=contours->GetFirstSQItem();j!=0;j=contours->GetNextSQItem()) {
-    DicomRT_Contour * c = new DicomRT_Contour;    
+  bool contour_processed=false;
+  bool delta_computed=false;
+  double last_z=0;
+  for(gdcm::SQItem* j=contours->GetFirstSQItem(); j!=0; j=contours->GetNextSQItem()) {
+    DicomRT_Contour::Pointer c = DicomRT_Contour::New();
     bool b = c->Read(j);
-    if (b) mListOfContours.push_back(c);
+    if (b) {
+      mListOfContours.push_back(c);
+      if (contour_processed) {
+        double delta=c->GetZ() - last_z;
+        if (delta_computed)
+          assert(mZDelta == delta);
+        else
+          mZDelta = delta;
+      } else
+        contour_processed=true;
+      last_z=c->GetZ();
+    }
   }
 }
+#endif
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+void clitk::DicomRT_ROI::SetImage(vvImage * image)
+{
+  mImage = image;
+}
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-vtkPolyData * clitk::DicomRT_ROI::GetMesh() {
+vtkPolyData * clitk::DicomRT_ROI::GetMesh()
+{
   if (!mMeshIsUpToDate) {
     ComputeMesh();
   }
   return mMesh;
 }
 //--------------------------------------------------------------------
-
+clitk::DicomRT_Contour * clitk::DicomRT_ROI::GetContour(int n)
+{
+  return mListOfContours[n];
+}
 
 //--------------------------------------------------------------------
-void clitk::DicomRT_ROI::ComputeMesh() {
-  vtkAppendPolyData * append = vtkAppendPolyData::New();
+void clitk::DicomRT_ROI::ComputeMesh()
+{
+  vtkSmartPointer<vtkAppendPolyData> append = vtkSmartPointer<vtkAppendPolyData>::New();
   for(unsigned int i=0; i<mListOfContours.size(); i++) {
     append->AddInput(mListOfContours[i]->GetMesh());
   }
   append->Update();
-  mMesh = append->GetOutput();
+ 
+  mMesh = vtkSmartPointer<vtkPolyData>::New();
+  mMesh->DeepCopy(append->GetOutput());
   mMeshIsUpToDate = true;
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-void clitk::DicomRT_ROI::SetFromBinaryImage(vvImage::Pointer image, int n, 
-					    std::string name, 
-					    std::vector<double> color) {
-  
+void clitk::DicomRT_ROI::SetFromBinaryImage(vvImage * image, int n,
+					    std::string name,
+					    std::vector<double> color, 
+					    std::string filename)
+{
+
   // ROI number [Referenced ROI Number]
   mNumber = n;
-  
+
   // ROI Name
   mName = name;
-    
+  mFilename = filename;
+
   // ROI Color [ROI Display Color]
   mColor = color;
 
@@ -154,7 +238,8 @@ void clitk::DicomRT_ROI::SetFromBinaryImage(vvImage::Pointer image, int n,
 
 
 //--------------------------------------------------------------------
-const vvImage::Pointer clitk::DicomRT_ROI::GetImage() const {
+vvImage * clitk::DicomRT_ROI::GetImage() const
+{
   return mImage;
 }
 //--------------------------------------------------------------------