From ce71ebf1247644cdd76a7a65a5ff024cb380071b Mon Sep 17 00:00:00 2001 From: malaterre Date: Thu, 4 Nov 2004 15:59:37 +0000 Subject: [PATCH] ENH: Fixing bug in the dashboard, the code is buggy but I refuse to fix it. There seems to be a /after the last/ line read that broke my else check --- src/gdcmDicomDirElement.cxx | 20 +++++++------------- src/gdcmHeader.cxx | 8 ++++---- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx index 65c05e51..2769450b 100644 --- a/src/gdcmDicomDirElement.cxx +++ b/src/gdcmDicomDirElement.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirElement.cxx,v $ Language: C++ - Date: $Date: 2004/11/03 18:08:56 $ - Version: $Revision: 1.21 $ + Date: $Date: 2004/11/04 15:59:37 $ + Version: $Revision: 1.22 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -57,9 +57,9 @@ DicomDirElement::DicomDirElement() from.getline(buff, 1024, ' '); type = buff; - if( (type=="metaElem") || (type=="patientElem") || - (type=="studyElem") || (type=="serieElem") || - (type=="imageElem") ) + if( type == "metaElem" || type == "patientElem" || + type == "studyElem" || type == "serieElem" || + type == "imageElem" ) { from >> std::hex >> elem.Group >> elem.Elem; @@ -68,18 +68,12 @@ DicomDirElement::DicomDirElement() from >> std::ws; from.getline(buff, 1024, '"'); elem.Value = buff; - + AddNewEntry(type, elem); } - else - { - dbg.Error("DicomDirElement::DicomDirElement: Error parsing file", - filename.c_str()); - dbg.Error("Type", type.c_str(), " is not registered as valid" ); - } from.getline(buff, 1024, '\n'); } - from.close(); + from.close(); } } diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index 0b41ac10..c68aa171 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmHeader.cxx,v $ Language: C++ - Date: $Date: 2004/10/28 03:10:58 $ - Version: $Revision: 1.196 $ + Date: $Date: 2004/11/04 15:59:37 $ + Version: $Revision: 1.197 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -1170,7 +1170,7 @@ std::string Header::GetTransfertSyntaxName() */ void Header::SetImageDataSize(size_t ImageDataSize) { - ///FIXME I don't understand this code wh ydo we set two times 'car' ? + ///FIXME I don't understand this code why do we set two times 'car' ? std::string car = Util::Format("%d", ImageDataSize); DocEntry *a = GetDocEntryByNumber(GrPixel, NumPixel); @@ -1207,7 +1207,7 @@ bool Header::AnonymizeHeader() } else { - ReplaceOrCreateByNumber(std::string("anonymised"), 0x0010, 0x0010); + ReplaceOrCreateByNumber("anonymised", 0x0010, 0x0010); } } -- 2.48.1