From: dsarrut <david.sarrut@gmail.com>
Date: Fri, 27 May 2011 09:22:43 +0000 (+0200)
Subject: Remove DeltaZ computation (false)
X-Git-Tag: v1.3.0~338^2~7
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7444a8875729811c343fe0b8050b4d67ee2ed2cb;p=clitk.git

Remove DeltaZ computation (false)
---

diff --git a/common/clitkDicomRT_ROI.cxx b/common/clitkDicomRT_ROI.cxx
index ef463ce..88bab72 100644
--- a/common/clitkDicomRT_ROI.cxx
+++ b/common/clitkDicomRT_ROI.cxx
@@ -36,7 +36,6 @@ clitk::DicomRT_ROI::DicomRT_ROI()
   mMeshIsUpToDate = false;
   mBackgroundValue = 0;
   mForegroundValue = 1;
-  mZDelta = 0;
 }
 //--------------------------------------------------------------------
 
@@ -173,9 +172,6 @@ void clitk::DicomRT_ROI::Read(std::map<int, std::string> & rois, gdcm::Item cons
     }
   unsigned int nitems = sqi2->GetNumberOfItems();
 
-  bool contour_processed=false;
-  bool delta_computed=false;
-  double last_z=0;
   for(unsigned int i = 0; i < nitems; ++i)
     {
       const gdcm::Item & j = sqi2->GetItem(i+1); // Item start at #1
@@ -183,18 +179,8 @@ void clitk::DicomRT_ROI::Read(std::map<int, std::string> & rois, gdcm::Item cons
       bool b = c->Read(j);
       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();
       }
     }
-
 }
 #else
 void clitk::DicomRT_ROI::Read(std::map<int, std::string> & rois, gdcm::SQItem * item)
@@ -216,24 +202,14 @@ void clitk::DicomRT_ROI::Read(std::map<int, std::string> & rois, gdcm::SQItem *
   // Read contours [Contour Sequence]
   gdcm::SeqEntry * contours=item->GetSeqEntry(0x3006,0x0040);
   if (contours) {
-    bool contour_processed=false;
-    bool delta_computed=false;
-    double last_z=0;
+    int i=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 (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();
       }
+      ++i;
     }
   }
   else {
@@ -284,9 +260,9 @@ void clitk::DicomRT_ROI::ComputeMesh()
 
 //--------------------------------------------------------------------
 void clitk::DicomRT_ROI::SetFromBinaryImage(vvImage * image, int n,
-					    std::string name,
-					    std::vector<double> color, 
-					    std::string filename)
+                                            std::string name,
+                                            std::vector<double> color, 
+                                            std::string filename)
 {
 
   // ROI number [Referenced ROI Number]