Minor typo fixes

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 97afe0cb24cb22876179ae42ed5039eda4c8336c..e318600b245f02cd530f2854b4c410b92189823d 100644 (file)
--- a/src/gdcmDataEntry.cxx
+++ b/src/gdcmDataEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/29 12:48:45 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2005/12/09 12:23:38 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -76,6 +76,8 @@ DataEntry::~DataEntry ()
 // Public
 /**
  * \brief Sets the value (non string) of the current Dicom Header Entry
+ * @param area area
+ * @param self self
  */
 void DataEntry::SetBinArea( uint8_t *area, bool self )  
 { 
@@ -88,6 +90,8 @@ void DataEntry::SetBinArea( uint8_t *area, bool self )
 }
 /**
  * \brief Inserts the value (non string) into the current Dicom Header Entry
+ * @param area area
+ * @param length length 
  */
 void DataEntry::CopyBinArea( uint8_t *area, uint32_t length )
 {
@@ -107,6 +111,11 @@ void DataEntry::CopyBinArea( uint8_t *area, uint32_t length )
    }
 }
 
+/**
+ * \brief Inserts the value (non string) into the current Dicom Header Entry
+ * @param id id
+ * @param val val 
+ */
 void DataEntry::SetValue(const uint32_t &id, const double &val)
 {
    if( !BinArea )
@@ -151,9 +160,10 @@ void DataEntry::SetValue(const uint32_t &id, const double &val)
 }
 /**
  * \brief returns, as a double (?!?) one of the values 
- //      (when entry is multivaluated), identified by its index.
- //      Returns 0.0 if index is wrong
- //     FIXME : warn the user there was a problem ! 
+ *      (when entry is multivaluated), identified by its index.
+ *      Returns 0.0 if index is wrong
+ *     FIXME : warn the user there was a problem ! 
+ * @param id id
  */
 double DataEntry::GetValue(const uint32_t &id) const
 {
@@ -578,7 +588,7 @@ uint32_t DataEntry::ComputeFullLength()
 //-----------------------------------------------------------------------------
 // Protected
 /// \brief Creates a DataEntry owned BinArea (remove previous one if any)
-void DataEntry::NewBinArea(void)
+void DataEntry::NewBinArea( )
 {
    DeleteBinArea();
    if( GetLength() > 0 )

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 9459254d643901796c59548357e3937e74bddf50..049dda773676f74bdd6c936f4f2cf180730e0505 100644 (file)
--- 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/29 17:21:34 $
-  Version:   $Revision: 1.332 $
+  Date:      $Date: 2005/12/09 12:23:38 $
+  Version:   $Revision: 1.333 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1041,7 +1041,7 @@ void Document::ParseDES(DocEntrySet *set, long offset,
    bool delim_mode_intern = delim_mode;
    bool first = true;
    gdcmDebugMacro( "Enter in ParseDES, delim-mode " <<  delim_mode
-                     << " at offset " << std::hex << offset ); 
+                     << " at offset " << std::hex << "0x(" << offset << ")" ); 
    while (true)
    {
       if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
@@ -1088,8 +1088,8 @@ void Document::ParseDES(DocEntrySet *set, long offset,
          {
             gdcmDebugMacro( "in ParseDES : cannot add a DataEntry "
                                  << newDataEntry->GetKey()  
-                                 << " (at offset : " 
-                                 << newDataEntry->GetOffset() << " )" );
+                                 << " (at offset : 0x(" 
+                                 << newDataEntry->GetOffset() << ") )" );
             used=false;
          }
          else
@@ -1196,8 +1196,8 @@ void Document::ParseDES(DocEntrySet *set, long offset,
          {  // Don't try to parse zero-length sequences
 
             gdcmDebugMacro( "Entry in ParseSQ, delim " << delim_mode_intern
-                               << " at offset " << std::hex
-                               << newDocEntry->GetOffset() );
+                               << " at offset 0x(" << std::hex
+                               << newDocEntry->GetOffset() << ")");
 
             ParseSQ( newSeqEntry, 
                      newDocEntry->GetOffset(),
@@ -1210,8 +1210,8 @@ void Document::ParseDES(DocEntrySet *set, long offset,
          {
             gdcmWarningMacro( "in ParseDES : cannot add a SeqEntry "
                                 << newSeqEntry->GetKey()
-                                << " (at offset : " 
-                                << newSeqEntry->GetOffset() << " )" ); 
+                                << " (at offset : 0x(" 
+                                << newSeqEntry->GetOffset() << ") )" ); 
             used = false;
          }
          else
@@ -1322,8 +1322,8 @@ DocEntry *Document::Backtrack(DocEntry *docEntry)
    long offset    = PreviousDocEntry->GetOffset();
 
    gdcmDebugMacro( "Backtrack :" << std::hex << group 
-                                   << "|" << elem
-                                   << " at offset " << offset );
+                                 << "|" << elem
+                                 << " at offset 0x(" <<offset << ")" );
    RemoveEntry( PreviousDocEntry );
 
    // forge the Seq Entry
@@ -1574,7 +1574,7 @@ VRKey Document::FindDocEntryVR()
       if ( CurrentGroup != 0xfffe )
          gdcmWarningMacro( "Unknown VR " << std::hex << "0x(" 
                         << (unsigned int)vr[0] << "|" << (unsigned int)vr[1] 
-                        << ") at offset :" << positionOnEntry );
+                        << ") at offset : 0x(" << positionOnEntry<< ")" );
       Fp->seekg(positionOnEntry, std::ios::beg);
       return GDCM_VRUNKNOWN;
    }

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 1a960632f079f115ae2d54380358222be9ada6f8..ae6ca5a42ef6d499b2b4a800b7678c464e433b36 100644 (file)
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 16:31:23 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2005/12/09 12:23:38 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -164,7 +164,7 @@ private:
    typedef std::vector<Rule> SerieRestrictions;
    SerieRestrictions Restrictions;
    
-   // New style for (extented) Rules (Moreover old one doesn't compile)
+   // New style for (extented) Rules
    typedef struct {
       uint16_t group;
       uint16_t elem;

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 96e9cb562ccfa99d3809d8f54915dbf9c0e27090..bc2b6c2f581a11586529e463ed6db2a0f38fc2b2 100644 (file)
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmTS.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/26 08:04:16 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2005/12/09 12:23:39 $
+  Version:   $Revision: 1.53 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,10 +27,14 @@
 #include <ctype.h> // for isdigit
 
 // TODO
-// a lot of troubles expected with TS : 1.2.840.113619.5.2
+// troubles expected with TS : 1.2.840.113619.5.2
 // Implicit VR - Big Endian
 // http://www.gemedicalsystemseurope.com/euen/it_solutions/pdf/lsqxi_rev2.pdf
-// 
+// G.E. deliberately violated a lot of Dicom rules are
+// (probabely to to avoid other people to read their images)
+// Just try and error on new images :
+// PrintFile debug filein=...
+// and fix the bugs
 
 namespace gdcm 
 {
@@ -39,7 +43,7 @@ namespace gdcm
 static const char *SpecialStrings[] =  {
   // Implicit VR Little Endian
   "1.2.840.10008.1.2",
-  // Implicit VR Big Endian DLX (G.E Private)
+  // Implicit VR Big Endian (G.E Private)
   "1.2.840.113619.5.2",
   // Explicit VR Little Endian
   "1.2.840.10008.1.2.1",