From 0416947420d9168401c99e7fbf0dca0a081c9175 Mon Sep 17 00:00:00 2001 From: regrain Date: Mon, 7 Feb 2005 08:48:18 +0000 Subject: [PATCH] * Remove useless methods added by JPR for Python users. All was already made in the swig wrapping (gdcm.i)... promotion to the good type : Bin, Val or Seq Entry !!! -- BeNours --- src/gdcmDocEntrySet.h | 9 +++------ src/gdcmElementSet.cxx | 43 ++---------------------------------------- src/gdcmElementSet.h | 6 ++---- src/gdcmSQItem.cxx | 40 ++------------------------------------- src/gdcmSQItem.h | 7 ++----- 5 files changed, 11 insertions(+), 94 deletions(-) diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 4328fe1c..ec56a65b 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/02/04 14:49:01 $ - Version: $Revision: 1.48 $ + Date: $Date: 2005/02/07 08:48:18 $ + Version: $Revision: 1.49 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -79,10 +79,7 @@ public: virtual DocEntry *GetFirstEntry()=0; /// Gets the next entry of any type of set virtual DocEntry *GetNextEntry()=0; - /// Gets the first ValEntry of set (for Python users) - virtual ValEntry *GetFirstValEntry()=0; - /// Gets the next ValEntry of set (for Python users) - virtual ValEntry *GetNextValEntry()=0; + virtual std::string GetEntryValue(uint16_t group, uint16_t elem); virtual void *GetEntryBinArea(uint16_t group, uint16_t elem); virtual int GetEntryLength(uint16_t group, uint16_t elem); diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index dd168d1e..2129c837 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2005/02/06 14:43:27 $ - Version: $Revision: 1.57 $ + Date: $Date: 2005/02/07 08:48:18 $ + Version: $Revision: 1.58 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -163,45 +163,6 @@ DocEntry *ElementSet::GetNextEntry() return NULL; } -/** - * \brief Get the first ValEntry while visiting *the* 'zero level' DocEntrySet - * (DocEntries out of any Sequence) - * This method is designed for Python users - * \return The first ValEntry if found, otherwhise NULL - */ -ValEntry *ElementSet::GetFirstValEntry() -{ - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = GetFirstEntry(); - // an other iterator is needed to allow user iterate - // at the same time both on DocEntries and ValEntries - ItValEntryTagHT = ItTagHT; - if ( (valEntry = dynamic_cast(d))) - return valEntry; - return GetNextValEntry(); -} - -/** - * \brief Get the next ValEntry while visiting *the* 'zero level' DocEntrySet - * (DocEntries out of any Sequence) - * \note : meaningfull only if GetFirstValEntry already called - * \return The next ValEntry if found, otherwhise NULL - */ -ValEntry *ElementSet::GetNextValEntry() -{ - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = ItValEntryTagHT->second; - ++ItValEntryTagHT; - while( d ) - { - if ( (valEntry = dynamic_cast(d))) - return valEntry; - else - return GetNextValEntry(); - } - return 0; -} - /** * \brief retrieves a Dicom Element using (group, element) * @param group Group number of the searched Dicom Element diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h index e5a60a0e..a7e9e88b 100644 --- a/src/gdcmElementSet.h +++ b/src/gdcmElementSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.h,v $ Language: C++ - Date: $Date: 2005/02/04 14:49:01 $ - Version: $Revision: 1.42 $ + Date: $Date: 2005/02/07 08:48:18 $ + 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 @@ -58,8 +58,6 @@ public: DocEntry *GetFirstEntry(); DocEntry *GetNextEntry(); - ValEntry *GetFirstValEntry(); - ValEntry *GetNextValEntry(); DocEntry *GetDocEntry(uint16_t group, uint16_t elem); /// Tells us if the ElementSet contains no entry bool IsEmpty() { return TagHT.empty(); }; diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 7316a268..2ec7540d 100644 --- a/src/gdcmSQItem.cxx +++ b/src/gdcmSQItem.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.cxx,v $ Language: C++ - Date: $Date: 2005/02/05 01:37:09 $ - Version: $Revision: 1.69 $ + Date: $Date: 2005/02/07 08:48:18 $ + 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 @@ -221,42 +221,6 @@ DocEntry *SQItem::GetNextEntry() return NULL; } -/** - * \brief Get the first ValEntry while visiting theSQItem - * This method is designed for Python users - * \return The first ValEntry if found, otherwhise NULL - */ -ValEntry *SQItem::GetFirstValEntry() -{ - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = GetFirstEntry(); - // an other iterator is needed to allow user iterate - // at the same time both on DocEntries and ValEntries - ItValEntries = ItDocEntries; - if ( (valEntry = dynamic_cast(d))) - return valEntry; - return GetNextValEntry(); -} - -/** - * \brief Get the next ValEntry while visiting the SQItem - * \return The next ValEntry if found, otherwhise NULL - */ -ValEntry *SQItem::GetNextValEntry() -{ - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = *ItValEntries; - ++ItValEntries; - while( d ) - { - if ( (valEntry = dynamic_cast(d))) - return valEntry; - else - return GetNextValEntry(); - } - return 0; -} - /** * \brief Gets a Dicom Element inside a SQ Item Entry * @param group Group number of the Entry diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h index a6f8b75f..ef24fa28 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/02/04 14:49:01 $ - Version: $Revision: 1.40 $ + Date: $Date: 2005/02/07 08:48:18 $ + Version: $Revision: 1.41 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -55,9 +55,6 @@ public: DocEntry *GetFirstEntry(); DocEntry *GetNextEntry(); - ValEntry *GetFirstValEntry(); - ValEntry *GetNextValEntry(); - DocEntry *GetDocEntry(uint16_t group, uint16_t elem); bool IsEmpty() { return DocEntries.empty(); }; -- 2.48.1