From 0b51b4e0e44ae93bc59a2d313ed465e7585cbf6a Mon Sep 17 00:00:00 2001 From: jpr Date: Wed, 4 Mar 2009 08:57:40 +0000 Subject: [PATCH] fix mistyping --- Example/CMakeLists.txt | 6 ++++ Example/PrintFile.cxx | 66 ++++++++++++++++++++++++++++++++++++++++-- src/gdcmTS.cxx | 6 ++-- 3 files changed, 72 insertions(+), 6 deletions(-) diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt index 760f81f2..df209e4c 100644 --- a/Example/CMakeLists.txt +++ b/Example/CMakeLists.txt @@ -9,6 +9,7 @@ SET(EXAMPLE_SOURCES #Txt2Mat #exDicomRTStructSetFile #exExtractCSA + exReadPapyrus exReadWriteFile exColorToRGB @@ -29,6 +30,7 @@ SET(EXAMPLE_SOURCES # the following are utilities #---------------------------- + #BrukerToMhd RawToInTagDicom RawToDicomStack PrintDicomDir @@ -46,6 +48,10 @@ SET(EXAMPLE_SOURCES RawToDicom TestValidate + SplitIntoDirectories + SplitIntoXCoherentDirectories + SplitIntoXCoherentDirectoriesIgnoreSerieUID + # the following produce usable files for some softwares. #------------------------------------------------------ ToMRIregister diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 0f3e82ea..a89c6260 100644 --- a/Example/PrintFile.cxx +++ b/Example/PrintFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PrintFile.cxx,v $ Language: C++ - Date: $Date: 2008/05/20 09:21:22 $ - Version: $Revision: 1.91 $ + Date: $Date: 2009/03/04 08:57:40 $ + Version: $Revision: 1.92 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -439,6 +439,8 @@ if (!noex) if (ori != "\\" ) std::cout << "Orientation [" << ori << "]" << std::endl; o->Delete(); + + /* std::vector valueVector; GDCM_NAME_SPACE::DataEntry *e_0018_5212 = f->GetDataEntry(0x0018, 0x5212); @@ -452,7 +454,65 @@ if (resJP) { } //e_0018_5212->Delete(); */ - + + +/* ----------------------------- + +// Try : +std::cout << std::endl << std::endl << "===========Try Get Numerical =======" + << std::endl; +GDCM_NAME_SPACE::DataEntry *e; +bool res; +std::vector vd; + +// Transfert Syntax +e=f->GetDataEntry(0x0002,0x0010); +if (e){ + res=e->GetNumerical(vd); + if (!res){ + std::cout << "0x0002,0x0010 not numerical, size =" << vd.size() << std::endl; + } +} +// Columns +e=f->GetDataEntry(0x0028,0x0011); +if (e){ + res=e->GetNumerical(vd); + if (!res){ + std::cout << "0x0028,0x0011 not numerical, size =" << vd.size() << std::endl; + } else { + std::cout << "0x0028,0x0011 numerical, size =" << vd.size() << std::endl; + std::cout << vd[0]<< std::endl; + } +} +// Im Orient (Pat) +e=f->GetDataEntry(0x0020,0x0032); +if (e){ + res=e->GetNumerical(vd); + if (!res){ + std::cout << "0x0020,0x0032 not numerical, size =" << vd.size() << std::endl; + } else { + std::cout << "0x0020,0x0032 numerical, size =" << vd.size() << std::endl; + for(int l=0; l