X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.cxx;h=fcbc234a1d513c5c1724e1ab46c574e0922ca9c1;hb=76ac46b16fd92d0fb444f786d4946424d9029315;hp=56aaaabcb1533c75bd01f38caa9016193a715dd0;hpb=fd5c14391627c6e42283ced90561271af2a161a2;p=gdcm.git diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx index 56aaaabc..fcbc234a 100644 --- a/src/gdcmSerieHelper.cxx +++ b/src/gdcmSerieHelper.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSerieHelper.cxx,v $ Language: C++ - Date: $Date: 2011/03/29 07:36:00 $ - Version: $Revision: 1.71 $ + 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 @@ -301,7 +301,7 @@ void SerieHelper::OrderFileList(FileList *fileSet) if ( SerieHelper::UserLessThanFunction ) { - gdcmDebugMacro("Use UserLessThanFunction"); + gdcmDebugMacro("Use UserLessThanFunction"); UserOrdering( fileSet ); return; } @@ -656,7 +656,7 @@ XCoherentFileSetmap SerieHelper::SplitOnTagValueConvertToFloat(FileList *fileSet strTagValue = (*it)->GetEntryString(group,element); dTagValue = atof( strTagValue.c_str()); - iTagValue = dTagValue; + iTagValue = dTagValue*10000.; sprintf(cTagValue, "%010d", iTagValue); strTagValue = cTagValue; @@ -1146,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 @@ -1166,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); }