X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirSerie.cxx;h=6b0d8f9ae33ebe6bef67dff866fe91e03593da12;hb=e7768bbebdc9a5972e396d71a3e848f5674ee378;hp=1b5dbd12291e134f38eec4d752dc3d47d91b7a88;hpb=2410af81c71712957890eb38d9ecacc77adcd72e;p=gdcm.git

diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx
index 1b5dbd12..6b0d8f9a 100644
--- a/src/gdcmDicomDirSerie.cxx
+++ b/src/gdcmDicomDirSerie.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirSerie.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/03/23 15:30:15 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2007/10/08 15:20:17 $
+  Version:   $Revision: 1.46 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,7 +23,7 @@
 #include "gdcmGlobal.h"
 #include "gdcmDebug.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -58,21 +58,21 @@ DicomDirSerie::~DicomDirSerie()
  * @param fp ofstream to write to
  * @param t Type of the File (explicit VR, implicitVR, ...)
  */ 
-void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t)
+void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t, bool , bool )
 {
-   DicomDirObject::WriteContent(fp, t);
+   DicomDirObject::WriteContent(fp, t, false, true);
 
    for(ListDicomDirImage::iterator cc = Images.begin();
                                    cc!= Images.end();
                                  ++cc )
    {
-      (*cc)->WriteContent( fp, t );
+      (*cc)->WriteContent( fp, t, false, true );
    } 
    for(ListDicomDirPrivate::iterator cc2 = Privates.begin();
                                      cc2!= Privates.end();
                                    ++cc2 )
    {
-      (*cc2)->WriteContent( fp, t );
+      (*cc2)->WriteContent( fp, t, false, true);
    }   
 }
 
@@ -88,7 +88,19 @@ DicomDirImage *DicomDirSerie::NewImage()
 }
 
 /**
- * \brief  Remove all 'Images' in the serie 
+ * \brief   adds a new Private (with the basic elements) to a partially created 
+ *          DICOMDIR
+ */
+ 
+DicomDirPrivate *DicomDirSerie::NewPrivate()
+{
+   DicomDirPrivate *dd = DicomDirPrivate::New();
+   Privates.push_back(dd);
+   return dd;   
+}
+
+/**
+ * \brief  Remove all 'Privates'  in the serie 
  */
 void DicomDirSerie::ClearPrivate()
 {
@@ -101,9 +113,8 @@ void DicomDirSerie::ClearPrivate()
    Privates.clear();
 }
 
-
 /**
- * \brief  Remove all 'Privates' in the serie 
+ * \brief  Remove all 'Images' in the serie 
  */
 void DicomDirSerie::ClearImage()
 {
@@ -115,6 +126,7 @@ void DicomDirSerie::ClearImage()
    }
    Images.clear();
 }
+
 /**
  * \brief   Get the first entry while visiting the DicomDirImage
  * \return  The first DicomDirImage if DicomDirserie not empty, otherwhise NULL