X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirSerie.cxx;h=090dac646c530056d5274e317a7289760e887254;hb=c64b728232bfd4b8455a578f9efb50bd61f88c87;hp=ddeb9a08b137d2684414d2e194b830e7cab8d049;hpb=ab0aa4fa11e3ac7ec236d1aceb6f0cf89fe83eae;p=gdcm.git

diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx
index ddeb9a08..090dac64 100644
--- a/src/gdcmDicomDirSerie.cxx
+++ b/src/gdcmDicomDirSerie.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirSerie.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/23 10:47:10 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2005/10/25 14:52:33 $
+  Version:   $Revision: 1.39 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -18,95 +18,108 @@
 
 #include "gdcmDicomDirSerie.h"
 #include "gdcmDicomDirElement.h"
+#include "gdcmDicomDirImage.h"
 #include "gdcmGlobal.h"
+#include "gdcmDebug.h"
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \brief  Constructor 
- * @param  s  SQ Item holding the elements related to this "SERIE" part
- * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it 
- *               to build the gdcmDocEntries)
+ * \brief  Constructor
+ * \note End user must use : DicomDirStudy::NewSerie() 
  */
-gdcmDicomDirSerie::gdcmDicomDirSerie(gdcmSQItem *s, TagDocEntryHT *ptagHT):
-   gdcmDicomDirObject(ptagHT)
+DicomDirSerie::DicomDirSerie(bool empty):
+   DicomDirObject()
 {
-   docEntries = s->GetDocEntries();
+   if ( !empty )
+   {
+      ListDicomDirSerieElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirSerieElements();   
+      FillObject(elemList);
+   }
 }
 
-/**
- * \brief  Constructor 
- * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it 
- *               to build the gdcmDocEntries)
- */
-gdcmDicomDirSerie::gdcmDicomDirSerie(TagDocEntryHT *ptagHT):
-   gdcmDicomDirObject(ptagHT)
-{
-}
 /**
  * \brief   Canonical destructor.
  */
-gdcmDicomDirSerie::~gdcmDicomDirSerie() 
+DicomDirSerie::~DicomDirSerie() 
 {
-   for(ListDicomDirImage::iterator cc = images.begin();
-                                   cc != images.end();
-                                   ++cc)
-   {
-      delete *cc;
-   }
+   ClearImage();
 }
 
 //-----------------------------------------------------------------------------
-// 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 gdcmDicomDirSerie::Print(std::ostream &os)
+void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t)
 {
-   os << "SERIE" << std::endl;
-   gdcmDicomDirObject::Print(os);
+   DicomDirObject::WriteContent(fp, t);
 
-   for(ListDicomDirImage::iterator cc = images.begin();
-                                   cc != images.end();
-                                   ++cc)
+   for(ListDicomDirImage::iterator cc = Images.begin();
+                                   cc!= Images.end();
+                                 ++cc )
    {
-      (*cc)->SetPrintLevel(PrintLevel);
-      (*cc)->Print(os);
+      (*cc)->WriteContent( fp, t );
    }
 }
 
-//-----------------------------------------------------------------------------
-// Public
-
 /**
- * \brief   Writes the Object
- * @return
- */ 
-void gdcmDicomDirSerie::Write(FILE *fp, FileType t)
+ * \brief   adds a new Image (with the basic elements) to a partially created 
+ *          DICOMDIR
+ */
+DicomDirImage *DicomDirSerie::NewImage()
 {
-   gdcmDicomDirObject::Write(fp, t);
+   DicomDirImage *dd = DicomDirImage::New();
+   Images.push_back(dd);
+   return dd;   
+}
 
-   for(ListDicomDirImage::iterator cc = images.begin();cc!=images.end();++cc)
+/**
+ * \brief  Remove all images in the serie 
+ */
+void DicomDirSerie::ClearImage()
+{
+   for(ListDicomDirImage::iterator cc = Images.begin();
+                                   cc != Images.end();
+                                   ++cc)
    {
-      (*cc)->Write( 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
  */
-gdcmDicomDirImage * gdcmDicomDirSerie::NewImage()
+DicomDirImage *DicomDirSerie::GetFirstImage()
 {
-   std::list<gdcmElement> elemList = 
-      gdcmGlobal::GetDicomDirElements()->GetDicomDirImageElements();
+   ItImage = Images.begin();
+   if (ItImage != Images.end())
+      return *ItImage;
+   return NULL;
+}
 
-   gdcmDicomDirImage *st = new gdcmDicomDirImage(PtagHT);
-   FillObject(elemList);
-   images.push_front(st);
+/**
+ * \brief   Get the next entry while visiting the DicomDirImages
+ * \note : meaningfull only if GetFirstEntry 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;
+}
 
-   return st;   
-} 
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -114,3 +127,25 @@ gdcmDicomDirImage * gdcmDicomDirSerie::NewImage()
 // Private
 
 //-----------------------------------------------------------------------------
+// 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);
+   }
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm