X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirSerie.cxx;h=6b0d8f9ae33ebe6bef67dff866fe91e03593da12;hb=56ad78cdf3b5de32f0a94a38cd32ddc9f403ffc3;hp=541cee2f39158964105f9772bd3415b8cd95c211;hpb=ba78e6c6d47d6db1528e8e88e5ebde7296a26692;p=gdcm.git

diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx
index 541cee2f..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: 2004/12/03 20:16:57 $
-  Version:   $Revision: 1.23 $
+  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
@@ -19,88 +19,194 @@
 #include "gdcmDicomDirSerie.h"
 #include "gdcmDicomDirElement.h"
 #include "gdcmDicomDirImage.h"
+#include "gdcmDicomDirPrivate.h"
 #include "gdcmGlobal.h"
+#include "gdcmDebug.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \brief  Constructor 
- * @param ptagHT pointer to the HTable (DicomDirObject needs it 
- *               to build the DocEntries)
+ * \brief  Constructor
+ * \note End user must use : DicomDirStudy::NewSerie() 
  */
-DicomDirSerie::DicomDirSerie():
+DicomDirSerie::DicomDirSerie(bool empty):
    DicomDirObject()
 {
+   if ( !empty )
+   {
+      ListDicomDirSerieElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirSerieElements();   
+      FillObject(elemList);
+   }
 }
+
 /**
  * \brief   Canonical destructor.
  */
 DicomDirSerie::~DicomDirSerie() 
 {
-   for(ListDicomDirImage::iterator cc = Images.begin();
-                                   cc != Images.end();
-                                   ++cc)
-   {
-      delete *cc;
-   }
+   ClearImage();
+   ClearPrivate();  // For SIEMENS 'CSA non image'
 }
 
 //-----------------------------------------------------------------------------
-// Print
+// Public
 /**
- * \brief   Prints the Object
- * @return
+ * \brief   Writes the Object
+ * @param fp ofstream to write to
+ * @param t Type of the File (explicit VR, implicitVR, ...)
  */ 
-void DicomDirSerie::Print(std::ostream& os)
+void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t, bool , bool )
 {
-   os << "SERIE" << std::endl;
-   DicomDirObject::Print(os);
+   DicomDirObject::WriteContent(fp, t, false, true);
 
    for(ListDicomDirImage::iterator cc = Images.begin();
-                                   cc != Images.end();
-                                   ++cc)
+                                   cc!= Images.end();
+                                 ++cc )
    {
-      (*cc)->SetPrintLevel(PrintLevel);
-      (*cc)->Print(os);
-   }
+      (*cc)->WriteContent( fp, t, false, true );
+   } 
+   for(ListDicomDirPrivate::iterator cc2 = Privates.begin();
+                                     cc2!= Privates.end();
+                                   ++cc2 )
+   {
+      (*cc2)->WriteContent( fp, t, false, true);
+   }   
 }
 
-//-----------------------------------------------------------------------------
-// Public
+/**
+ * \brief   adds a new Image (with the basic elements) to a partially created 
+ *          DICOMDIR
+ */
+DicomDirImage *DicomDirSerie::NewImage()
+{
+   DicomDirImage *dd = DicomDirImage::New();
+   Images.push_back(dd);
+   return dd;   
+}
 
 /**
- * \brief   Writes the Object
- * @return
- */ 
-void DicomDirSerie::WriteContent(std::ofstream* fp, FileType t)
+ * \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()
 {
-   DicomDirObject::WriteContent(fp, t);
+   for(ListDicomDirPrivate::iterator cc = Privates.begin();
+                                     cc!= Privates.end();
+                                   ++cc)
+   {
+      (*cc)->Delete();
+   }
+   Privates.clear();
+}
 
+/**
+ * \brief  Remove all 'Images' in the serie 
+ */
+void DicomDirSerie::ClearImage()
+{
    for(ListDicomDirImage::iterator cc = Images.begin();
                                    cc!= Images.end();
-                                 ++cc )
+                                 ++cc)
    {
-      (*cc)->WriteContent( fp, t );
+      (*cc)->Delete();
    }
+   Images.clear();
 }
 
 /**
- * \brief   adds a new Image (with the basic elements) to a partially created DICOMDIR
+ * \brief   Get the first entry while visiting the DicomDirImage
+ * \return  The first DicomDirImage if DicomDirserie not empty, otherwhise NULL
  */
-DicomDirImage* DicomDirSerie::NewImage()
+DicomDirImage *DicomDirSerie::GetFirstImage()
 {
-   ListDicomDirImageElem const & elemList = 
-      Global::GetDicomDirElements()->GetDicomDirImageElements();
+   ItImage = Images.begin();
+   if (ItImage != Images.end())
+      return *ItImage;
+   return NULL;
+}
+
+/**
+ * \brief   Get the next entry while visiting the DicomDirImages
+ * \note : meaningfull only if GetFirstImage already called
+ * \return  The next DicomDirImages if found, otherwhise NULL
+ */
+DicomDirImage *DicomDirSerie::GetNextImage()
+{
+   gdcmAssertMacro (ItImage != Images.end());
+
+   ++ItImage;
+   if (ItImage != Images.end())      
+      return *ItImage;
+   return NULL;
+}
+
+/**
+ * \brief   Get the first entry while visiting the DicomDirPrivate
+ * \return  The first DicomDirPrivate if DicomDirserie not empty, otherwhise NULL
+ */
+DicomDirPrivate *DicomDirSerie::GetFirstPrivate()
+{
+   ItPrivate = Privates.begin();
+   if (ItPrivate != Privates.end())
+      return *ItPrivate;
+   return NULL;
+}
 
-   DicomDirImage* st = new DicomDirImage();
-   FillObject(elemList);
-   Images.push_front(st);
+/**
+ * \brief   Get the next entry while visiting the DicomDirPrivates
+ * \note : meaningfull only if GetFirstPrivate already called
+ * \return  The next DicomDirPrivates if found, otherwhise NULL
+ */
+DicomDirPrivate *DicomDirSerie::GetNextPrivate()
+{
+   gdcmAssertMacro (ItPrivate != Privates.end());
+
+   ++ItPrivate;
+   if (ItPrivate != Privates.end())      
+      return *ItPrivate;
+   return NULL;
+}
+
+/**
+ * \brief Copies all the attributes from an other DocEntrySet 
+ * @param set entry to copy from
+ * @remarks The contained DocEntries a not copied, only referenced
+ */
+void DicomDirSerie::Copy(DocEntrySet *set)
+{
+   // Remove all previous childs
+   ClearImage();
+   ClearPrivate();
+   
+   DicomDirObject::Copy(set);
+
+   DicomDirSerie *ddEntry = dynamic_cast<DicomDirSerie *>(set);
+   if( ddEntry )
+   {
+      Images = ddEntry->Images;
+      for(ItImage = Images.begin();ItImage != Images.end();++ItImage)
+         (*ItImage)->Register();
+
+      Privates = ddEntry->Privates;
+      for(ItPrivate = Privates.begin();ItPrivate != Privates.end();++ItPrivate)
+         (*ItPrivate)->Register();
+   }   
+}
 
-   return st;   
-} 
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -108,6 +214,34 @@ DicomDirImage* DicomDirSerie::NewImage()
 // Private
 
 //-----------------------------------------------------------------------------
-} // end namespace gdcm
+// Print
+/**
+ * \brief   Prints the Object
+ * @param os ostream to write to
+ * @param indent Indentation string to be prepended during printing
+ */ 
+void DicomDirSerie::Print(std::ostream &os, std::string const &)
+{
+   os << "SERIE" << std::endl;
+   DicomDirObject::Print(os);
+
+   for(ListDicomDirImage::iterator cc = Images.begin();
+                                   cc != Images.end();
+                                   ++cc)
+   {
+      (*cc)->SetPrintLevel(PrintLevel);
+      (*cc)->Print(os);
+   }
 
+   for(ListDicomDirPrivate::iterator cc2 = Privates.begin();
+                                     cc2 != Privates.end();
+                                   ++cc2)
+   {
+      (*cc2)->SetPrintLevel(PrintLevel);
+      (*cc2)->Print(os);
+   }   
+   
+}
 
+//-----------------------------------------------------------------------------
+} // end namespace gdcm