X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDicomDirSerie.cxx;h=13c3108059a531afec0558a35deb89000f8ae032;hb=1bae8d2ba47d1b9cc8acfb7b5ab82026e48275dd;hp=a9f2d9654bb59439416fc37cc949e0ff97b19575;hpb=22f785a2627d1e7823701193bd7624739a3e033b;p=gdcm.git

diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx
index a9f2d965..13c31080 100644
--- a/src/gdcmDicomDirSerie.cxx
+++ b/src/gdcmDicomDirSerie.cxx
@@ -1,27 +1,59 @@
-// gdcmDicomDirSerie.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirSerie.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.21 $
+                                                                                
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirElement.h"
+#include "gdcmGlobal.h"
+
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmDicomDirSerie
- * \brief   
- * @param   begin iterator of begin for the object
- * @param   end   iterator of end for the object
+ * \brief  Constructor 
+ * @param  s  SQ Item holding the elements related to this "SERIE" part
+ * @param ptagHT pointer to the HTable (DicomDirObject needs it 
+ *               to build the DocEntries)
  */
-gdcmDicomDirSerie::gdcmDicomDirSerie(ListTag::iterator begin,ListTag::iterator end):
-   gdcmObject(begin,end)
+DicomDirSerie::DicomDirSerie(SQItem* s, TagDocEntryHT* ptagHT) :
+   DicomDirObject(ptagHT)
 {
+   DocEntries = s->GetDocEntries();
 }
 
 /**
- * \ingroup gdcmDicomDirSerie
+ * \brief  Constructor 
+ * @param ptagHT pointer to the HTable (DicomDirObject needs it 
+ *               to build the DocEntries)
+ */
+DicomDirSerie::DicomDirSerie(TagDocEntryHT* ptagHT):
+   DicomDirObject(ptagHT)
+{
+}
+/**
  * \brief   Canonical destructor.
  */
-gdcmDicomDirSerie::~gdcmDicomDirSerie() 
+DicomDirSerie::~DicomDirSerie() 
 {
-   for(ListDicomDirImage::iterator cc = images.begin();cc != images.end();++cc)
+   for(ListDicomDirImage::iterator cc = Images.begin();
+                                   cc != Images.end();
+                                   ++cc)
    {
       delete *cc;
    }
@@ -30,18 +62,19 @@ gdcmDicomDirSerie::~gdcmDicomDirSerie()
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirSerie
  * \brief   Prints the Object
  * @return
  */ 
-void gdcmDicomDirSerie::Print(std::ostream &os)
+void DicomDirSerie::Print(std::ostream& os)
 {
-   os<<"SERIE"<<std::endl;
-   gdcmObject::Print(os);
+   os << "SERIE" << std::endl;
+   DicomDirObject::Print(os);
 
-   for(ListDicomDirImage::iterator cc = images.begin();cc != images.end();++cc)
+   for(ListDicomDirImage::iterator cc = Images.begin();
+                                   cc != Images.end();
+                                   ++cc)
    {
-      (*cc)->SetPrintLevel(printLevel);
+      (*cc)->SetPrintLevel(PrintLevel);
       (*cc)->Print(os);
    }
 }
@@ -49,6 +82,36 @@ void gdcmDicomDirSerie::Print(std::ostream &os)
 //-----------------------------------------------------------------------------
 // Public
 
+/**
+ * \brief   Writes the Object
+ * @return
+ */ 
+void DicomDirSerie::WriteContent(std::ofstream* fp, FileType t)
+{
+   DicomDirObject::WriteContent(fp, t);
+
+   for(ListDicomDirImage::iterator cc = Images.begin();
+                                   cc!= Images.end();
+                                 ++cc )
+   {
+      (*cc)->WriteContent( fp, t );
+   }
+}
+
+/**
+ * \brief   adds a new Image (with the basic elements) to a partially created DICOMDIR
+ */
+DicomDirImage* DicomDirSerie::NewImage()
+{
+   ListDicomDirImageElem const & elemList = 
+      Global::GetDicomDirElements()->GetDicomDirImageElements();
+
+   DicomDirImage* st = new DicomDirImage(PtagHT);
+   FillObject(elemList);
+   Images.push_front(st);
+
+   return st;   
+} 
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -56,3 +119,6 @@ void gdcmDicomDirSerie::Print(std::ostream &os)
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+
+