X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vtk%2FvtkgdcmSerieViewer.cxx;h=a7b0b1019ac4017b4e2f8fb4abc43f1631acfa85;hb=1b14200990537794a9f66d43c89b030459237edc;hp=fbf81e162e1adfae99e6c0b577fb667efa8d3a8c;hpb=5758e7a32e43659101e063e8469c3eaba986061c;p=gdcm.git diff --git a/vtk/vtkgdcmSerieViewer.cxx b/vtk/vtkgdcmSerieViewer.cxx index fbf81e16..a7b0b101 100644 --- a/vtk/vtkgdcmSerieViewer.cxx +++ b/vtk/vtkgdcmSerieViewer.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkgdcmSerieViewer.cxx,v $ Language: C++ - Date: $Date: 2005/09/07 08:21:28 $ - Version: $Revision: 1.11 $ + Date: $Date: 2005/10/18 08:35:55 $ + Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -43,7 +43,7 @@ #include "gdcmDocument.h" // for NO_SHADOWSEQ #include "gdcmSerieHelper.h" #include "gdcmDebug.h" -#include "gdcmValEntry.h" +#include "gdcmDataEntry.h" #include "gdcmArgMgr.h" // for Argument Manager functions #include // for strcmp @@ -453,17 +453,17 @@ bool userSuppliedLessThanFunction(gdcm::File *f1, gdcm::File *f2) // for *this* user supplied function, I supposed only ValEntries are checked. // std::string s1, s2; - gdcm::ValEntry *e1,*e2; + gdcm::DataEntry *e1,*e2; for (int ri=0; rigdcm::Document::GetValEntry( elemsToOrderOn[2*ri], + e1= f1->gdcm::Document::GetDataEntry( elemsToOrderOn[2*ri], elemsToOrderOn[2*ri+1]); - e2= f2->gdcm::Document::GetValEntry( elemsToOrderOn[2*ri], + e2= f2->gdcm::Document::GetDataEntry( elemsToOrderOn[2*ri], elemsToOrderOn[2*ri+1]); if(!e2 || !e2) { @@ -472,8 +472,8 @@ bool userSuppliedLessThanFunction(gdcm::File *f1, gdcm::File *f2) << " not found" << std::endl; continue; } - s1 = e1->gdcm::ValEntry::GetValue(); - s2 = e2->gdcm::ValEntry::GetValue(); + s1 = e1->GetString(); + s2 = e2->GetString(); std::cout << "[" << s1 << "] vs [" << s2 << "]" << std::endl; if ( s1 < s2 ) return true;