X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmParser.h;h=74db3d233c6fd53d53f5360a01ef42217fbdb442;hb=a547ed6d41e444153f4bea38c47810fe7f50d88e;hp=34311b8e1b45f0dba116e41f9e1cfbff0b8a20d1;hpb=bfbd90327a5e45d972546843b0d9e4185e16cb24;p=gdcm.git

diff --git a/src/gdcmParser.h b/src/gdcmParser.h
index 34311b8e..74db3d23 100644
--- a/src/gdcmParser.h
+++ b/src/gdcmParser.h
@@ -29,16 +29,17 @@ typedef std::map<GroupKey, int> GroupHT;
 
 //-----------------------------------------------------------------------------
 /*
- * \defgroup gdcmHeader
- * \brief
+ * \defgroup gdcmParser
+ * \brief used by both gdcmHeader and gdcmDicomDir
  */
 class GDCM_EXPORT gdcmParser
 {
 public:
-   gdcmParser(bool exception_on_error = false);
+   gdcmParser(bool exception_on_error  = false);
    gdcmParser(const char *filename, 
               bool  exception_on_error = false, 
-              bool  enable_sequences   = false);
+              bool  enable_sequences   = false,
+	      bool  ignore_shadow      = false);
    virtual ~gdcmParser(void);
 
 // Print
@@ -48,7 +49,7 @@ public:
     * \note    0 for Light Print; 1 for 'medium' Print, 2 for Heavy
     */
    void SetPrintLevel(int level) { printLevel = level; };
-   virtual void PrintEntry(std::ostream &os = std::cout);
+   virtual void PrintEntry   (std::ostream &os = std::cout);
    virtual void PrintPubDict (std::ostream &os = std::cout);
    virtual void PrintShaDict (std::ostream &os = std::cout);
 
@@ -62,7 +63,7 @@ public:
    bool SetShaDict(DictKey dictName);
 
 // Informations contained in the parser
-   bool IsReadable(void);
+   virtual bool IsReadable(void);
    bool IsImplicitVRLittleEndianTransferSyntax(void);
    bool IsExplicitVRLittleEndianTransferSyntax(void);
    bool IsDeflatedExplicitVRLittleEndianTransferSyntax(void);
@@ -97,8 +98,8 @@ public:
 
 // System access
    inline int GetSwapCode(void) { return sw; }
-   guint16 SwapShort(guint16); // needed by gdcmFile
-   guint32 SwapLong(guint32);  // needed by gdcmFile
+   guint16 SwapShort(guint16);   // needed by gdcmFile
+   guint32 SwapLong(guint32);    // needed by gdcmFile
    guint16 UnswapShort(guint16); // needed by gdcmFile
    guint32 UnswapLong(guint32);  // needed by gdcmFile
 
@@ -122,8 +123,10 @@ protected:
    virtual void UpdateShaEntries(void);
 
 // Header entry
-   gdcmHeaderEntry *GetHeaderEntryByName  (std::string Name);
-   gdcmHeaderEntry *GetHeaderEntryByNumber(guint16 group, guint16 element); 
+   gdcmHeaderEntry *GetHeaderEntryByNumber  (guint16 group, guint16 element); 
+   gdcmHeaderEntry *GetHeaderEntryByName    (std::string Name);
+   IterHT           GetHeaderEntrySameNumber(guint16 group, guint16 element); 
+// IterHT           GetHeaderEntrySameName  (std::string Name); 
 
    void LoadHeaderEntrySafe(gdcmHeaderEntry *);
 
@@ -136,14 +139,18 @@ protected:
 
    static const unsigned int HEADER_LENGTH_TO_READ; 
    static const unsigned int MAX_SIZE_LOAD_ELEMENT_VALUE;
+   static const unsigned int MAX_SIZE_PRINT_ELEMENT_VALUE;
 
 protected:
    int enableSequences;
    int printLevel;
-
+   
+   TagHeaderEntryHT tagHT; // H Table (multimap), to provide fast access
+   ListTag listEntries;    // chained list, to keep the 'spacial' ordering 
+   
 private:
    // Read
-   void Parse(bool exception_on_error = false) throw(gdcmFormatError);
+   bool ParseHeader(bool exception_on_error = false) throw(gdcmFormatError);
 
    void LoadHeaderEntries    (void);
    void LoadHeaderEntry      (gdcmHeaderEntry *);
@@ -166,27 +173,31 @@ private:
    void    SkipBytes(guint32);
 
    void Initialise(void);
-   void CheckSwap(void);
+   bool CheckSwap(void);
    void SwitchSwapToBigEndian(void);
    void SetMaxSizeLoadEntry(long);
+   void SetMaxSizePrintEntry(long);
 
-   // Dict
+   // DictEntry  related utilities
    gdcmDictEntry *GetDictEntryByName  (std::string Name);
    gdcmDictEntry *GetDictEntryByNumber(guint16, guint16);
-
-   // HeaderEntry related utilities
-   gdcmHeaderEntry *ReadNextHeaderEntry   (void);
-   gdcmHeaderEntry *NewHeaderEntryByNumber(guint16 group, guint16 element);
-   gdcmHeaderEntry *NewHeaderEntryByName  (std::string Name);
-   gdcmDictEntry *NewVirtualDictEntry(guint16 group, guint16 element,
-                                      std::string vr = "Unknown",
+   gdcmDictEntry *NewVirtualDictEntry(guint16 group, 
+                                      guint16 element,
+                                      std::string vr     = "Unknown",
                                       std::string fourth = "Unknown",
                                       std::string name   = "Unknown");
    gdcmDictEntry *NewVirtualDictEntry(gdcmHeaderEntry *);
+   
+   // HeaderEntry related utilities
+   gdcmHeaderEntry *ReadNextHeaderEntry   (void);
+   gdcmHeaderEntry *NewHeaderEntryByNumber(guint16 group, 
+                                           guint16 element);
+   gdcmHeaderEntry *NewHeaderEntryByName  (std::string Name);
 
-   // Deprecated (Not used)
-   gdcmHeaderEntry *NewManualHeaderEntryToPubDict(std::string NewTagName,
-                                                  std::string VR);
+
+   // Deprecated (Not used) --> commented out
+   //gdcmHeaderEntry *NewManualHeaderEntryToPubDict(std::string NewTagName,
+   //                                               std::string VR);
    guint32 GenerateFreeTagKeyInGroup(guint16 group);
 
    // Refering underlying filename.
@@ -197,12 +208,11 @@ private:
    // Optional "shadow dictionary" (private elements) used to parse this header
    gdcmDict *RefShaDict;
 
-   TagHeaderEntryHT tagHT; // H Table (multimap), to provide fast access
-   ListTag listEntries;    // chained list, to keep the 'spacial' ordering 
-
-
-   // true if a gdcmHeaderEntry was added post parsing 
+   // = 1 if a gdcmHeaderEntry was added post parsing 
    int wasUpdated;
+   
+   // =1 if user wants to skip shadow groups while parsing (to save space)
+   int ignoreShadow;
 
    // Swap code e.g. little, big, bad-big, bad-little endian). Warning:
    // this code is not fixed during header parsing.
@@ -213,6 +223,11 @@ private:
    // this upper bound is fixed to 1024 bytes (which might look reasonable
    // when one considers the definition of the various VR contents).
    guint32 MaxSizeLoadEntry;
+   // Size treshold above which an element value will NOT be *printed* in 
+   // order no to polute the screen output. By default,
+   // this upper bound is fixed to 64 bytes.   
+   guint32 MaxSizePrintEntry;
+
 };
 
 //-----------------------------------------------------------------------------