* src/gdcmCommon.h : add the GDCM_UNKNOWN constant. This constant is to

     replace the different values "??", "Unkn", "Unknown".
   * src/gdcmDicomDirElement.h, gdcmDictEntry.h, gdcmDictSet.h,
     gdcmDocEntry.cxx, gdcmDocEntrySet.[h|cxx], gdcmDocument.h, gdcmSQItem.cxx,
     gdcmVR.cxx : use the GDCM_UNKNOWN constant.
   * Appears a bug in gdcmDictEntry : IsVRUnknown always returns false... bad
   -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 59c1a0e9e2c49593d2ad4445dafd1562f8eafd6f..70a2ccb8e65c1d11696c97962c3d1883fa9b1205 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-05 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+   * src/gdcmCommon.h : add the GDCM_UNKNOWN constant. This constant is to
+     replace the different values "??", "Unkn", "Unknown".
+   * src/gdcmDicomDirElement.h, gdcmDictEntry.h, gdcmDictSet.h,
+     gdcmDocEntry.cxx, gdcmDocEntrySet.[h|cxx], gdcmDocument.h, gdcmSQItem.cxx,
+     gdcmVR.cxx : use the GDCM_UNKNOWN constant.
+   * Appears a bug in gdcmDictEntry : IsVRUnknown always returns false... bad
+
 2004-12-16 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
    * src/gdcmBase.[h|cxx] : new base class. Contains the PrintLevel and an
      empty Print Method

diff --git a/Example/TestFromScratch.cxx b/Example/TestFromScratch.cxx
index 228c52a49892ca761ce82c78d85d960770fc858b..35851cde2698a7df0c980f2ac1f26fdc7f690b7d 100644 (file)
--- a/Example/TestFromScratch.cxx
+++ b/Example/TestFromScratch.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestFromScratch.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/10 17:10:22 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  Version:   $Revision: 1.4 $
                                                                                 
   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 @@ int main(int argc, char *argv[])
       if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
       {   
          // Do not bother with field from private dict
-         if( v->GetName() != "unkn" )
+         if( v->GetName() != "gdcm::Unknown" )
          {  
             h2->ReplaceOrCreateByNumber( 
                               v->GetValue(),

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index ec41506b2d68ab12f18721a36a921bec4855b935..d7e55592415edad06107574c6df48f9a9d4e56a3 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/30 17:14:12 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  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
@@ -87,6 +87,7 @@ namespace gdcm
 #define DICT_TS           "dicomTS.dic"
 #define DICT_VR           "dicomVR.dic"
 
+const std::string GDCM_UNKNOWN   = "gdcm::Unknown";
 const std::string GDCM_UNFOUND   = "gdcm::Unfound";
 const std::string GDCM_BINLOADED = "gdcm::Binary data loaded";
 const std::string GDCM_NOTLOADED = "gdcm::NotLoaded";

diff --git a/src/gdcmDicomDirElement.h b/src/gdcmDicomDirElement.h
index 859ce4076838d456075039a9e1ac087fcd094f4d..8a17cbedcf749dd037583bef53536e462be293ca 100644 (file)
--- a/src/gdcmDicomDirElement.h
+++ b/src/gdcmDicomDirElement.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirElement.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/16 13:46:36 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  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
@@ -116,7 +116,6 @@ private:
    /// Elements chained list, related to the SerieElements of DICOMDIR
    ListDicomDirSerieElem   DicomDirSerieList;
    /// Elements chained list, related to the ImageElements of DICOMDIR
-   
    ListDicomDirImageElem   DicomDirImageList;
 };
 } // end namespace gdcm

diff --git a/src/gdcmDictEntry.h b/src/gdcmDictEntry.h
index 37c602ef56373dace397679ee297fe77312de0cf..3448e495afc11b62055e41d38c4efeb0a9f26188 100644 (file)
--- a/src/gdcmDictEntry.h
+++ b/src/gdcmDictEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/16 13:46:37 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  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
@@ -40,9 +40,9 @@ class GDCM_EXPORT DictEntry : public Base
 public:
    DictEntry(uint16_t group, 
              uint16_t element,
-             TagName const & vr     = "Unknown",
-             TagName const & fourth = "Unknown",
-             TagName const & name   = "Unknown");
+             TagName const & vr     = GDCM_UNKNOWN,
+             TagName const & fourth = GDCM_UNKNOWN,
+             TagName const & name   = GDCM_UNKNOWN);
 
    static TagKey TranslateToKey(uint16_t group, uint16_t element);
 

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index b2be826a7490b2410b9fc0e2eefdc4f612eb2ff3..89b1ff883c9da962ffe99442d1f297ea0d7abffc 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/16 13:46:37 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  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
@@ -62,9 +62,9 @@ public:
    // Dict* GetVirtualDict() { return &VirtualEntry; };
 
    DictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element,
-                                  TagName vr     = "Unknown",
-                                  TagName fourth = "Unknown",
-                                  TagName name   = "Unknown");
+                                  TagName vr     = GDCM_UNKNOWN,
+                                  TagName fourth = GDCM_UNKNOWN,
+                                  TagName name   = GDCM_UNKNOWN);
 
    static std::string BuildDictPath();
 

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index db3461fe04fcf541021e1ba28cfa0065b0df53df..6ada3fad82bedaa863be4935606edd7ae17947ae 100644 (file)
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/16 13:46:37 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -163,7 +163,7 @@ void DocEntry::WriteContent(std::ofstream* fp, FileType filetype)
       uint16_t z = 0;
       uint16_t shortLgr = lgr;
 
-      if (vr == "unkn")
+      if (vr == GDCM_UNKNOWN)
       {
          // Unknown was 'written'
          // deal with Little Endian            

diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx
index 5835a8f34ae7c03c29ff9372237e426980cc7d61..0d69d0253fd8a7932748e05ffb005a3e3cc56ad4 100644 (file)
--- a/src/gdcmDocEntrySet.cxx
+++ b/src/gdcmDocEntrySet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:58 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -236,7 +236,7 @@ DocEntry *DocEntrySet::NewDocEntryByName(TagName const & name)
   DictEntry *newTag = pubDict->GetDictEntryByName(name);
    if (!newTag)
    {
-      newTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "unkn", name);
+      newTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", GDCM_UNKNOWN, name);
    }
 
    DocEntry* newEntry = new DocEntry(newTag);

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 32d99e194f08bda303cfae377822ba1672d954c9..0cf434ff677ff61ec6d974da1c662266c34091b8 100644 (file)
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/16 13:46:37 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -77,9 +77,9 @@ public:
    std::string GetEntryByName(TagName const & name);
    DictEntry* NewVirtualDictEntry( uint16_t group, 
                                    uint16_t element,
-                                   TagName const & vr     = "unkn",
-                                   TagName const & fourth = "unkn",
-                                   TagName const & name   = "unkn" );
+                                   TagName const & vr     = GDCM_UNKNOWN,
+                                   TagName const & fourth = GDCM_UNKNOWN,
+                                   TagName const & name   = GDCM_UNKNOWN );
   
 protected:
 // DocEntry  related utilities 

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 6a5538aeddaba9c110faa72aa26be6fe0733d88c..490fbc74c867d851c11e82847660bcfa08a709e6 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/16 11:37:02 $
-  Version:   $Revision: 1.69 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  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
@@ -145,11 +145,11 @@ public:
 
    ValEntry* ReplaceOrCreateByNumber(std::string const & value,
                                      uint16_t group, uint16_t elem,
-                                     TagName const & vr = "unkn");
+                                     TagName const & vr = GDCM_UNKNOWN);
    
    BinEntry* ReplaceOrCreateByNumber(uint8_t* binArea, int lgth,
                                      uint16_t group, uint16_t elem,
-                                     TagName const & vr = "unkn");
+                                     TagName const & vr = GDCM_UNKNOWN);
 
    SeqEntry* ReplaceOrCreateByNumber(uint16_t group, uint16_t elem);
 

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 399c466f942ec3e43cde9b207791dec2d7ab2660..c2481956493c5d8000a7e1f35f85c8261fa23811 100644 (file)
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/16 13:46:37 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  Version:   $Revision: 1.44 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -196,7 +196,7 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group,
          {
             dictEntry = 
                Global::GetDicts()->NewVirtualDictEntry(group, element,
-                                                       "UN", "??", "??");
+                                                       "UN", GDCM_UNKNOWN, GDCM_UNKNOWN);
          } 
          // we assume the constructor didn't fail
          entry = new ValEntry(dictEntry);

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 22e54fc60198393f2d36066295eeaaba54dbc72f..65fefdb3ecff0bf59284dbc6995b2a94863a7126 100644 (file)
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 14:48:19 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2005/01/05 15:38:28 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -117,7 +117,7 @@ bool VR::IsVROfGdcmBinaryRepresentable(VRKey const & tested)
    //std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
    //   << tested << std::endl;
 
-   if ( tested == "unkn")
+   if ( tested == GDCM_UNKNOWN)
       return true;
 
    if ( ! Count(tested) )