change

[gdcm.git] / src / gdcmSerieHelper.cxx

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index eb6dd6a0c02c8844d76a7fd1ce03b15272017add..fc0f2135b7838d77fcb177c1638a773b077998e0 100644 (file)
--- a/src/gdcmSerieHelper.cxx
+++ b/src/gdcmSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/10/30 14:51:00 $
-  Version:   $Revision: 1.64 $
+  Date:      $Date: 2008/05/14 07:48:52 $
+  Version:   $Revision: 1.69 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -161,7 +161,7 @@ bool SerieHelper::AddFile(File *header)
       std::string id = CreateUniqueSeriesIdentifier( header );
       // if id == GDCM_UNFOUND then consistently we should find GDCM_UNFOUND
       // no need here to do anything special
- 
+
       if ( SingleSerieUIDFileSetHT.count(id) == 0 )
       {
          gdcmDebugMacro(" New/gdcmSerieHelper.cxx Serie UID :[" << id << "]");
@@ -258,11 +258,14 @@ void SerieHelper::AddSeriesDetail(uint16_t group, uint16_t elem, bool convert)
 void SerieHelper::SetDirectory(std::string const &dir, bool recursive)
 {
    DirList dirList(dir, recursive); // OS specific
-  
+
    DirListType filenames_list = dirList.GetFilenames();
    for( DirListType::const_iterator it = filenames_list.begin(); 
         it != filenames_list.end(); ++it)
    {
+     // std::cout << "-----------------------------filename [" << *it << "]"
+     //           << std::endl;
+      gdcmDebugMacro("filename [" << *it << "]" );
       AddFileName( *it );
    }
 }
@@ -787,9 +790,14 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
          fileList->push_back( (*it3).second );
          if (DropDuplicatePositions)
          {
-            /// \todo ImagePositionPatientOrdering  wrong duplicates are found ???
-   
+            // ImagePositionPatientOrdering  wrong duplicates are found ???
+            // --> fixed. See comment
+
             it3 =  distmultimap.upper_bound((*it3).first); // skip all duplicates
+           // the upper_bound function increments the iterator to the next non-duplicate entry
+           // The for loop iteration also increments the iterator, which causes the code to skip every other image
+           // --> decrement the iterator after the upper_bound function call
+            it3--;
             if (it3 == distmultimap.end() )  // if last image, stop iterate
                break;
          }
@@ -805,7 +813,16 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
          fileList->push_back( (*it4).second );
          if (DropDuplicatePositions)  // skip all duplicates
          {
-           it4 =  distmultimap.upper_bound((*it4).first);
+            // lower_bound finds the next element that is 
+            // less than or *equal to* the current value!
+            //it4 =  distmultimap.lower_bound((*it4).first);
+   
+           // David Feng's fix
+           std::multimap<double, File *>::const_iterator itPrev = it4;
+           while (itPrev->first == it4->first)
+              --itPrev;
+           it4 = itPrev;
+    
            if (it4 == distmultimap.begin() ) // if first image, stop iterate
                break;
          } 
@@ -1021,7 +1038,7 @@ std::string SerieHelper::CreateUniqueSeriesIdentifier( File *inFile )
       }
    }
    // deal with Dicom strings trailing '\0' 
-    if(id[s_size-1] == '_')
+    if(s_size && id[s_size-1] == '_')
       id.erase(s_size-1, 1);
     return id;
     }