X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDicomDirSerie.cxx;h=1b5dbd12291e134f38eec4d752dc3d47d91b7a88;hb=b8d4a83279432254ee0c1ee01ffbf709a8373b3e;hp=a03c64800f76bcff2b74821fc417933e0c82ff8e;hpb=48266ecf995a124f3d76edb1826ff9e858b5ee40;p=gdcm.git

diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx
index a03c6480..1b5dbd12 100644
--- a/src/gdcmDicomDirSerie.cxx
+++ b/src/gdcmDicomDirSerie.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirSerie.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 11:11:58 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2007/03/23 15:30:15 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,21 +19,22 @@
 #include "gdcmDicomDirSerie.h"
 #include "gdcmDicomDirElement.h"
 #include "gdcmDicomDirImage.h"
+#include "gdcmDicomDirPrivate.h"
 #include "gdcmGlobal.h"
 #include "gdcmDebug.h"
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \brief  Constructor 
+ * \brief  Constructor
+ * \note End user must use : DicomDirStudy::NewSerie() 
  */
 DicomDirSerie::DicomDirSerie(bool empty):
    DicomDirObject()
 {
-   if( !empty )
+   if ( !empty )
    {
       ListDicomDirSerieElem const &elemList = 
          Global::GetDicomDirElements()->GetDicomDirSerieElements();   
@@ -47,27 +48,7 @@ DicomDirSerie::DicomDirSerie(bool empty):
 DicomDirSerie::~DicomDirSerie() 
 {
    ClearImage();
-}
-
-//-----------------------------------------------------------------------------
-// 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);
-   }
+   ClearPrivate();  // For SIEMENS 'CSA non image'
 }
 
 //-----------------------------------------------------------------------------
@@ -86,7 +67,13 @@ void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t)
                                  ++cc )
    {
       (*cc)->WriteContent( fp, t );
-   }
+   } 
+   for(ListDicomDirPrivate::iterator cc2 = Privates.begin();
+                                     cc2!= Privates.end();
+                                   ++cc2 )
+   {
+      (*cc2)->WriteContent( fp, t );
+   }   
 }
 
 /**
@@ -95,28 +82,42 @@ void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t)
  */
 DicomDirImage *DicomDirSerie::NewImage()
 {
-   DicomDirImage *st = new DicomDirImage();
-   Images.push_back(st);
-   return st;   
+   DicomDirImage *dd = DicomDirImage::New();
+   Images.push_back(dd);
+   return dd;   
 }
 
 /**
- * \brief  Remove all images in the serie 
+ * \brief  Remove all 'Images' in the serie 
+ */
+void DicomDirSerie::ClearPrivate()
+{
+   for(ListDicomDirPrivate::iterator cc = Privates.begin();
+                                     cc!= Privates.end();
+                                   ++cc)
+   {
+      (*cc)->Delete();
+   }
+   Privates.clear();
+}
+
+
+/**
+ * \brief  Remove all 'Privates' in the serie 
  */
 void DicomDirSerie::ClearImage()
 {
    for(ListDicomDirImage::iterator cc = Images.begin();
-                                   cc != Images.end();
-                                   ++cc)
+                                   cc!= Images.end();
+                                 ++cc)
    {
-      delete *cc;
+      (*cc)->Delete();
    }
    Images.clear();
 }
-
 /**
  * \brief   Get the first entry while visiting the DicomDirImage
- * \return  The first DicomDirImage if found, otherwhise NULL
+ * \return  The first DicomDirImage if DicomDirserie not empty, otherwhise NULL
  */
 DicomDirImage *DicomDirSerie::GetFirstImage()
 {
@@ -128,35 +129,72 @@ DicomDirImage *DicomDirSerie::GetFirstImage()
 
 /**
  * \brief   Get the next entry while visiting the DicomDirImages
- * \note : meaningfull only if GetFirstEntry already called
+ * \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;
-   }
+
+   ++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;
 }
- 
+
 /**
- * \brief   Get the first entry while visiting the DicomDirImage
- * \return  The first DicomDirImage if found, otherwhise NULL
+ * \brief   Get the next entry while visiting the DicomDirPrivates
+ * \note : meaningfull only if GetFirstPrivate already called
+ * \return  The next DicomDirPrivates if found, otherwhise NULL
  */
-DicomDirImage *DicomDirSerie::GetLastImage()
+DicomDirPrivate *DicomDirSerie::GetNextPrivate()
 {
-   ItImage = Images.end();
-   if (ItImage != Images.begin())
-   {
-      --ItImage;
-      return *ItImage;
-   }
+   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();
+   }   
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -164,6 +202,34 @@ DicomDirImage *DicomDirSerie::GetLastImage()
 // 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