From: jpr Date: Thu, 20 Jan 2005 11:39:49 +0000 (+0000) Subject: General .h typo unification X-Git-Tag: Version1.0.bp~236 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b21d001c8abe8aec991946adfd4c899500122304;p=gdcm.git General .h typo unification --- diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 233a3d11..c5cbc8dc 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2005/01/15 20:24:02 $ - Version: $Revision: 1.50 $ + Date: $Date: 2005/01/20 11:39:49 $ + Version: $Revision: 1.51 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -90,15 +90,15 @@ GDCM_EXPORT extern const std::string GDCM_UNREAD; /// \brief TagKey is made to hold an "universal" (as in URL, Universal /// Ressource Locator) key to a DocEntry i.e. a dicom tag. -/// A dicom tag always has a group and an element, but a set of tags +/// A dicom tag always has a group and an elem, but a set of tags /// embeded in various (optionally nested) sequences and sharing -/// the same group and element all share the same (group, element) -/// "identifier". Hence the (group, element) cannot be used as an +/// the same group and elem all share the same (group, elem) +/// "identifier". Hence the (group, elem) cannot be used as an /// identifier (in gdcm we shall refer to a "TagKey") of a tag. /// In order to construct a proper tag identifier (i.e. a key) we /// consider the following definition of a TagKey: /// - let Group, Element be the string representation of the -/// group and element dicom tag members, +/// group and elem dicom tag members, /// - let ItemNumber be the string representation of the integer /// index of the considered item number of a sequence, /// Let the key of a tag embeded in a sequence, noted SeqTag, be diff --git a/src/gdcmDict.h b/src/gdcmDict.h index ab03c709..8f9f0bb7 100644 --- a/src/gdcmDict.h +++ b/src/gdcmDict.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDict.h,v $ Language: C++ - Date: $Date: 2005/01/18 07:49:41 $ - Version: $Revision: 1.33 $ + Date: $Date: 2005/01/20 11:39:49 $ + Version: $Revision: 1.34 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -61,10 +61,10 @@ public: bool AddNewEntry (DictEntry const &newEntry); bool ReplaceEntry(DictEntry const &newEntry); bool RemoveEntry (TagKey const &key); - bool RemoveEntry (uint16_t group, uint16_t element); + bool RemoveEntry (uint16_t group, uint16_t elem); // Tag - DictEntry *GetDictEntry(uint16_t group, uint16_t element); + DictEntry *GetDictEntry(uint16_t group, uint16_t elem); // EntryNamesList *GetDictEntryNames(); // EntryNamesByCatMap *GetDictEntryNamesByCategory(); diff --git a/src/gdcmDictEntry.h b/src/gdcmDictEntry.h index 5fc005d9..f78d4f07 100644 --- a/src/gdcmDictEntry.h +++ b/src/gdcmDictEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictEntry.h,v $ Language: C++ - Date: $Date: 2005/01/16 04:50:41 $ - Version: $Revision: 1.30 $ + Date: $Date: 2005/01/20 11:39:49 $ + 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 @@ -41,7 +41,7 @@ class GDCM_EXPORT DictEntry : public Base { public: DictEntry(uint16_t group, - uint16_t element, + uint16_t elem, TagName const &vr = GDCM_UNKNOWN, TagName const &vm = GDCM_UNKNOWN, TagName const &name = GDCM_UNKNOWN); @@ -50,7 +50,7 @@ public: void Print(std::ostream &os = std::cout, std::string const &indent = ""); // Key creation - static TagKey TranslateToKey(uint16_t group, uint16_t element); + static TagKey TranslateToKey(uint16_t group, uint16_t elem); // Content of DictEntry void SetVR(TagName const &vr); @@ -96,9 +96,9 @@ public: private: /// \todo FIXME - /// where are the group and element used except from building up + /// where are the group and elem used except from building up /// a TagKey. If the answer is nowhere then there is no need - /// to store the group and element independently. + /// to store the group and elem independently. /// /// --> EVERYWHERE ! The alternate question would be : /// What's TagKey used for ? @@ -168,7 +168,7 @@ private: /// e.g. "Patient's Name" TagName Name; - /// Redundant with (group, element) but we add it for efficiency purpose. + /// Redundant with (group, elem) but we add it for efficiency purpose. TagKey Key; }; } // end namespace gdcm diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index c6daed31..667a0434 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2005/01/18 07:50:58 $ - Version: $Revision: 1.38 $ + Date: $Date: 2005/01/20 11:39:49 $ + Version: $Revision: 1.39 $ 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 @@ public: // \warning : not end user intended // Dict *GetVirtualDict() { return &VirtualEntry; }; - DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element, + DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t elem, TagName vr = GDCM_UNKNOWN, TagName vm = GDCM_UNKNOWN, TagName name = GDCM_UNKNOWN); diff --git a/src/gdcmDocEntryArchive.h b/src/gdcmDocEntryArchive.h index 98d30d7d..bc677476 100644 --- a/src/gdcmDocEntryArchive.h +++ b/src/gdcmDocEntryArchive.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntryArchive.h,v $ Language: C++ - Date: $Date: 2005/01/11 15:15:38 $ - Version: $Revision: 1.4 $ + Date: $Date: 2005/01/20 11:39:49 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -43,8 +43,8 @@ public: void Print(std::ostream &os = std::cout); bool Push(DocEntry *newEntry); - bool Push(uint16_t group,uint16_t element); - bool Restore(uint16_t group,uint16_t element); + bool Push(uint16_t group,uint16_t elem); + bool Restore(uint16_t group,uint16_t elem); void ClearArchive(void); diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index 14dea485..2ffa021a 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.cxx,v $ Language: C++ - Date: $Date: 2005/01/08 15:03:59 $ - Version: $Revision: 1.41 $ + Date: $Date: 2005/01/20 11:39:49 $ + Version: $Revision: 1.42 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -121,8 +121,8 @@ SeqEntry* DocEntrySet::NewSeqEntry(uint16_t group,uint16_t elem) } /** - * \brief Searches both the public and the shadow dictionary (when they - * exist) for the presence of the DictEntry with given + * \brief Searches [both] the public [and the shadow dictionary (when they + * exist)] for the presence of the DictEntry with given * group and element. The public dictionary has precedence on the * shadow one. * @param group group number of the searched DictEntry @@ -144,6 +144,16 @@ DictEntry *DocEntrySet::GetDictEntry(uint16_t group,uint16_t elem) return found; } + +/** + * \brief Searches both the public and the shadow dictionary (when they + * exist) for the presence of the DictEntry with given + * group and element, and create a new virtual DictEntry if necessary + * @param group group number of the searched DictEntry + * @param elem element number of the searched DictEntry + * @param vr Value Representation to use, if necessary + * @return Corresponding DictEntry when it exists, NULL otherwise. + */ DictEntry *DocEntrySet::GetDictEntry(uint16_t group, uint16_t elem, TagName const & vr) { diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 055548d1..4c5fd14a 100644 --- a/src/gdcmDocEntrySet.h +++ b/src/gdcmDocEntrySet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.h,v $ Language: C++ - Date: $Date: 2005/01/19 10:30:51 $ - Version: $Revision: 1.38 $ + Date: $Date: 2005/01/20 11:39:49 $ + Version: $Revision: 1.39 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -72,37 +72,37 @@ public: virtual bool RemoveEntry(DocEntry *EntryToRemove)=0; /// \brief Removes any type of entry out of the entry set, DOESN'T destroy it - virtual bool RemoveEntryNoDestroy(DocEntry *EntryToRemove)=0; + virtual bool RemoveEntryNoDestroy(DocEntry *EntryToRemove)= 0; /// \brief write any type of entry to the entry set virtual void WriteContent (std::ofstream *fp, FileType filetype) = 0; - /// \brief Gets any type of DocEntry, identified by its (group,element) + /// \brief Gets any type of DocEntry, identified by its (group,elem) virtual DocEntry *GetDocEntry(uint16_t group, uint16_t elem) = 0; - /// \brief Gets a ValEntry, identified by its (group,element) + /// \brief Gets a ValEntry, identified by its (group,elem) virtual ValEntry *GetValEntry(uint16_t group, uint16_t elem) = 0; - /// \brief Gets a BinEntry, identified by its (group,element) + /// \brief Gets a BinEntry, identified by its (group,elem) virtual BinEntry *GetBinEntry(uint16_t group, uint16_t elem) = 0; - /// \brief Gets a SeqEntry, identified by its (group,element) + /// \brief Gets a SeqEntry, identified by its (group,elem) virtual SeqEntry *GetSeqEntry(uint16_t group, uint16_t elem) = 0; /// \brief Gets the 'string value' of a ValEntry - /// identified by its (group,element) - Sorry for the name !...- + /// identified by its (group,elem) - Sorry for the name !...- virtual std::string GetEntry(uint16_t group, uint16_t elem) = 0; DictEntry *NewVirtualDictEntry(uint16_t group, - uint16_t element, + uint16_t elem, TagName const &vr = GDCM_UNKNOWN, TagName const &vm = GDCM_UNKNOWN, TagName const &name = GDCM_UNKNOWN ); - + protected: // DocEntry related utilities diff --git a/src/gdcmFile.h b/src/gdcmFile.h index f958d9a2..c26b8327 100644 --- a/src/gdcmFile.h +++ b/src/gdcmFile.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.h,v $ Language: C++ - Date: $Date: 2005/01/16 04:50:42 $ - Version: $Revision: 1.94 $ + Date: $Date: 2005/01/20 11:39:49 $ + Version: $Revision: 1.95 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -87,13 +87,13 @@ public: bool Write (std::string const &fileName); bool SetEntry(std::string const &content, - uint16_t group, uint16_t element); + uint16_t group, uint16_t elem); bool SetEntry(uint8_t *content, int lgth, - uint16_t group, uint16_t element); + uint16_t group, uint16_t elem); bool ReplaceOrCreate(std::string const &content, - uint16_t group, uint16_t element); + uint16_t group, uint16_t elem); bool ReplaceOrCreate(uint8_t *binArea, int lgth, - uint16_t group, uint16_t element); + uint16_t group, uint16_t elem); uint8_t* GetLutRGBA(); @@ -127,8 +127,8 @@ protected: void SetWriteToNoLibido(); void RestoreWriteOfLibido(); - ValEntry *CopyValEntry(uint16_t group,uint16_t element); - BinEntry *CopyBinEntry(uint16_t group,uint16_t element); + ValEntry *CopyValEntry(uint16_t group,uint16_t elem); + BinEntry *CopyBinEntry(uint16_t group,uint16_t elem); private: void Initialise(); diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index fa95e414..bbd3ea4c 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/19 15:58:00 $ - Version: $Revision: 1.235 $ + Date: $Date: 2005/01/20 11:39:49 $ + Version: $Revision: 1.236 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -1330,7 +1330,7 @@ void Header::InitializeDefaultHeader() std::string date = Util::GetCurrentDate(); std::string time = Util::GetCurrentTime(); - std::string uid = Util::CreateUniqueUID(); + std::string uid = Util::CreateUniqueUID(); std::string uidMedia = uid; std::string uidClass = uid + ".1"; std::string uidInst = uid + ".10"; @@ -1341,6 +1341,7 @@ void Header::InitializeDefaultHeader() { "146 ", 0x0002, 0x0000}, // Meta Element Group Length // FIXME: how to recompute ? { "1.2.840.10008.5.1.4.1.1.2", 0x0002, 0x0002}, // Media Storage SOP Class UID (CT Image Storage) { uidClass.c_str(), 0x0002, 0x0003}, // Media Storage SOP Instance UID + { "1.2.840.10008.1.2.1 ", 0x0002, 0x0010}, // Transfer Syntax UID (Explicit VR Little Endian) { uidClass.c_str(), 0x0002, 0x0012}, // META Implementation Class UID { "GDCM", 0x0002, 0x0016}, // Source Application Entity Title diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h index ae3fd124..e7c230ac 100644 --- a/src/gdcmSQItem.h +++ b/src/gdcmSQItem.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.h,v $ Language: C++ - Date: $Date: 2005/01/19 08:55:10 $ - Version: $Revision: 1.33 $ + Date: $Date: 2005/01/20 11:39:49 $ + Version: $Revision: 1.34 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -55,15 +55,15 @@ public: bool RemoveEntry(DocEntry *EntryToRemove); bool RemoveEntryNoDestroy(DocEntry *EntryToRemove); - DocEntry *GetDocEntry(uint16_t group, uint16_t element); - ValEntry *GetValEntry(uint16_t group, uint16_t element); - BinEntry *GetBinEntry(uint16_t group, uint16_t element); - SeqEntry *GetSeqEntry(uint16_t group, uint16_t element); + DocEntry *GetDocEntry(uint16_t group, uint16_t elem); + ValEntry *GetValEntry(uint16_t group, uint16_t elem); + BinEntry *GetBinEntry(uint16_t group, uint16_t elem); + SeqEntry *GetSeqEntry(uint16_t group, uint16_t elem); bool SetEntry(std::string const &val, uint16_t group, - uint16_t element); + uint16_t elem); - std::string GetEntry(uint16_t group, uint16_t element); + std::string GetEntry(uint16_t group, uint16_t elem); /// \brief returns the ordinal position of a given SQItem int GetSQItemNumber() { return SQItemNumber; };