From a2040ffd26fc9a3c835b6c45b92a808f1d001b36 Mon Sep 17 00:00:00 2001 From: regrain Date: Wed, 5 Jan 2005 15:38:27 +0000 Subject: [PATCH] * src/gdcmCommon.h : add the GDCM_UNKNOWN constant. This constant is to replace the different values "??", "Unkn", "Unknown". * src/gdcmDicomDirElement.h, gdcmDictEntry.h, gdcmDictSet.h, gdcmDocEntry.cxx, gdcmDocEntrySet.[h|cxx], gdcmDocument.h, gdcmSQItem.cxx, gdcmVR.cxx : use the GDCM_UNKNOWN constant. * Appears a bug in gdcmDictEntry : IsVRUnknown always returns false... bad -- BeNours --- ChangeLog | 8 ++++++++ Example/TestFromScratch.cxx | 6 +++--- src/gdcmCommon.h | 5 +++-- src/gdcmDicomDirElement.h | 5 ++--- src/gdcmDictEntry.h | 10 +++++----- src/gdcmDictSet.h | 10 +++++----- src/gdcmDocEntry.cxx | 6 +++--- src/gdcmDocEntrySet.cxx | 6 +++--- src/gdcmDocEntrySet.h | 10 +++++----- src/gdcmDocument.h | 8 ++++---- src/gdcmSQItem.cxx | 6 +++--- src/gdcmVR.cxx | 6 +++--- 12 files changed, 47 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59c1a0e9..70a2ccb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-05 Benoit Regrain + * src/gdcmCommon.h : add the GDCM_UNKNOWN constant. This constant is to + replace the different values "??", "Unkn", "Unknown". + * src/gdcmDicomDirElement.h, gdcmDictEntry.h, gdcmDictSet.h, + gdcmDocEntry.cxx, gdcmDocEntrySet.[h|cxx], gdcmDocument.h, gdcmSQItem.cxx, + gdcmVR.cxx : use the GDCM_UNKNOWN constant. + * Appears a bug in gdcmDictEntry : IsVRUnknown always returns false... bad + 2004-12-16 Benoit Regrain * src/gdcmBase.[h|cxx] : new base class. Contains the PrintLevel and an empty Print Method diff --git a/Example/TestFromScratch.cxx b/Example/TestFromScratch.cxx index 228c52a4..35851cde 100644 --- a/Example/TestFromScratch.cxx +++ b/Example/TestFromScratch.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestFromScratch.cxx,v $ Language: C++ - Date: $Date: 2004/12/10 17:10:22 $ - Version: $Revision: 1.3 $ + Date: $Date: 2005/01/05 15:38:28 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) if ( gdcm::ValEntry* v = dynamic_cast(d) ) { // Do not bother with field from private dict - if( v->GetName() != "unkn" ) + if( v->GetName() != "gdcm::Unknown" ) { h2->ReplaceOrCreateByNumber( v->GetValue(), diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index ec41506b..d7e55592 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2004/11/30 17:14:12 $ - Version: $Revision: 1.42 $ + Date: $Date: 2005/01/05 15:38:28 $ + Version: $Revision: 1.43 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -87,6 +87,7 @@ namespace gdcm #define DICT_TS "dicomTS.dic" #define DICT_VR "dicomVR.dic" +const std::string GDCM_UNKNOWN = "gdcm::Unknown"; const std::string GDCM_UNFOUND = "gdcm::Unfound"; const std::string GDCM_BINLOADED = "gdcm::Binary data loaded"; const std::string GDCM_NOTLOADED = "gdcm::NotLoaded"; diff --git a/src/gdcmDicomDirElement.h b/src/gdcmDicomDirElement.h index 859ce407..8a17cbed 100644 --- a/src/gdcmDicomDirElement.h +++ b/src/gdcmDicomDirElement.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirElement.h,v $ Language: C++ - Date: $Date: 2004/12/16 13:46:36 $ - Version: $Revision: 1.16 $ + Date: $Date: 2005/01/05 15:38:28 $ + Version: $Revision: 1.17 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -116,7 +116,6 @@ private: /// Elements chained list, related to the SerieElements of DICOMDIR ListDicomDirSerieElem DicomDirSerieList; /// Elements chained list, related to the ImageElements of DICOMDIR - ListDicomDirImageElem DicomDirImageList; }; } // end namespace gdcm diff --git a/src/gdcmDictEntry.h b/src/gdcmDictEntry.h index 37c602ef..3448e495 100644 --- a/src/gdcmDictEntry.h +++ b/src/gdcmDictEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictEntry.h,v $ Language: C++ - Date: $Date: 2004/12/16 13:46:37 $ - Version: $Revision: 1.21 $ + Date: $Date: 2005/01/05 15:38:28 $ + 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 @@ -40,9 +40,9 @@ class GDCM_EXPORT DictEntry : public Base public: DictEntry(uint16_t group, uint16_t element, - TagName const & vr = "Unknown", - TagName const & fourth = "Unknown", - TagName const & name = "Unknown"); + TagName const & vr = GDCM_UNKNOWN, + TagName const & fourth = GDCM_UNKNOWN, + TagName const & name = GDCM_UNKNOWN); static TagKey TranslateToKey(uint16_t group, uint16_t element); diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index b2be826a..89b1ff88 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2004/12/16 13:46:37 $ - Version: $Revision: 1.30 $ + Date: $Date: 2005/01/05 15:38:28 $ + Version: $Revision: 1.31 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -62,9 +62,9 @@ public: // Dict* GetVirtualDict() { return &VirtualEntry; }; DictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element, - TagName vr = "Unknown", - TagName fourth = "Unknown", - TagName name = "Unknown"); + TagName vr = GDCM_UNKNOWN, + TagName fourth = GDCM_UNKNOWN, + TagName name = GDCM_UNKNOWN); static std::string BuildDictPath(); diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index db3461fe..6ada3fad 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2004/12/16 13:46:37 $ - Version: $Revision: 1.35 $ + Date: $Date: 2005/01/05 15:38:28 $ + Version: $Revision: 1.36 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -163,7 +163,7 @@ void DocEntry::WriteContent(std::ofstream* fp, FileType filetype) uint16_t z = 0; uint16_t shortLgr = lgr; - if (vr == "unkn") + if (vr == GDCM_UNKNOWN) { // Unknown was 'written' // deal with Little Endian diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index 5835a8f3..0d69d025 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.cxx,v $ Language: C++ - Date: $Date: 2004/12/03 20:16:58 $ - Version: $Revision: 1.27 $ + Date: $Date: 2005/01/05 15:38:28 $ + Version: $Revision: 1.28 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -236,7 +236,7 @@ DocEntry *DocEntrySet::NewDocEntryByName(TagName const & name) DictEntry *newTag = pubDict->GetDictEntryByName(name); if (!newTag) { - newTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "unkn", name); + newTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", GDCM_UNKNOWN, name); } DocEntry* newEntry = new DocEntry(newTag); diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 32d99e19..0cf434ff 100644 --- a/src/gdcmDocEntrySet.h +++ b/src/gdcmDocEntrySet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.h,v $ Language: C++ - Date: $Date: 2004/12/16 13:46:37 $ - Version: $Revision: 1.29 $ + Date: $Date: 2005/01/05 15:38:28 $ + Version: $Revision: 1.30 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -77,9 +77,9 @@ public: std::string GetEntryByName(TagName const & name); DictEntry* NewVirtualDictEntry( uint16_t group, uint16_t element, - TagName const & vr = "unkn", - TagName const & fourth = "unkn", - TagName const & name = "unkn" ); + TagName const & vr = GDCM_UNKNOWN, + TagName const & fourth = GDCM_UNKNOWN, + TagName const & name = GDCM_UNKNOWN ); protected: // DocEntry related utilities diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 6a5538ae..490fbc74 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2004/12/16 11:37:02 $ - Version: $Revision: 1.69 $ + Date: $Date: 2005/01/05 15:38:28 $ + Version: $Revision: 1.70 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -145,11 +145,11 @@ public: ValEntry* ReplaceOrCreateByNumber(std::string const & value, uint16_t group, uint16_t elem, - TagName const & vr = "unkn"); + TagName const & vr = GDCM_UNKNOWN); BinEntry* ReplaceOrCreateByNumber(uint8_t* binArea, int lgth, uint16_t group, uint16_t elem, - TagName const & vr = "unkn"); + TagName const & vr = GDCM_UNKNOWN); SeqEntry* ReplaceOrCreateByNumber(uint16_t group, uint16_t elem); diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 399c466f..c2481956 100644 --- a/src/gdcmSQItem.cxx +++ b/src/gdcmSQItem.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.cxx,v $ Language: C++ - Date: $Date: 2004/12/16 13:46:37 $ - Version: $Revision: 1.43 $ + Date: $Date: 2005/01/05 15:38:28 $ + Version: $Revision: 1.44 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -196,7 +196,7 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, { dictEntry = Global::GetDicts()->NewVirtualDictEntry(group, element, - "UN", "??", "??"); + "UN", GDCM_UNKNOWN, GDCM_UNKNOWN); } // we assume the constructor didn't fail entry = new ValEntry(dictEntry); diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index 22e54fc6..65fefdb3 100644 --- a/src/gdcmVR.cxx +++ b/src/gdcmVR.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmVR.cxx,v $ Language: C++ - Date: $Date: 2004/11/16 14:48:19 $ - Version: $Revision: 1.23 $ + Date: $Date: 2005/01/05 15:38:28 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -117,7 +117,7 @@ bool VR::IsVROfGdcmBinaryRepresentable(VRKey const & tested) //std::cout << "VR::IsVROfGdcmBinaryRepresentable====================" // << tested << std::endl; - if ( tested == "unkn") + if ( tested == GDCM_UNKNOWN) return true; if ( ! Count(tested) ) -- 2.45.1