Typo

diff --git a/src/gdcmDocEntryArchive.cxx b/src/gdcmDocEntryArchive.cxx
index d059c6b50feefd17c482393a31b8179e7129468e..27aa83d978e7f4aac02897942be8a7726914cc43 100644 (file)
--- a/src/gdcmDocEntryArchive.cxx
+++ b/src/gdcmDocEntryArchive.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntryArchive.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/17 11:03:32 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2005/02/21 17:47:19 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -48,8 +48,8 @@ DocEntryArchive::~DocEntryArchive()
  * \brief   Replaces in the Header a DocEntry by the new DocEntry. 
  *          The initial DocEntry is kept in archive.
  * @param   newEntry New entry to substitute to an other entry of the Header
- * @return  FALSE when an other DocEntry is already archived 
- *          with the same key, TRUE otherwise
+ * @return  FALSE when an other DocEntry is already archived with the same key
+ *          TRUE otherwise
  */
 bool DocEntryArchive::Push(DocEntry *newEntry)
 {
@@ -63,7 +63,7 @@ bool DocEntryArchive::Push(DocEntry *newEntry)
    if( Archive.find(key)==Archive.end() )
    {
       // Save the old DocEntry if any
-      DocEntry *old = ArchFile->GetDocEntry(group,elem);
+      DocEntry *old = ArchFile->GetDocEntry(group, elem);
       Archive[key]  = old;
       if( old )
          ArchFile->RemoveEntryNoDestroy(old);
@@ -81,17 +81,17 @@ bool DocEntryArchive::Push(DocEntry *newEntry)
  *          It's kept in archive.
  * @param   group   Group number of the Entry to remove
  * @param   elem  Element number of the Entry to remove
- * @return  FALSE when an other DocEntry is already archived 
- *          with the same key, TRUE otherwise
+ * @return  FALSE when an other DocEntry is already archived with the same key
+ *          TRUE otherwise
  */
-bool DocEntryArchive::Push(uint16_t group,uint16_t elem)
+bool DocEntryArchive::Push(uint16_t group, uint16_t elem)
 {
-   std::string key = DictEntry::TranslateToKey(group,elem);
+   std::string key = DictEntry::TranslateToKey(group, elem);
 
    if( Archive.find(key)==Archive.end() )
    {
       // Save the old DocEntry if any
-      DocEntry *old = ArchFile->GetDocEntry(group,elem);
+      DocEntry *old = ArchFile->GetDocEntry(group, elem);
       Archive[key] = old;
       if( old )
          ArchFile->RemoveEntryNoDestroy(old);
@@ -109,15 +109,15 @@ bool DocEntryArchive::Push(uint16_t group,uint16_t elem)
  * @return  FALSE when the key isn't in the archive, 
  *          TRUE otherwise
  */
-bool DocEntryArchive::Restore(uint16_t group,uint16_t elem)
+bool DocEntryArchive::Restore(uint16_t group, uint16_t elem)
 {
-   std::string key=DictEntry::TranslateToKey(group,elem);
+   std::string key=DictEntry::TranslateToKey(group, elem);
 
    TagDocEntryHT::iterator restoreIt=Archive.find(key);
    if( restoreIt!=Archive.end() )
    {
       // Delete the new value
-      DocEntry *rem = ArchFile->GetDocEntry(group,elem);
+      DocEntry *rem = ArchFile->GetDocEntry(group, elem);
       if( rem )
          ArchFile->RemoveEntry(rem);
 

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index a7e9e88b53ce9b7265adf25051079b477c181259..12af9bc762120a35bdd2a46798891ad07169293a 100644 (file)
--- 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/07 08:48:18 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/02/21 17:47:19 $
+  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
@@ -47,7 +47,8 @@ public:
    ElementSet(int);
    ~ElementSet();
 
-   virtual void Print(std::ostream &os = std::cout, std::string const &indent = "" ); 
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const &indent = "" ); 
 
    void WriteContent(std::ofstream *fp, FileType filetype); 
 

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 5a31aa846d3e5dac7147924baa04c0622478c752..90a0b3f8f8026ce42dba75adecba1b3705b8c1bf 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/17 16:18:33 $
-  Version:   $Revision: 1.226 $
+  Date:      $Date: 2005/02/21 17:47:19 $
+  Version:   $Revision: 1.227 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1411,12 +1411,14 @@ bool File::Write(std::string fileName, FileType writetype)
 // Protected
 /**
  * \brief Initialize a default DICOM File that should contain all the
- *        field require by other reader. DICOM standard does not 
+ *        fields required by other readers. DICOM standard does not 
  *        explicitely defines those fields, heuristic has been choosen.
- *        This is not perfect as we are writting a Secondary Capture image...
+ * \todo some more tests to be performed to avoid collisions 
+ *       with FileHelper::CheckMandatoryElements()
  */
 void File::InitializeDefaultFile()
 {
+
    std::string date = Util::GetCurrentDate();
    std::string time = Util::GetCurrentTime();
    std::string uid  = Util::CreateUniqueUID();
@@ -1448,7 +1450,7 @@ void File::InitializeDefaultFile()
    // SOP Instance UID
    InsertValEntry(uidInst.c_str(),             0x0008, 0x0018);
    // Modality    
-   InsertValEntry("CT",                        0x0008, 0x0060);
+   InsertValEntry("OT",                        0x0008, 0x0060);
    // Manufacturer
    InsertValEntry("GDCM",                      0x0008, 0x0070);
    // Institution Name
@@ -1457,7 +1459,7 @@ void File::InitializeDefaultFile()
    InsertValEntry("http://www-creatis.insa-lyon.fr/Public/Gdcm", 0x0008, 0x0081);
 
    // Patient's Name
-   InsertValEntry("GDCM",                      0x0010, 0x0010);
+   InsertValEntry("GDCM^patient",              0x0010, 0x0010);
    // Patient ID
    InsertValEntry("GDCMID",                    0x0010, 0x0020);
 

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index 8c13e78f6c353177ff76d2baa63b38a51cb995b1..f1b256d4873ef99bfbbdd249acc424d0be23e21e 100644 (file)
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 16:18:49 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2005/02/21 17:47:20 $
+  Version:   $Revision: 1.40 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -48,7 +48,7 @@ public:
 
    // Other accessors are inherited from gdcm::ContentEntry
 
-   void Print(std::ostream &os = std::cout,std::string const & indent = ""); 
+   void Print(std::ostream &os = std::cout,std::string const &indent = ""); 
 
    void WriteContent(std::ofstream *fp, FileType filetype);