X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.cxx;h=b0a1629b98a4fb83b161038ecfe4bdba595bd1b4;hb=944dcbe9398f982d89c3ab2a588b9f1f1c072b7c;hp=2fed114434025e15866a07ed101b7afa31c99a10;hpb=e67bd0ca2f9efb322bf5149c9191d6599cad1187;p=gdcm.git

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index 2fed1144..b0a1629b 100644
--- a/src/gdcmSerieHelper.cxx
+++ b/src/gdcmSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/09/28 14:15:34 $
-  Version:   $Revision: 1.61 $
+  Date:      $Date: 2008/02/13 18:53:33 $
+  Version:   $Revision: 1.65 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -43,7 +43,7 @@ SerieHelper::SerieHelper()
    ClearAll();
    UserLessThanFunction = 0;
    DirectOrder = true;
-   
+   DropDuplicatePositions = false;   
 }
 
 /**
@@ -263,6 +263,9 @@ void SerieHelper::SetDirectory(std::string const &dir, bool recursive)
    for( DirListType::const_iterator it = filenames_list.begin(); 
         it != filenames_list.end(); ++it)
    {
+     // std::cout << "--------------------------------filename [" << *it << "]"
+     //           << std::endl; 
+      gdcmDebugMacro("filename [" << *it << "]" );
       AddFileName( *it );
    }
 }
@@ -298,19 +301,23 @@ void SerieHelper::OrderFileList(FileList *fileSet)
    
    if ( SerieHelper::UserLessThanFunction )
    {
+      gdcmDebugMacro("Use UserLessThanFunction");     
       UserOrdering( fileSet );
       return; 
    }
    else if ( ImagePositionPatientOrdering( fileSet ) )
-   {
+   { 
+      gdcmDebugMacro("ImagePositionPatientOrdering succeeded");
       return ;
    }
    else if ( ImageNumberOrdering(fileSet ) )
    {
+      gdcmDebugMacro("ImageNumberOrdering succeeded");   
       return ;
    }
    else  
    {
+      gdcmDebugMacro("Use FileNameOrdering");    
       FileNameOrdering(fileSet );
    }
 }
@@ -618,7 +625,7 @@ XCoherentFileSetmap SerieHelper::SplitOnTagValue(FileList *fileSet,
 // Private
 /**
  * \brief sorts the images, according to their Patient Position.
- *  As a side effect, it computes the ZSpacing, according to Jolinda Smith'
+ *  As a side effect, it computes the ZSpacing, according to Jolinda Smith's
  *  algorithm. (get it with double GetZSpacing() !)
  *  We may order, considering :
  *   -# Image Position Patient
@@ -644,12 +651,15 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
    bool first = true;
    ZSpacing = -1.0;  // will be updated if process doesn't fail
 
+   gdcmDebugMacro("============================================DropDuplicatePositions : " << DropDuplicatePositions );
+    
    std::multimap<double,File *> distmultimap;
    // Use a multimap to sort the distances from 0,0,0
    for ( FileList::const_iterator 
          it = fileList->begin();
          it != fileList->end(); ++it )
    {
+      gdcmDebugMacro("deal with " << (*it)->GetFileName() );
       if ( first ) 
       {
          (*it)->GetImageOrientationPatient( cosines );
@@ -688,6 +698,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
             dist += normal[i]*ipp[i];
          }
     
+         gdcmDebugMacro("dist : " << dist);
          distmultimap.insert(std::pair<const double,File *>(dist, *it));
 
          max = min = dist;
@@ -708,17 +719,19 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
          }
 
          distmultimap.insert(std::pair<const double,File *>(dist, *it));
-
+         gdcmDebugMacro("dist : " << dist);
          min = (min < dist) ? min : dist;
          max = (max > dist) ? max : dist;
       }
    }
 
+   gdcmDebugMacro("After parsing vector, nb of elements : " << fileList->size() );
+
    // Find out if min/max are coherent
    if ( min == max )
    {
      gdcmWarningMacro("Looks like all images have the exact same image position. "
-                      << "No PositionPatientOrdering sort performed. " 
+                      << "No PositionPatientOrdering sort performed. "
                       << "No 'ZSpacing' calculated! ");
      return false;
    }
@@ -729,14 +742,17 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
         it2 != distmultimap.end();
         ++it2)
    {
+   
+      gdcmDebugMacro("Check if image shares a common position : " << (*it2).second->GetFileName() );   
+   
       if (distmultimap.count((*it2).first) != 1)
       {
-         gdcmErrorMacro("File: ["
+         gdcmWarningMacro("File: ["
               << ((*it2).second->GetFileName())
               << "] : more than ONE file at distance: '"
               << (*it2).first
-              << " (position is not unique!) " 
-              << "No PositionPatientOrdering sort performed. " 
+              << " (position is not unique!) "
+              << "No PositionPatientOrdering sort performed. "
               << "No 'ZSpacing' calculated! ");      
 
          ok = false;
@@ -747,8 +763,8 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
       if (! DropDuplicatePositions)
          return false;
    }
-
-// Now, we could calculate Z Spacing as the difference
+      
+// Now, we can calculate Z Spacing as the difference
 // between the "dist" values for the first two slices.
 
 // The following (un)-commented out code is let here
@@ -774,6 +790,8 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
          fileList->push_back( (*it3).second );
          if (DropDuplicatePositions)
          {
+            /// \todo ImagePositionPatientOrdering  wrong duplicates are found ???
+   
             it3 =  distmultimap.upper_bound((*it3).first); // skip all duplicates
             if (it3 == distmultimap.end() )  // if last image, stop iterate
                break;
@@ -1042,6 +1060,8 @@ std::string SerieHelper::CreateUserDefinedFileIdentifier( File *inFile )
    {
       const ExDetail &r = *it2;
       s = inFile->GetEntryString( r.group, r.elem );
+      if (s == "") // avoid troubles when empty string is found
+         s = "-";
 
       // User is allowed to ask for 'convertion', to allow further ordering
       // e.g : 100 would be *before* 20; 000020.00 vs 00100.00 : OK