BUG: Remove tons of mem leaks. There are still plenty that explains why gdcm is dog...

[gdcm.git] / src / gdcmDicomDirStudy.cxx

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index 417af7620663d9d357ddc05e6deacd002c934b02..a9ebc4f8c3c26dec8ad8884d72c4d94bc9c6f7f7 100644 (file)
--- a/src/gdcmDicomDirStudy.cxx
+++ b/src/gdcmDicomDirStudy.cxx
@@ -1,40 +1,61 @@
-// gdcmDicomDirStudy.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirStudy.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/10/25 04:08:20 $
+  Version:   $Revision: 1.17 $
+                                                                                
+  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 "gdcmDicomDirStudy.h"
 #include "gdcmDicomDirElement.h"
-#include "gdcmUtil.h"
+#include "gdcmGlobal.h"
+
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
 /**
- * \ingroup gdcmDicomDirStudy
+ * \ingroup DicomDirStudy
  * \brief constructor  
- * @param  begin  iterator (inside the gdcmParser chained list)
- *                on the first Header Entry (i.e Dicom Element)
- *                related to this "STUDY" part
- * @param  end  iterator  (inside the gdcmParser chained list)
- *              on the last Header Entry (i.e Dicom Element) 
- *              related to this 'STUDY' 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 "STUDY" part
+ * @param ptagHT pointer to the HTable (DicomDirObject needs it 
+ *               to build the HeaderEntries)
  */
-gdcmDicomDirStudy::gdcmDicomDirStudy(ListTag::iterator begin,
-                                     ListTag::iterator end,
-                                    TagHeaderEntryHT *ptagHT, 
-                                    ListTag *plistEntries):
-   gdcmObject(begin,end,ptagHT,plistEntries)
+DicomDirStudy::DicomDirStudy(SQItem* s, TagDocEntryHT* ptagHT):
+   DicomDirObject(ptagHT)
+{
+   DocEntries = s->GetDocEntries();
+}
+/**
+ * \ingroup DicomDirStudy
+ * \brief constructor  
+ * @param ptagHT pointer to the HTable (DicomDirObject needs it 
+ *               to build the HeaderEntries)
+ */
+DicomDirStudy::DicomDirStudy(TagDocEntryHT* ptagHT):
+   DicomDirObject(ptagHT)
 {
 }
-
 /**
- * \ingroup gdcmDicomDirStudy
+ * \ingroup DicomDirStudy
  * \brief   Canonical destructor.
  */
-gdcmDicomDirStudy::~gdcmDicomDirStudy() 
+DicomDirStudy::~DicomDirStudy() 
 {
-   for(ListDicomDirSerie::iterator cc = series.begin();cc != series.end();++cc)
+   for(ListDicomDirSerie::iterator cc = Series.begin();
+                                   cc != Series.end();
+                                 ++cc )
    {
       delete *cc;
    }
@@ -43,18 +64,20 @@ gdcmDicomDirStudy::~gdcmDicomDirStudy()
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirStudy
+ * \ingroup DicomDirStudy
  * \brief   Prints the Object
  * @return
  */ 
-void gdcmDicomDirStudy::Print(std::ostream &os)
+void DicomDirStudy::Print(std::ostream& os)
 {
-   os<<"STUDY"<<std::endl;
-   gdcmObject::Print(os);
+   os << "STUDY" << std::endl;
+   DicomDirObject::Print(os);
 
-   for(ListDicomDirSerie::iterator cc = series.begin();cc != series.end();++cc)
+   for(ListDicomDirSerie::iterator cc = Series.begin();
+                                   cc != Series.end();
+                                   ++cc)
    {
-      (*cc)->SetPrintLevel(printLevel);
+      (*cc)->SetPrintLevel(PrintLevel);
       (*cc)->Print(os);
    }
 }
@@ -62,19 +85,36 @@ void gdcmDicomDirStudy::Print(std::ostream &os)
 //-----------------------------------------------------------------------------
 // Public
 
-/*
- * \ingroup gdcmDicomStudy
+/**
+ * \brief   Writes the Object
+ * @return
+ */ 
+void DicomDirStudy::Write(std::ofstream* fp, FileType t)
+{
+   DicomDirObject::Write(fp, t);
+
+   for(ListDicomDirSerie::iterator cc = Series.begin();
+                                   cc!= Series.end();
+                                 ++cc )
+   {
+      (*cc)->Write( fp, t );
+   }
+}
+
+/**
+ * \ingroup DicomDirStudy
  * \brief   adds a new Serie at the begining of the SerieList
  *          of a partially created DICOMDIR
  */
-gdcmDicomDirSerie * gdcmDicomDirStudy::NewSerie(void) {
-  
-   std::list<gdcmElement> elemList;
-   elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirSerieElements();   
+DicomDirSerie* DicomDirStudy::NewSerie()
+{
+   ListDicomDirSerieElem const & elemList = 
+      Global::GetDicomDirElements()->GetDicomDirSerieElements();   
 
+   DicomDirSerie* st = new DicomDirSerie(PtagHT);
    FillObject(elemList);
-   gdcmDicomDirSerie *st = new gdcmDicomDirSerie(i, j, ptagHT, plistEntries);
-   series.push_front(st);
+   Series.push_front(st);
+
    return st;  
 }   
 //-----------------------------------------------------------------------------
@@ -84,3 +124,5 @@ gdcmDicomDirSerie * gdcmDicomDirStudy::NewSerie(void) {
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+