indent

[gdcm.git] / src / gdcmSerieHelper.cxx

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index 4e215e7fb221ca8a96a9c2f8e02b3cb4b9224791..fcbc234a1d513c5c1724e1ab46c574e0922ca9c1 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: 2010/04/09 15:38:18 $
-  Version:   $Revision: 1.70 $
+  Date:      $Date: 2011/04/04 17:33:58 $
+  Version:   $Revision: 1.73 $
                                                                                 
   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"
@@ -301,7 +301,7 @@ void SerieHelper::OrderFileList(FileList *fileSet)
    
    if ( SerieHelper::UserLessThanFunction )
    {
-      gdcmDebugMacro("Use UserLessThanFunction");     
+      gdcmDebugMacro("Use UserLessThanFunction");
       UserOrdering( fileSet );
       return; 
    }
@@ -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*10000.;
+      sprintf(cTagValue, "%010d", iTagValue);
+      strTagValue = cTagValue;
       
       if ( CoherentFileSet.count(strTagValue) == 0 )
       {
@@ -1092,7 +1146,6 @@ std::string SerieHelper::CreateUserDefinedFileIdentifier( File *inFile )
          }
       }
       // Eliminate non-alphanum characters, including whitespace.
-
       unsigned int s_size = s.size();
       if(s_size == 0)
       { // to avoid further troubles when wild anonymization was performed
@@ -1112,7 +1165,7 @@ std::string SerieHelper::CreateUserDefinedFileIdentifier( File *inFile )
                s.replace(i, 1, "_");  // ImagePositionPatient related stuff will be more human readable
             }
          }
-         // deal with Dicom strings trailing '\0' 
+         // deal with Dicom strings trailing '\0'
          if(s[s_size-1] == '_')
             s.erase(s_size-1, 1);
       }