X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.cxx;h=56aaaabcb1533c75bd01f38caa9016193a715dd0;hb=35ee8ee8af32946514713d271177df8bb2298eb2;hp=d3790903fa5eda7bfc37f0b7efd794c4a1793e59;hpb=3547c8d943eeb6e358e8b1ae26312e7a6eb1fedb;p=gdcm.git

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index d3790903..56aaaabc 100644
--- a/src/gdcmSerieHelper.cxx
+++ b/src/gdcmSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/13 08:02:59 $
-  Version:   $Revision: 1.68 $
+  Date:      $Date: 2011/03/29 07:36:00 $
+  Version:   $Revision: 1.71 $
                                                                                 
   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"
@@ -581,14 +581,14 @@ XCoherentFileSetmap SerieHelper::SplitOnPosition(FileList *fileSet)
  * \return  std::map of 'Xcoherent' File sets
  */
 
-XCoherentFileSetmap SerieHelper::SplitOnTagValue(FileList *fileSet, 
+XCoherentFileSetmap SerieHelper::SplitOnTagValue(FileList *fileSet,
                                                uint16_t group, uint16_t element)
 {
    XCoherentFileSetmap CoherentFileSet;
 
    int nb = fileSet->size();
    if (nb == 0 ) {
-      gdcmWarningMacro("Empty FileList passed to SplitOnPosition");
+      gdcmWarningMacro("Empty FileList passed to SplitOnTagValue");
       return CoherentFileSet;
    }
 
@@ -605,6 +605,60 @@ XCoherentFileSetmap SerieHelper::SplitOnTagValue(FileList *fileSet,
       // 0020,0030 : Image Position (RET)
 
       strTagValue = (*it)->GetEntryString(group,element);
+
+      if ( CoherentFileSet.count(strTagValue) == 0 )
+      {
+         gdcmDebugMacro("  :[" << strTagValue << "]");
+         // create a File set in 'position' position
+         CoherentFileSet[strTagValue] = new FileList;
+      }
+      // Current Tag value and DICOM header match; add the file:
+      CoherentFileSet[strTagValue]->push_back( (*it) );
+   }
+   return CoherentFileSet;
+}
+
+
+/**
+ * \brief   Splits a 'Single SerieUID' File set Coherent according to the
+ *          value of a given Tag
+ * @param fileSet File Set to be splitted
+ * @param   group  group number of the target Element
+ * @param   element element number of the target Element
+ * \return  std::map of 'Xcoherent' File sets
+ */
+
+XCoherentFileSetmap SerieHelper::SplitOnTagValueConvertToFloat(FileList *fileSet,
+                                               uint16_t group, uint16_t element)
+{
+   XCoherentFileSetmap CoherentFileSet;
+
+   int nb = fileSet->size();
+   if (nb == 0 ) {
+      gdcmWarningMacro("Empty FileList passed to SplitOnTagValue");
+      return CoherentFileSet;
+   }
+
+   std::string strTagValue;  // read on disc
+
+   double      dTagValue;
+   int         iTagValue;
+   char        cTagValue[11];
+   std::string sTagValue;
+
+   FileList::const_iterator it = fileSet->begin();
+   //it ++;
+   for ( ;
+         it != fileSet->end();
+       ++it)
+   {
+      /// \TODO : find a trick to create a string whose value follows lexicographical order 
+
+      strTagValue = (*it)->GetEntryString(group,element);
+      dTagValue = atof( strTagValue.c_str());
+      iTagValue = dTagValue;
+      sprintf(cTagValue, "%010d", iTagValue);
+      strTagValue = cTagValue;
       
       if ( CoherentFileSet.count(strTagValue) == 0 )
       {
@@ -818,7 +872,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
             //it4 =  distmultimap.lower_bound((*it4).first);
    
            // David Feng's fix
-           itPrev = it4;
+           std::multimap<double, File *>::const_iterator itPrev = it4;
            while (itPrev->first == it4->first)
               --itPrev;
            it4 = itPrev;
@@ -1092,23 +1146,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
    }