X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.cxx;h=5c0919c4baca786a1be5f3e3b8cb8c2ba065e5de;hb=e7768bbebdc9a5972e396d71a3e848f5674ee378;hp=1ea94c9f496dac94ec900eaa562131abda8870b5;hpb=0bcc188c6d5185375f809253e8b9b97c856d2eac;p=gdcm.git diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx index 1ea94c9f..5c0919c4 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/20 12:44:16 $ - Version: $Revision: 1.60 $ + Date: $Date: 2007/10/01 09:28:57 $ + Version: $Revision: 1.62 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -298,19 +298,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 ); } } @@ -448,14 +452,16 @@ XCoherentFileSetmap SerieHelper::SplitOnOrientation(FileList *fileSet) XCoherentFileSetmap CoherentFileSet; int nb = fileSet->size(); - if (nb == 0 ) + if (nb == 0 ) { + gdcmWarningMacro("Empty FileList passed to SplitOnOrientation"); return CoherentFileSet; + } + float iop[6]; std::string strOrient; std::ostringstream ossOrient; FileList::const_iterator it = fileSet->begin(); - //it ++; for ( ; it != fileSet->end(); ++it) @@ -464,7 +470,7 @@ XCoherentFileSetmap SerieHelper::SplitOnOrientation(FileList *fileSet) // 0020 0037 : Image Orientation (Patient) or // 0020 0035 : Image Orientation (RET) - // Let's build again the 'cosines' string, to be sure of it's format + // Let's build again the 'cosines' string, to be sure of its format (*it)->GetImageOrientationPatient(iop); ossOrient << iop[0]; @@ -480,9 +486,11 @@ XCoherentFileSetmap SerieHelper::SplitOnOrientation(FileList *fileSet) gdcmDebugMacro(" New Orientation :[" << strOrient << "]"); // create a File set in 'orientation' position CoherentFileSet[strOrient] = new FileList; + gdcmDebugMacro(" CoherentFileSet[strOrient]" << strOrient << "created"); } // Current Orientation and DICOM header match; add the file: CoherentFileSet[strOrient]->push_back( (*it) ); + gdcmDebugMacro(" CoherentFileSet[strOrient]" << "pushed back") } return CoherentFileSet; } @@ -498,14 +506,15 @@ XCoherentFileSetmap SerieHelper::SplitOnPosition(FileList *fileSet) XCoherentFileSetmap CoherentFileSet; int nb = fileSet->size(); - if (nb == 0 ) + if (nb == 0 ) { + gdcmWarningMacro("Empty FileList passed to SplitOnPosition"); return CoherentFileSet; + } float pos[3]; std::string strImPos; // read on disc std::ostringstream ossPosition; std::string strPosition; // re computed FileList::const_iterator it = fileSet->begin(); - //it ++; for ( ; it != fileSet->end(); ++it) @@ -534,7 +543,7 @@ XCoherentFileSetmap SerieHelper::SplitOnPosition(FileList *fileSet) { gdcmWarningMacro( "Wrong number for Position : [" << strImPos << "]" ); - return CoherentFileSet; + return CoherentFileSet; } // Let's build again the 'position' string, to be sure of it's format @@ -575,8 +584,10 @@ XCoherentFileSetmap SerieHelper::SplitOnTagValue(FileList *fileSet, XCoherentFileSetmap CoherentFileSet; int nb = fileSet->size(); - if (nb == 0 ) + if (nb == 0 ) { + gdcmWarningMacro("Empty FileList passed to SplitOnPosition"); return CoherentFileSet; + } std::string strTagValue; // read on disc @@ -594,7 +605,7 @@ XCoherentFileSetmap SerieHelper::SplitOnTagValue(FileList *fileSet, if ( CoherentFileSet.count(strTagValue) == 0 ) { - gdcmDebugMacro(" New Tag Value :[" << strTagValue << "]"); + gdcmDebugMacro(" :[" << strTagValue << "]"); // create a File set in 'position' position CoherentFileSet[strTagValue] = new FileList; } @@ -611,7 +622,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 @@ -643,6 +654,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) it = fileList->begin(); it != fileList->end(); ++it ) { + gdcmDebugMacro("deal with " << (*it)->GetFileName() ); if ( first ) { (*it)->GetImageOrientationPatient( cosines ); @@ -681,6 +693,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) dist += normal[i]*ipp[i]; } + gdcmDebugMacro("dist : " << dist); distmultimap.insert(std::pair(dist, *it)); max = min = dist; @@ -701,7 +714,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) } distmultimap.insert(std::pair(dist, *it)); - + gdcmDebugMacro("dist : " << dist); min = (min < dist) ? min : dist; max = (max > dist) ? max : dist; } @@ -711,7 +724,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) 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; } @@ -724,12 +737,12 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) { 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; @@ -740,8 +753,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 @@ -767,6 +780,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; @@ -902,8 +917,8 @@ void SerieHelper::Print(std::ostream &os, std::string const &indent) // For all the files of a SingleSerieUID File set for (FileList::iterator it = (itl->second)->begin(); - it != (itl->second)->end(); - ++it) + it != (itl->second)->end(); + ++it) { os << indent << " --- " << (*it)->GetFileName() << std::endl; } @@ -935,12 +950,12 @@ void SerieHelper::CreateDefaultUniqueSeriesIdentifier() // 0028 0010 Rows // If the 2D images in a sequence don't have the same number of rows, - // then it is difficult to reconstruct them into a 3D volume. + // then it is difficult to reconstruct them into a 3D volume. AddRestriction( TagKey(0x0028, 0x0010)); // 0028 0011 Columns // If the 2D images in a sequence don't have the same number of columns, - // then it is difficult to reconstruct them into a 3D volume. + // then it is difficult to reconstruct them into a 3D volume. AddRestriction( TagKey(0x0028, 0x0011)); } @@ -985,17 +1000,22 @@ std::string SerieHelper::CreateUniqueSeriesIdentifier( File *inFile ) } // Eliminate non-alnum characters, including whitespace... // that may have been introduced by concats. - for(unsigned int i=0; i= '+' && id[i] <= '-') + || (id[i] >= 'a' && id[i] <= 'z') + || (id[i] >= '0' && id[i] <= '9') + || (id[i] >= 'A' && id[i] <= 'Z'))) { - while(i= 'a' && id[i] <= 'z') - || (id[i] >= '0' && id[i] <= '9') - || (id[i] >= 'A' && id[i] <= 'Z'))) - { - id.erase(i, 1); - } + id.replace(i, 1, "_"); // ImagePositionPatient related stuff will be more human readable } + } + // deal with Dicom strings trailing '\0' + if(id[s_size-1] == '_') + id.erase(s_size-1, 1); return id; } else // Could not open inFile @@ -1046,19 +1066,22 @@ std::string SerieHelper::CreateUserDefinedFileIdentifier( File *inFile ) } } // Eliminate non-alphanum characters, including whitespace. - for(unsigned int i=0; i= '+' && s[i] <= '-') || (s[i] >= 'a' && s[i] <= 'z') || (s[i] >= '0' && s[i] <= '9') || (s[i] >= 'A' && s[i] <= 'Z'))) { - //s.erase(i, 1); 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); id += s.c_str(); id += "%%%"; // make the FileIdentifier Tokenizable