From 8a3dd7efbcb545e7ed308eb7334b1e6dbbf40923 Mon Sep 17 00:00:00 2001 From: malaterre Date: Mon, 25 Oct 2004 03:35:19 +0000 Subject: [PATCH] STYLE: ivars should start with a capital letter. Accessors should be const to avoid people starting modifying stuff (since this is a ref). remove virtual as style specify sub class shouldn't reuse the keyword (2) --- src/gdcmDicomDirImage.cxx | 11 ++++----- src/gdcmDicomDirImage.h | 8 +++---- src/gdcmDicomDirMeta.cxx | 18 ++++++++------- src/gdcmDicomDirObject.cxx | 16 ++++++------- src/gdcmDicomDirObject.h | 10 ++++----- src/gdcmDicomDirPatient.cxx | 8 +++---- src/gdcmDicomDirSerie.cxx | 8 +++---- src/gdcmDicomDirStudy.cxx | 7 +++--- src/gdcmDocEntrySet.h | 22 +++++++++--------- src/gdcmDocument.cxx | 12 +++++----- src/gdcmSQItem.cxx | 44 +++++++++++++++++++----------------- src/gdcmSQItem.h | 45 ++++++++++++++++--------------------- 12 files changed, 103 insertions(+), 106 deletions(-) diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx index 7cbb2c0a..ba2134ab 100644 --- a/src/gdcmDicomDirImage.cxx +++ b/src/gdcmDicomDirImage.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirImage.cxx,v $ Language: C++ - Date: $Date: 2004/10/12 04:35:44 $ - Version: $Revision: 1.12 $ + Date: $Date: 2004/10/25 03:35:19 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,7 +21,6 @@ namespace gdcm { - //----------------------------------------------------------------------------- // Constructor / Destructor @@ -35,7 +34,7 @@ namespace gdcm DicomDirImage::DicomDirImage(SQItem *s, TagDocEntryHT *ptagHT): DicomDirObject(ptagHT) { - docEntries = s->GetDocEntries(); + DocEntries = s->GetDocEntries(); } /** @@ -66,7 +65,9 @@ DicomDirImage::~DicomDirImage() void DicomDirImage::Print(std::ostream &os) { os << "IMAGE : "; - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) + for(ListDocEntry::iterator i = DocEntries.begin(); + i!= DocEntries.end(); + ++i) { if( (*i)->GetGroup() == 0x0004 && (*i)->GetElement() == 0x1500 ) { diff --git a/src/gdcmDicomDirImage.h b/src/gdcmDicomDirImage.h index 59a9cbc6..a1e101f5 100644 --- a/src/gdcmDicomDirImage.h +++ b/src/gdcmDicomDirImage.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirImage.h,v $ Language: C++ - Date: $Date: 2004/10/12 04:35:44 $ - Version: $Revision: 1.10 $ + Date: $Date: 2004/10/25 03:35:19 $ + Version: $Revision: 1.11 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,9 +20,9 @@ #define GDCMDICOMIMAGE_H #include "gdcmDicomDirObject.h" + namespace gdcm { - //----------------------------------------------------------------------------- class GDCM_EXPORT DicomDirImage : public DicomDirObject { @@ -32,7 +32,7 @@ public: ~DicomDirImage(); - virtual void Print(std::ostream &os = std::cout); + void Print(std::ostream &os = std::cout); }; } // end namespace gdcm //----------------------------------------------------------------------------- diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx index 8c00a238..985d7516 100644 --- a/src/gdcmDicomDirMeta.cxx +++ b/src/gdcmDicomDirMeta.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirMeta.cxx,v $ Language: C++ - Date: $Date: 2004/10/22 03:05:40 $ - Version: $Revision: 1.13 $ + Date: $Date: 2004/10/25 03:35:19 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -53,8 +53,8 @@ void DicomDirMeta::Print(std::ostream& os) { os << "META" << std::endl; // warning : META doesn't behave exactly like a Objet - for (ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); + for (ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) (*i)->Print(); } @@ -70,10 +70,12 @@ void DicomDirMeta::Print(std::ostream& os) */ void DicomDirMeta::Write(std::ofstream* fp, FileType t) { - for (ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); - ++i) - (*i)->Write(fp, t); + for (ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); + ++i) + { + (*i)->Write(fp, t); + } } //----------------------------------------------------------------------------- diff --git a/src/gdcmDicomDirObject.cxx b/src/gdcmDicomDirObject.cxx index 0a623225..fca87916 100644 --- a/src/gdcmDicomDirObject.cxx +++ b/src/gdcmDicomDirObject.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirObject.cxx,v $ Language: C++ - Date: $Date: 2004/10/13 14:15:29 $ - Version: $Revision: 1.5 $ + Date: $Date: 2004/10/25 03:35:19 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -64,11 +64,11 @@ DicomDirObject::~DicomDirObject() TagDocEntryHT DicomDirObject::GetEntry() { TagDocEntryHT HT; - docEntries=GetDocEntries(); - for(ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); ++i) + DocEntries = GetDocEntries(); + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { - HT[(*i)->GetKey()]=*i; + HT[(*i)->GetKey()] = *i; } return HT; } @@ -79,11 +79,11 @@ TagDocEntryHT DicomDirObject::GetEntry() * \brief add the 'Object' related Dicom Elements to the listEntries * of a partially created DICOMDIR */ -void DicomDirObject::FillObject(ListDicomDirMetaElem elemList) +void DicomDirObject::FillObject(ListDicomDirMetaElem const & elemList) { // FillObject rempli le SQItem qui sera accroche au bon endroit - std::list::iterator it; + std::list::const_iterator it; uint16_t tmpGr,tmpEl; DictEntry *dictEntry; ValEntry *entry; diff --git a/src/gdcmDicomDirObject.h b/src/gdcmDicomDirObject.h index c3d014a6..713682ba 100644 --- a/src/gdcmDicomDirObject.h +++ b/src/gdcmDicomDirObject.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirObject.h,v $ Language: C++ - Date: $Date: 2004/10/13 14:15:29 $ - Version: $Revision: 1.5 $ + Date: $Date: 2004/10/25 03:35:19 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,7 +27,6 @@ namespace gdcm { - //----------------------------------------------------------------------------- class DicomDirObject; typedef std::list ListContent; @@ -42,7 +41,8 @@ class GDCM_EXPORT DicomDirObject : public SQItem public: DicomDirObject(TagDocEntryHT *ptagHT, int depth = 0); - virtual ~DicomDirObject(); + ~DicomDirObject(); + /** * \brief Sets the print level for the Dicom Header * \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy @@ -50,7 +50,7 @@ public: void SetPrintLevel(int level) { PrintLevel = level; }; TagDocEntryHT GetEntry(); - void FillObject(ListDicomDirMetaElem elemList); + void FillObject(ListDicomDirMetaElem const & elemList); protected: diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx index 827604aa..fd2b2547 100644 --- a/src/gdcmDicomDirPatient.cxx +++ b/src/gdcmDicomDirPatient.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirPatient.cxx,v $ Language: C++ - Date: $Date: 2004/10/22 03:05:41 $ - Version: $Revision: 1.16 $ + Date: $Date: 2004/10/25 03:35:19 $ + 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 @@ -30,10 +30,10 @@ namespace gdcm * @param ptagHT pointer to the HTable (DicomDirObject needs it * to build the HeaderEntries) */ -DicomDirPatient::DicomDirPatient(SQItem *s, TagDocEntryHT *ptagHT): +DicomDirPatient::DicomDirPatient(SQItem *s, TagDocEntryHT *ptagHT) : DicomDirObject(ptagHT) { - docEntries = s->GetDocEntries(); + DocEntries = s->GetDocEntries(); } /** * \brief Constructor diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx index f1c32c6f..e88d0f03 100644 --- a/src/gdcmDicomDirSerie.cxx +++ b/src/gdcmDicomDirSerie.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirSerie.cxx,v $ Language: C++ - Date: $Date: 2004/10/22 03:05:41 $ - Version: $Revision: 1.18 $ + Date: $Date: 2004/10/25 03:35:19 $ + Version: $Revision: 1.19 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,10 +31,10 @@ namespace gdcm * @param ptagHT pointer to the HTable (DicomDirObject needs it * to build the DocEntries) */ -DicomDirSerie::DicomDirSerie(SQItem* s, TagDocEntryHT* ptagHT): +DicomDirSerie::DicomDirSerie(SQItem* s, TagDocEntryHT* ptagHT) : DicomDirObject(ptagHT) { - docEntries = s->GetDocEntries(); + DocEntries = s->GetDocEntries(); } /** diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx index 24a15bca..d035f1ab 100644 --- a/src/gdcmDicomDirStudy.cxx +++ b/src/gdcmDicomDirStudy.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirStudy.cxx,v $ Language: C++ - Date: $Date: 2004/10/22 03:05:41 $ - Version: $Revision: 1.15 $ + Date: $Date: 2004/10/25 03:35:19 $ + Version: $Revision: 1.16 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,7 +22,6 @@ namespace gdcm { - //----------------------------------------------------------------------------- // Constructor / Destructor @@ -36,7 +35,7 @@ namespace gdcm DicomDirStudy::DicomDirStudy(SQItem* s, TagDocEntryHT* ptagHT): DicomDirObject(ptagHT) { - docEntries = s->GetDocEntries(); + DocEntries = s->GetDocEntries(); } /** * \ingroup DicomDirStudy diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index e40b3f97..bdb050ce 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/10/22 03:05:41 $ - Version: $Revision: 1.21 $ + Date: $Date: 2004/10/25 03:35:19 $ + 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 @@ -69,15 +69,15 @@ public: virtual void Write (std::ofstream *fp, FileType filetype) = 0;// pure virtual virtual DocEntry* GetDocEntryByNumber(uint16_t group, - uint16_t element) = 0; - DocEntry *GetDocEntryByName(std::string const & name); - virtual std::string GetEntryByNumber(uint16_t group,uint16_t element) = 0; + uint16_t element) = 0; + DocEntry *GetDocEntryByName(TagName const & name); + virtual std::string GetEntryByNumber(uint16_t group, uint16_t element) = 0; std::string GetEntryByName(TagName const & name); DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element, - std::string const & vr = "unkn", - std::string const & fourth = "unkn", - std::string const & name = "unkn"); + TagName const & vr = "unkn", + TagName const & fourth = "unkn", + TagName const & name = "unkn"); protected: @@ -90,13 +90,13 @@ protected: uint16_t element); DocEntry* NewDocEntryByNumber(uint16_t group, uint16_t element, - std::string const & VR); - DocEntry* NewDocEntryByName (std::string const & name); + TagName const & vr); + DocEntry* NewDocEntryByName (TagName const & name); SeqEntry* NewSeqEntryByNumber(uint16_t group, uint16_t element); // DictEntry related utilities - DictEntry *GetDictEntryByName (std::string const & name); + DictEntry *GetDictEntryByName (TagName const & name); DictEntry *GetDictEntryByNumber(uint16_t, uint16_t); }; diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 0147cc47..d6006ab5 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2004/10/25 03:03:44 $ - Version: $Revision: 1.112 $ + Date: $Date: 2004/10/25 03:35:20 $ + Version: $Revision: 1.113 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -2956,10 +2956,10 @@ void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, if (SQItem* SQItemSet = dynamic_cast< SQItem* > ( set ) ) { - ListDocEntry& currentList = SQItemSet->GetDocEntries(); - for (ListDocEntry::iterator i = currentList.begin(); - i != currentList.end(); - ++i) + const ListDocEntry& currentList = SQItemSet->GetDocEntries(); + for (ListDocEntry::const_iterator i = currentList.begin(); + i != currentList.end(); + ++i) { DocEntry* entry = *i; if ( SeqEntry* seqEntry = dynamic_cast(entry) ) diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 2c7bcd79..d308079d 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/10/22 03:05:42 $ - Version: $Revision: 1.30 $ + Date: $Date: 2004/10/25 03:35:20 $ + 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 @@ -45,13 +45,13 @@ SQItem::SQItem(int depthLevel ) */ SQItem::~SQItem() { - for(ListDocEntry::iterator cc = docEntries.begin(); - cc != docEntries.end(); - ++cc) + for(ListDocEntry::iterator cc = DocEntries.begin(); + cc != DocEntries.end(); + ++cc) { delete (*cc); } - docEntries.clear(); + DocEntries.clear(); } //----------------------------------------------------------------------------- @@ -71,8 +71,8 @@ SQItem::~SQItem() } } std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl; - for (ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); + for (ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { DocEntry* Entry = *i; @@ -97,7 +97,7 @@ SQItem::~SQItem() * \ingroup SQItem * \brief canonical Writer */ -void SQItem::Write(std::ofstream* fp,FileType filetype) +void SQItem::Write(std::ofstream* fp, FileType filetype) { uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff }; uint16_t itemt[4]= { 0xfffe, 0xe00d, 0xffff, 0xffff }; @@ -106,9 +106,9 @@ void SQItem::Write(std::ofstream* fp,FileType filetype) // because we want to write the Item as a 'no Length' item fp->write((char*)&item[0],8); // fffe e000 ffff ffff - for (ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); - ++i) + for (ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); + ++i) { // we skip delimitors (start and end one) because // we force them as 'no length' @@ -141,7 +141,7 @@ void SQItem::Write(std::ofstream* fp,FileType filetype) */ bool SQItem::AddEntry(DocEntry* entry) { - docEntries.push_back(entry); + DocEntries.push_back(entry); //TODO : check if it worked return true; } @@ -159,10 +159,12 @@ bool SQItem::AddEntry(DocEntry* entry) * @return true if element was found or created successfully */ -bool SQItem::SetEntryByNumber(std::string val, uint16_t group, - uint16_t element) +bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, + uint16_t element) { - for(ListDocEntry::iterator i = docEntries.begin(); i != docEntries.end(); ++i) + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); + ++i) { if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0xe000 ) { @@ -213,7 +215,7 @@ bool SQItem::SetEntryByNumber(std::string val, uint16_t group, entry->SetValue(val); } entry->SetLength(val.length()); - docEntries.insert(i,entry); + DocEntries.insert(i,entry); return true; } @@ -239,8 +241,8 @@ bool SQItem::SetEntryByNumber(std::string val, uint16_t group, */ DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) { - for(ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); ++i) + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { if ( (*i)->GetGroup() == group && (*i)->GetElement() == element ) { @@ -257,8 +259,8 @@ DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) std::string SQItem::GetEntryByNumber(uint16_t group, uint16_t element) { - for(ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); ++i) + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { if ( (*i)->GetGroup() == group && (*i)->GetElement() == element) { diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h index 0f42e54b..fc5e7552 100644 --- a/src/gdcmSQItem.h +++ b/src/gdcmSQItem.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.h,v $ Language: C++ - Date: $Date: 2004/10/22 03:05:42 $ - Version: $Revision: 1.20 $ + Date: $Date: 2004/10/25 03:35:20 $ + Version: $Revision: 1.21 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,10 +21,6 @@ #include "gdcmDocEntrySet.h" #include "gdcmElementSet.h" -//#include "gdcmDocEntry.h" -//#include "gdcmDocument.h" -//#include "gdcmBinEntry.h" - #include namespace gdcm @@ -34,23 +30,21 @@ class DocEntry; //----------------------------------------------------------------------------- typedef std::list ListDocEntry; //----------------------------------------------------------------------------- -class GDCM_EXPORT SQItem - : - public DocEntrySet +class GDCM_EXPORT SQItem : public DocEntrySet { public: - SQItem(int); + SQItem(int depthLevel); ~SQItem(); - virtual void Print(std::ostream &os = std::cout); - virtual void Write(std::ofstream *fp, FileType filetype); + void Print(std::ostream &os = std::cout); + void Write(std::ofstream *fp, FileType filetype); /// \brief returns the DocEntry chained List for this SQ Item. - ListDocEntry &GetDocEntries() { return docEntries; }; + ListDocEntry const &GetDocEntries() const { return DocEntries; }; /// \brief adds the passed DocEntry to the DocEntry chained List for /// this SQ Item. - void AddDocEntry(DocEntry *e) { docEntries.push_back(e); }; + void AddDocEntry(DocEntry *e) { DocEntries.push_back(e); }; virtual bool AddEntry(DocEntry *Entry); // add to the List @@ -58,9 +52,9 @@ public: // FIXME method to write //DocEntry *GetDocEntryByName (std::string Name); - bool SetEntryByNumber(std::string val, uint16_t group, uint16_t element); + bool SetEntryByNumber(std::string const & val, uint16_t group, uint16_t element); - virtual std::string GetEntryByNumber(uint16_t group, uint16_t element); + std::string GetEntryByNumber(uint16_t group, uint16_t element); /// \brief returns the ordinal position of a given SQItem int GetSQItemNumber() { return SQItemNumber; }; @@ -75,27 +69,22 @@ public: void SetDepthLevel(int depth) { SQDepthLevel = depth; } /// Accessor on \ref BaseTagKey. - void SetBaseTagKey( BaseTagKey key ) { BaseTagKeyNested = key; } + void SetBaseTagKey( BaseTagKey const & key ) { BaseTagKeyNested = key; } /// Accessor on \ref BaseTagKey. - BaseTagKey GetBaseTagKey( ) { return BaseTagKeyNested; } + BaseTagKey const & GetBaseTagKey() const { return BaseTagKeyNested; } protected: - -// Variables +// Variables that need to be access in subclasses /// \brief chained list of (Elementary) Doc Entries - ListDocEntry docEntries; - - /// \brief SQ Item ordinal number - int SQItemNumber; - + ListDocEntry DocEntries; + ///\brief pointer to the HTable of the Document, /// (because we don't know it within any DicomDirObject nor any SQItem) TagDocEntryHT *PtagHT; - private: /// \brief Sequences can be nested. This \ref SQDepthLevel represents @@ -109,6 +98,10 @@ private: /// with this BaseTagKey. BaseTagKey BaseTagKeyNested; + + /// \brief SQ Item ordinal number + int SQItemNumber; + }; } // end namespace gdcm //----------------------------------------------------------------------------- -- 2.48.1