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

diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx
index 1272df3c..13c31080 100644
--- a/src/gdcmDicomDirSerie.cxx
+++ b/src/gdcmDicomDirSerie.cxx
@@ -1,38 +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
 /**
  * \brief  Constructor 
- * @param  begin  iterator (inside the gdcmParser chained list)
- *                on the first Header Entry (i.e Dicom Element)
- *                related to this "SERIE" part
- * @param  end  iterator  (inside the gdcmParser chained list)
- *              on the last Header Entry (i.e Dicom Element) 
- *              related to this 'SERIE' part
- * @param ptagHT pointer to the HTable (gdcmObject needs it 
- *               to build the gdcmHeaderEntries)
- * @param plistEntries pointer to the chained List (gdcmObject needs it 
- *               to build the gdcmHeaderEntries)
+ * @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,              
-                                     TagHeaderEntryHT *ptagHT, 
-                                     ListTag *plistEntries ):
-   gdcmObject(begin,end,ptagHT,plistEntries)
+DicomDirSerie::DicomDirSerie(SQItem* s, TagDocEntryHT* ptagHT) :
+   DicomDirObject(ptagHT)
 {
+   DocEntries = s->GetDocEntries();
 }
 
+/**
+ * \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;
    }
@@ -44,30 +65,51 @@ gdcmDicomDirSerie::~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);
    }
 }
 
 //-----------------------------------------------------------------------------
 // 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 to a partially created DICOMDIR
+ * \brief   adds a new Image (with the basic elements) to a partially created DICOMDIR
  */
-gdcmDicomDirImage * gdcmDicomDirSerie::NewImage(void) {
-   std::list<gdcmElement> elemList;   
-   elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirImageElements();
-      
+DicomDirImage* DicomDirSerie::NewImage()
+{
+   ListDicomDirImageElem const & elemList = 
+      Global::GetDicomDirElements()->GetDicomDirImageElements();
+
+   DicomDirImage* st = new DicomDirImage(PtagHT);
    FillObject(elemList);
-   gdcmDicomDirImage *st = new gdcmDicomDirImage(i, j, ptagHT, plistEntries);
-   images.push_front(st);
+   Images.push_front(st);
+
    return st;   
 } 
 //-----------------------------------------------------------------------------
@@ -77,3 +119,6 @@ gdcmDicomDirImage * gdcmDicomDirSerie::NewImage(void) {
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+
+