From: jpr Date: Mon, 14 Nov 2005 14:23:43 +0000 (+0000) Subject: Move as private some methods, in order not to confuse the users X-Git-Tag: Version1.3~90 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=31c93581b706e9e198b3cf1c4959b344c895087a;p=gdcm.git Move as private some methods, in order not to confuse the users --- diff --git a/src/gdcmDataEntry.h b/src/gdcmDataEntry.h index a32f3ed7..eba677c7 100644 --- a/src/gdcmDataEntry.h +++ b/src/gdcmDataEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDataEntry.h,v $ Language: C++ - Date: $Date: 2005/11/14 09:55:46 $ - Version: $Revision: 1.8 $ + Date: $Date: 2005/11/14 14:23:43 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -39,7 +39,7 @@ class GDCM_EXPORT DataEntry : public DocEntry public: static DataEntry *New(DictEntry *e) {return new DataEntry(e);} - static DataEntry *New(DocEntry *d) {return new DataEntry(d);} + static DataEntry *New(DocEntry *d) {return new DataEntry(d);} // Print void Print(std::ostream &os = std::cout, std::string const &indent = ""); @@ -49,7 +49,7 @@ public: uint32_t ComputeFullLength(); // Set/Get data - /// Sets the value (string) of the current Dicom entry + // Sets the value (string) of the current Dicom entry //virtual void SetValue(std::string const &val); /// \brief Returns the 'Value' (e.g. "Dupond^Marcel") converted /// into a 'string', event if it's physically stored on disk as an integer @@ -57,7 +57,7 @@ public: //virtual std::string const &GetValue() const { return Value; } /// \brief Returns the area value of the current Dicom Entry - /// when it's not string-translatable (e.g : LUT table, overlay, icon) + /// when it's not string-translatable (e.g : LUT table, overlay, icon) uint8_t *GetBinArea() { return BinArea; } void SetBinArea( uint8_t *area, bool self = true ); void CopyBinArea( uint8_t *area, uint32_t length ); @@ -101,7 +101,7 @@ public: /// \brief true if Entry not read bool IsUnread() { return State == STATE_UNREAD; } /// \brief true if Entry value properly loaded - bool IsGoodValue() { return State == 0; } + bool IsGoodValue() { return State == STATE_LOADED; } // Flags /// \brief sets the 'pixel data flag' @@ -109,7 +109,7 @@ public: /// \brief returns the 'pixel data flag' const TValueFlag &GetFlag() const { return Flag; } /// \brief true id Entry is a Pixel Data entry - bool IsPixelData() { return (Flag & FLAG_PIXELDATA) != 0; } + bool IsPixelData() { return (Flag &FLAG_PIXELDATA) != 0; } void Copy(DocEntry *doc); @@ -117,7 +117,8 @@ public: /// will NOT be *printed* in order no to polute the screen output static const uint32_t &GetMaxSizePrintEntry() { return MaxSizePrintEntry; } /// \brief Header Elements too long will not be printed - static void SetMaxSizePrintEntry(const uint32_t &size) { MaxSizePrintEntry = size; } + static void SetMaxSizePrintEntry(const uint32_t &size) + { MaxSizePrintEntry = size; } protected: DataEntry(DictEntry *e); @@ -141,7 +142,7 @@ protected: private: /// \brief 0 for straight entries, FLAG_PIXELDATA for Pixel Data entries TValueFlag Flag; - /// \brief Entry status : STATE_NOTLOADED,STATE_UNFOUND, STATE_UNREAD, 0 + /// \brief Entry status:STATE_NOTLOADED,STATE_UNFOUND,STATE_UNREAD,STATE_LOADED TValueState State; /// \brief Size threshold above which an element val diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 6fcc7ac1..08c874a7 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2005/11/09 10:18:43 $ - Version: $Revision: 1.326 $ + Date: $Date: 2005/11/14 14:23:44 $ + Version: $Revision: 1.327 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -931,7 +931,6 @@ uint32_t Document::ReadInt32() /** * \brief skips bytes inside the source file - * \warning NOT end user intended method ! * @return */ void Document::SkipBytes(uint32_t nBytes) @@ -988,7 +987,6 @@ int Document::ComputeGroup0002Length( ) // Private /** * \brief Loads all the needed Dictionaries - * \warning NOT end user intended method ! */ void Document::Initialize() { @@ -1465,7 +1463,6 @@ void Document::FindDocEntryLength( DocEntry *entry ) /** * \brief Find the Length till the next sequence delimiter - * \warning NOT end user intended method ! * @return */ uint32_t Document::FindDocEntryLengthOBOrOW() @@ -1572,7 +1569,6 @@ bool Document::CheckDocEntryVR(const VRKey &vr) /** * \brief Skip a given Header Entry - * \warning NOT end user intended method ! * @param entry entry to skip */ void Document::SkipDocEntry(DocEntry *entry) @@ -1582,7 +1578,6 @@ void Document::SkipDocEntry(DocEntry *entry) /** * \brief Skips to the beginning of the next Header Entry - * \warning NOT end user intended method ! * @param currentDocEntry entry to skip */ void Document::SkipToNextDocEntry(DocEntry *currentDocEntry) diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 09ca0c4a..e72c8bb5 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2005/11/05 13:23:30 $ - Version: $Revision: 1.129 $ + Date: $Date: 2005/11/14 14:23:44 $ + Version: $Revision: 1.130 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -67,16 +67,6 @@ public: // Swap code /// 'Swap code' accessor (see \ref SwapCode ) int GetSwapCode() { return SwapCode; } - // System access (meaning endian related !?) - uint16_t SwapShort(uint16_t); - uint32_t SwapLong(uint32_t); - double SwapDouble(double); - /// \brief Unswaps back the bytes of 2-bytes long integer - /// so they agree with the processor order. - uint16_t UnswapShort(uint16_t a) { return SwapShort(a);} - /// \brief Unswaps back the bytes of 4-byte long integer - /// so they agree with the processor order. - uint32_t UnswapLong(uint32_t a) { return SwapLong(a);} // File I/O /// Accessor to \ref Filename @@ -184,7 +174,19 @@ protected: private: // Methods void Initialize(); - bool DoTheLoadingDocumentJob(); + bool DoTheLoadingDocumentJob(); + + // System access (meaning endian related !?) + uint16_t SwapShort(uint16_t); + uint32_t SwapLong(uint32_t); + double SwapDouble(double); + /// \brief Unswaps back the bytes of 2-bytes long integer + /// so they agree with the processor order. + uint16_t UnswapShort(uint16_t a) { return SwapShort(a);} + /// \brief Unswaps back the bytes of 4-byte long integer + /// so they agree with the processor order. + uint32_t UnswapLong(uint32_t a) { return SwapLong(a);} + // Read void ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode); void ParseSQ (SeqEntry *seq, long offset, long l_max, bool delim_mode);