avoid further troubles when wild anonymization was performed

[gdcm.git] / src / gdcmSerieHelper.cxx

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index e9341b7ddbff8807f86ed6ab7f2e40ce9ddcaea2..4e215e7fb221ca8a96a9c2f8e02b3cb4b9224791 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: 2008/04/02 11:15:07 $
-  Version:   $Revision: 1.67 $
+  Date:      $Date: 2010/04/09 15:38:18 $
+  Version:   $Revision: 1.70 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -13,7 +13,7 @@
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notices for more information.
-                                                                                
+                                                                              
 =========================================================================*/
 
 #include "gdcmSerieHelper.h"
@@ -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,13 +258,13 @@ 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; 
+     // std::cout << "-----------------------------filename [" << *it << "]"
+     //           << std::endl;
       gdcmDebugMacro("filename [" << *it << "]" );
       AddFileName( *it );
    }
@@ -813,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;
          } 
@@ -1083,23 +1092,30 @@ std::string SerieHelper::CreateUserDefinedFileIdentifier( File *inFile )
          }
       }
       // Eliminate non-alphanum characters, including whitespace.
+
       unsigned int s_size = s.size();
-      for(unsigned int i=0; i<s_size; i++)
+      if(s_size == 0)
+      { // to avoid further troubles when wild anonymization was performed
+         s = "a";
+      }
+      else
       {
-         while(i<s_size
+         for(unsigned int i=0; i<s_size; i++)
+         {
+            while(i<s_size
                && !( s[i] == '.' || s[i] == '%' || s[i] == '_'
                  || (s[i] >= '+' && s[i] <= '-')       
                  || (s[i] >= 'a' && s[i] <= 'z')
                  || (s[i] >= '0' && s[i] <= '9')
                  || (s[i] >= 'A' && s[i] <= 'Z')))
-         {
-            s.replace(i, 1, "_");  // ImagePositionPatient related stuff will be more human readable
+            {
+               s.replace(i, 1, "_");  // ImagePositionPatient related stuff will be more human readable
+            }
          }
+         // deal with Dicom strings trailing '\0' 
+         if(s[s_size-1] == '_')
+            s.erase(s_size-1, 1);
       }
-      // deal with Dicom strings trailing '\0' 
-      if(s[s_size-1] == '_')
-         s.erase(s_size-1, 1);
-      
       id += s.c_str();
       id += "%%%"; // make the FileIdentifier Tokenizable
    }