Program: gdcm
Module: $RCSfile: ToInTag.cxx,v $
Language: C++
- Date: $Date: 2007/05/29 10:36:10 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2007/06/04 08:51:23 $
+ Version: $Revision: 1.13 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
currentFile = it2->second;
fullFilename = currentFile->GetFileName();
- lastFilename = GDCM_NAME_SPACE::Util::GetName( fullFilename );
+ lastFilename = GDCM_NAME_SPACE::Util::GetName( fullFilename );
+ if (verbose)
std::cout <<" ------------------------------------------------------------------------------"
<< std::endl << " Deal with [" << it2->first << "] : ["<<fullFilename << "]"
<< std::endl;
Program: gdcm
Module: $RCSfile: exSerieHelper.cxx,v $
Language: C++
- Date: $Date: 2007/05/31 12:22:46 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2007/06/04 08:51:23 $
+ Version: $Revision: 1.11 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
std::cout << "Dir Name :[" << dirName << "]" << std::endl;
+ //
+ // Something, using only SerieHelper is not enought !
+ // See also exXcoherentFileSet
+ //
s = GDCM_NAME_SPACE::SerieHelper::New();
s->SetLoadMode(GDCM_NAME_SPACE::LD_ALL); // Load everything for each File
<< std::endl;
int nbFiles;
+ double zspacing = 0.;
// For all the Single SerieUID Files Sets of the GDCM_NAME_SPACE::Serie
l = s->GetFirstSingleSerieUIDFileSet();
while (l)
nbFiles = l->size() ;
if ( l->size() > 5 ) // Why not ? Just an example, for testing
{
- std::cout << "Sort list : " << nbFiles << " long" << std::endl;
- s->OrderFileList(l); // sort the list
+ std::cout << "Sort list : " << nbFiles << " long" << std::endl;
+
+ //---------------------------------------------------------
+ s->OrderFileList(l); // sort the list (and compute ZSpacing !)
+ //---------------------------------------------------------
+
+ zspacing = s->GetZSpacing();
// Just to show : GetZSpacing from a gdcm::SerieHelper is right
std::cout << "GetZSpacing() of sorted SingleSerieUIDFileSet "
- << "from gdcm::SerieHelper: " << s->GetZSpacing() << std::endl;
+ << "from gdcm::SerieHelper: " << zspacing << std::endl;
std::cout << " ('-1' means all the files have the same position)" << std::endl;
for (std::vector<GDCM_NAME_SPACE::File* >::iterator it = l->begin();
it != l->end();
Program: gdcm
Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
Language: C++
- Date: $Date: 2005/11/28 16:29:13 $
- Version: $Revision: 1.58 $
+ Date: $Date: 2007/06/04 08:51:24 $
+ Version: $Revision: 1.59 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
// FIXME : 100 % useless method !
// "gdcm" was written on disc byte per byte.
-// when you fread if, you'll get *allways* "gdcm"
+// when you fread it, you'll get *always* "gdcm"
// whatever the processor indianess is !
int swap = 0;
}
tag >>= 8;
}
+ //std::cout << std::hex << "0x(" << tag << ")" << std::dec << tag << std::endl;
return swap;
}
SwapCode = ComputeSwapCode(tag);
if( SwapCode == 0 )
{
+ // We shall *never* come here!
std::cout << "TestFile: Bad tag - Must be 'gdcm'" << std::endl;
return(false);
}
Program: gdcm
Module: $RCSfile: gdcmSerieHelper.cxx,v $
Language: C++
- Date: $Date: 2007/05/23 15:30:29 $
- Version: $Revision: 1.55 $
+ Date: $Date: 2007/06/04 08:51:24 $
+ Version: $Revision: 1.56 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// 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" );
+ gdcmWarningMacro("Looks like all images have the exact same image position. "
+ << "No PositionPatientOrdering sort performed. "
+ << "No 'ZSpacing' calculated! ");
return false;
}
{
if (distmultimap.count((*it2).first) != 1)
{
- gdcmErrorMacro("File: "
+ gdcmErrorMacro("File: ["
<< ((*it2).second->GetFileName())
- << " Distance: "
+ << "] : more than ONE file at distance: '"
<< (*it2).first
- << " position is not unique");
+ << " (position is not unique!) "
+ << "No PositionPatientOrdering sort performed. "
+ << "No 'ZSpacing' calculated! ");
ok = false;
}
// A scout scan prior to a CT volume scan can share the same
// SeriesUID, but they will sometimes have a different Series Number
AddRestriction( TagKey(0x0020, 0x0011) );
+
// 0018 0024 Sequence Name
// For T1-map and phase-contrast MRA, the different flip angles and
// directions are only distinguished by the Sequence Name
AddRestriction( TagKey(0x0018, 0x0024) );
+
// 0018 0050 Slice Thickness
// On some CT systems, scout scans and subsequence volume scans will
// have the same SeriesUID and Series Number - YET the slice
// thickness will differ from the scout slice and the volume slices.
AddRestriction( TagKey(0x0018, 0x0050));
+
// 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.
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.
const ExDetail &r = *it2;
s = inFile->GetEntryString( r.group, r.elem );
- // User is allowed to ask 'convertion', to allow further ordering
+ // User is allowed to ask for 'convertion', to allow further ordering
// e.g : 100 would be *before* 20; 000020.00 vs 00100.00 : OK
if (it2->convert)
{
for(unsigned int i=0; i<s.size(); i++)
{
while(i<s.size()
- && !( s[i] == '.' || s[i] == '%'
- || (s[i] >= 'a' && s[i] <= 'z')
- || (s[i] >= '0' && s[i] <= '9')
- || (s[i] >= 'A' && s[i] <= 'Z')))
+ && !( s[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);
}
Program: gdcm
Module: $RCSfile: vtkgdcmSerieViewer2.cxx,v $
Language: C++
- Date: $Date: 2007/03/29 13:52:16 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2007/06/04 08:51:25 $
+ Version: $Revision: 1.8 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
if ( l->size() > 1 )
{
std::cout << "Sort list : " << nbFiles << " long" << std::endl;
- sh->OrderFileList(l); // sort the list
+
+ //---------------------------------------------------------
+ sh->OrderFileList(l); // sort the list (and compute ZSpacing !)
+ //---------------------------------------------------------
+
double zsp = sh->GetZSpacing();
std::cout << "List sorted, ZSpacing = " << zsp << std::endl;
break; // The first one is OK. user will have to check
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff