Program: gdcm
Module: $RCSfile: vtkgdcmSerieViewer.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:55 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2006/01/26 16:01:06 $
+ Version: $Revision: 1.16 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
int check = am->ArgMgrDefined("check");
// This is so ugly, a cstring is NOT a char * (god damit!)
- bool bname = ( strcmp(am->ArgMgrGetString("order", (char*)"not found"),"name")==0 );
+ bool bname = ( strcmp(am->ArgMgrGetString("order", "not found"),"name")==0 );
if (bname)
elemsToOrderOn = am->ArgMgrGetXInt16Enum("order", &orderNb);
// ----------------------- End Arguments Manager ----------------------
- gdcm::SerieHelper *sh = new gdcm::SerieHelper();
+ gdcm::SerieHelper *sh = gdcm::SerieHelper::New();
sh->SetLoadMode(loadMode);
if (reverse)
sh->SetSortOrderToReverse();
// Just to see
int nbFiles;
- // For all the Coherent Files lists of the gdcm::Serie
- gdcm::FileList *l = sh->GetFirstCoherentFileList();
+ // For all the 'Single Serie UID' FileSets of the gdcm::Serie
+ gdcm::FileList *l = sh->GetFirstSingleSerieUIDFileSet();
if (l == 0 )
{
- std::cout << "Oops! No CoherentFileList found ?!?" << std::endl;
+ std::cout << "Oops! No 'Single Serie UID' FileSet found ?!?" << std::endl;
return 0;
}
}
else
{
- std::cout << "Oops! Empty CoherentFileList found ?!?" << std::endl;
+ std::cout << "Oops! Empty 'Single Serie UID' FileSet found ?!?"
+ << std::endl;
}
- l = sh->GetNextCoherentFileList();
+ l = sh->GetNextSingleSerieUIDFileSet();
}
if (check)
if ( !sh->IsCoherent(l) ) // just be sure (?)
{
std::cout << "Files are not coherent. Stop everything " << std::endl;
- delete sh;
+ sh->Delete();
return 0;
}
}
<< elemsToOrderOn[2*ri+1]
<< std::endl;
- e1= f1->gdcm::Document::GetDataEntry( elemsToOrderOn[2*ri],
- elemsToOrderOn[2*ri+1]);
+ e1= f1->GetDataEntry( elemsToOrderOn[2*ri],
+ elemsToOrderOn[2*ri+1]);
- e2= f2->gdcm::Document::GetDataEntry( elemsToOrderOn[2*ri],
+ e2= f2->GetDataEntry( elemsToOrderOn[2*ri],
elemsToOrderOn[2*ri+1]);
if(!e2 || !e2)
{