From: jpr Date: Mon, 17 Jan 2005 11:13:21 +0000 (+0000) Subject: 'Dictionnary' is now spelt 'Dictionary', X-Git-Tag: Version1.0.bp~296 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2f79ae87219e7b7433eb89f71d2f05a03f60af69;p=gdcm.git 'Dictionnary' is now spelt 'Dictionary', 'wether' is now spelt 'whether' and so on --- diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index e8ad7f97..5d1a7826 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDict.cxx,v $ Language: C++ - Date: $Date: 2005/01/16 04:50:41 $ - Version: $Revision: 1.64 $ + Date: $Date: 2005/01/17 11:13:21 $ + Version: $Revision: 1.65 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -32,7 +32,7 @@ void FillDefaultDataDict(Dict *d); /** * \brief Constructor */ -Dict::Dict(void) +Dict::Dict( ) { Filename=""; } @@ -198,10 +198,10 @@ bool Dict::RemoveEntry (uint16_t group, uint16_t elem) } /** - * \brief Get the dictionnary entry identified by a given tag (group,element) + * \brief Get the dictionary entry identified by a given tag (group,element) * @param group group of the entry to be found * @param elem element of the entry to be found - * @return the corresponding dictionnary entry when existing, NULL otherwise + * @return the corresponding dictionary entry when existing, NULL otherwise */ DictEntry *Dict::GetDictEntry(uint16_t group, uint16_t elem) { @@ -215,10 +215,10 @@ DictEntry *Dict::GetDictEntry(uint16_t group, uint16_t elem) } /** - * \brief Consider all the entries of the public dicom dictionnary. + * \brief Consider all the entries of the public dicom dictionary. * Build all list of all the tag names of all those entries. * \sa DictSet::GetPubDictTagNamesByCategory - * @return A list of all entries of the public dicom dictionnary. + * @return A list of all entries of the public dicom dictionary. */ @@ -237,26 +237,26 @@ DictEntry *Dict::GetDictEntry(uint16_t group, uint16_t elem) /** * \ingroup Dict - * \brief Consider all the entries of the public dicom dictionnary. + * \brief Consider all the entries of the public dicom dictionary. * Build an hashtable whose keys are the names of the groups * (fourth field in each line of dictionary) and whose corresponding - * values are lists of all the dictionnary entries among that + * values are lists of all the dictionary entries among that * group. Note that apparently the Dicom standard doesn't explicitely * define a name (as a string) for each group. * A typical usage of this method would be to enable a dynamic * configuration of a Dicom file browser: the admin/user can * select in the interface which Dicom tags should be displayed. * \warning Dicom *doesn't* define any name for any 'categorie' - * (the dictionnary fourth field was formerly NIH defined + * (the dictionary fourth field was formerly NIH defined * - and no longer he is- * and will be removed when Dicom provides us a text file - * with the 'official' Dictionnary, that would be more friendly - * than asking us to perform a line by line check of the dictionnary + * with the 'official' Dictionary, that would be more friendly + * than asking us to perform a line by line check of the dictionary * at the beginning of each year to -try to- guess the changes) * Therefore : please NEVER use that fourth field :-( * * @return An hashtable: whose keys are the names of the groups and whose - * corresponding values are lists of all the dictionnary entries + * corresponding values are lists of all the dictionary entries * among that group. */ @@ -283,7 +283,7 @@ void Dict::InitTraversal() } /** - * \brief Get the next entry whil visiting the Hash table (KeyHt) + * \brief Get the next entry while visiting the Hash table (KeyHt) * \return The next DictEntry if found, otherwhise NULL */ DictEntry *Dict::GetNextEntry() diff --git a/src/gdcmDocEntryArchive.cxx b/src/gdcmDocEntryArchive.cxx index c47596ef..60e0f2d9 100644 --- a/src/gdcmDocEntryArchive.cxx +++ b/src/gdcmDocEntryArchive.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntryArchive.cxx,v $ Language: C++ - Date: $Date: 2005/01/11 00:21:48 $ - Version: $Revision: 1.6 $ + Date: $Date: 2005/01/17 11:13:21 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -64,9 +64,9 @@ void DocEntryArchive::Print(std::ostream &os) // Public /** * \brief Replace in the Header a DocEntry by the new DocEntry. The last - * DocEntry is kept in archieve + * DocEntry is kept in archive * @param newEntry New entry to substitute to an other entry of the Header - * @return FALSE when an other DocEntry is already archieved with the same + * @return FALSE when an other DocEntry is already archived with the same * generalized key, TRUE otherwise */ bool DocEntryArchive::Push(DocEntry *newEntry) @@ -103,13 +103,13 @@ bool DocEntryArchive::Push(DocEntry *newEntry) * \brief Replace in the Header a DocEntry by the new DocEntry. The last * DocEntry is kept in archieve * @param group Group number of the Entry - * @param element Element number of the Entry - * @return FALSE when an other DocEntry is already archieved with the same + * @param elem Element number of the Entry + * @return FALSE when an other DocEntry is already archived with the same * generalized key, TRUE otherwise */ -bool DocEntryArchive::Push(uint16_t group,uint16_t element) +bool DocEntryArchive::Push(uint16_t group,uint16_t elem) { - std::string key = DictEntry::TranslateToKey(group,element); + std::string key = DictEntry::TranslateToKey(group,elem); if( Archive.find(key)==Archive.end() ) { @@ -130,13 +130,13 @@ bool DocEntryArchive::Push(uint16_t group,uint16_t element) * \brief Restore in the Header the DocEntry that have the generalized key. * The old entry is destroyed. * @param group Group number of the Entry - * @param element Element number of the Entry - * @return FALSE when the generalized key isn't in the archieve, + * @param elem Element number of the Entry + * @return FALSE when the generalized key isn't in the archive, * TRUE otherwise */ -bool DocEntryArchive::Restore(uint16_t group,uint16_t element) +bool DocEntryArchive::Restore(uint16_t group,uint16_t elem) { - std::string key=DictEntry::TranslateToKey(group,element); + std::string key=DictEntry::TranslateToKey(group,elem); TagDocEntryHT::iterator restoreIt=Archive.find(key); if( restoreIt!=Archive.end() ) @@ -164,10 +164,10 @@ bool DocEntryArchive::Restore(uint16_t group,uint16_t element) } /** - * \brief Remove all DocEntry that are in the archive. The entries aren't - * restored but only destroyed. + * \brief Remove all DocEntry that are in the archive. + * The entries aren't restored but only destroyed. */ -void DocEntryArchive::ClearArchive(void) +void DocEntryArchive::ClearArchive( ) { for(TagDocEntryHT::iterator it = Archive.begin(); it!=Archive.end(); diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index cab302f3..2830ff3c 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmHeader.cxx,v $ Language: C++ - Date: $Date: 2005/01/14 15:06:37 $ - Version: $Revision: 1.232 $ + Date: $Date: 2005/01/17 11:13:21 $ + Version: $Revision: 1.233 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -848,7 +848,7 @@ int Header::GetHighBitPosition() } /** - * \brief Check wether the pixels are signed or UNsigned data. + * \brief Check whether the pixels are signed or UNsigned data. * \warning The method defaults to false (UNsigned) when information is Missing. * The responsability of checking this value is left to the caller. * @return True when signed, false when UNsigned @@ -906,7 +906,7 @@ int Header::GetSamplesPerPixel() } /** - * \brief Check wether this a monochrome picture or not by accessing + * \brief Check whether this a monochrome picture or not by accessing * the "Photometric Interpretation" tag ( 0x0028, 0x0004 ). * @return true when "MONOCHROME1" or "MONOCHROME2". False otherwise. */ @@ -926,7 +926,7 @@ bool Header::IsMonochrome() } /** - * \brief Check wether this a "PALETTE COLOR" picture or not by accessing + * \brief Check whether this a "PALETTE COLOR" picture or not by accessing * the "Photometric Interpretation" tag ( 0x0028, 0x0004 ). * @return true when "PALETTE COLOR". False otherwise. */ @@ -945,7 +945,7 @@ bool Header::IsPaletteColor() } /** - * \brief Check wether this a "YBR_FULL" color picture or not by accessing + * \brief Check whether this a "YBR_FULL" color picture or not by accessing * the "Photometric Interpretation" tag ( 0x0028, 0x0004 ). * @return true when "YBR_FULL". False otherwise. */ diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 08465ea8..a0fc0bcf 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.cxx,v $ Language: C++ - Date: $Date: 2005/01/16 04:50:42 $ - Version: $Revision: 1.43 $ + Date: $Date: 2005/01/17 11:13:21 $ + 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 @@ -21,6 +21,7 @@ #include "gdcmTS.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" #include #include @@ -114,7 +115,7 @@ void SeqEntry::Print( std::ostream &os, std::string const & ) else { // fuse - os << " -------------- should have a sequence terminator item"; + gdcmVerboseMacro(" -------- should have a sequence terminator item"); } } } diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index 5271e16b..57e1ce08 100644 --- a/src/gdcmVR.cxx +++ b/src/gdcmVR.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmVR.cxx,v $ Language: C++ - Date: $Date: 2005/01/11 00:21:49 $ - Version: $Revision: 1.31 $ + Date: $Date: 2005/01/17 11:13:21 $ + Version: $Revision: 1.32 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -106,15 +106,12 @@ int VR::Count(VRKey const &key) //----------------------------------------------------------------------------- /** - * \brief Simple predicate that checks wether the given argument + * \brief Simple predicate that checks whether the given argument * corresponds to the Value Representation of a \ref BinEntry . * @param tested value representation to check for. */ bool VR::IsVROfBinaryRepresentable(VRKey const &tested) { - //std::cout << "VR::IsVROfGdcmBinaryRepresentable====================" - // << tested << std::endl; - if ( tested == GDCM_UNKNOWN) return true; @@ -128,10 +125,10 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested) } /** - * \brief Simple predicate that checks wether the given argument + * \brief Simple predicate that checks whether the given argument * corresponds to the Value Representation of a \ref ValEntry * but NOT a \ref BinEntry. - * @param tested value representation to check for. + * @param tested value representation to be checked. */ bool VR::IsVROfStringRepresentable(VRKey const &tested) { @@ -156,7 +153,7 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested) } /** - * \brief Simple predicate that checks wether the given argument + * \brief Simple predicate that checks whether the given argument * corresponds to the Value Representation of a \ref SeqEntry * @param tested value representation to check for. */