X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=6c42fea238370cea60848fd12c63a526b885273d;hb=317592bf538baef94dbc465c9bb1aea77e217d10;hp=2ca54af0f96aee3e5e6db84d9a11ac7ebf90e6dc;hpb=906464b1c71b1b623f8202a693e75a358a5bd965;p=gdcm.git

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 2ca54af0..6c42fea2 100644
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/02/16 20:06:13 $
-  Version:   $Revision: 1.186 $
+  Date:      $Date: 2006/05/30 08:10:19 $
+  Version:   $Revision: 1.189 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -129,7 +129,7 @@ DicomDir::DicomDir()
    NewMeta();
 }
 
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
 /**
  * \brief Constructor Parses recursively the directory and creates the DicomDir
  *        or uses an already built DICOMDIR, depending on 'parseDir' value.
@@ -144,6 +144,7 @@ DicomDir::DicomDir()
  * @deprecated use : new DicomDir() + [ SetLoadMode(lm) + ] SetDirectoryName(name)
  *              or : new DicomDir() + SetFileName(name)
  */
+ /*
 DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
    Document( )
 {
@@ -157,7 +158,8 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
    SetFileName( fileName );
    Load( );
 }
-#endif
+*/
+//#endif
 
 /**
  * \brief  Canonical destructor 
@@ -189,7 +191,7 @@ bool DicomDir::Load( )
    }
    return DoTheLoadingJob( );   
 }
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
 /**
  * \brief   Loader. (DEPRECATED : kept not to break the API)
  * @param   fileName file to be open for parsing
@@ -197,6 +199,7 @@ bool DicomDir::Load( )
  *         or no tag was found.
  * @deprecated use SetFileName(n) + Load() instead
  */
+ /*
 bool DicomDir::Load(std::string const &fileName ) 
 {
    // We should clean out anything that already exists.
@@ -210,7 +213,8 @@ bool DicomDir::Load(std::string const &fileName )
    }
    return DoTheLoadingJob( );
 }
-#endif
+*/
+//#endif
 
 /**
  * \brief   Does the Loading Job (internal use only)
@@ -889,7 +893,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
    ListDicomDirElem elemList;
    ListDicomDirElem::const_iterator it;
    uint16_t tmpGr, tmpEl;
-   DictEntry *dictEntry;
+   //DictEntry *dictEntry;
    DataEntry *entry;
    std::string val;
    SQItem *si;
@@ -962,9 +966,10 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
    {
       tmpGr     = it->Group;
       tmpEl     = it->Elem;
-      dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl);
-
-      entry     = DataEntry::New( dictEntry ); 
+      //dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl);
+      //entry     = DataEntry::New( dictEntry );
+       
+      entry     = DataEntry::New(tmpGr, tmpEl, GDCM_VRUNKNOWN); /// \todo : modify dicomelements file, to store VR
       entry->SetOffset(0); // just to avoid further missprinting
 
       if ( header )