X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirStudy.cxx;h=bdb788406b0d79e3dd90a2fbf02d74d81b3bf337;hb=963480c814326423065a4a02fa1bf8bc1243ae4f;hp=fd8e886bbdaa8b4c07e4a87cc3036de49ac9f350;hpb=22f785a2627d1e7823701193bd7624739a3e033b;p=gdcm.git

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index fd8e886b..bdb78840 100644
--- a/src/gdcmDicomDirStudy.cxx
+++ b/src/gdcmDicomDirStudy.cxx
@@ -1,27 +1,46 @@
-// gdcmDicomDirStudy.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirStudy.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/18 11:39:59 $
+  Version:   $Revision: 1.26 $
+                                                                                
+  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 "gdcmGlobal.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDebug.h"
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmDicomDirStudy
- * \brief   
- * @param   begin iterator of begin for the object
- * @param   end   iterator of end for the object
+ * \brief  Constructor 
  */
-gdcmDicomDirStudy::gdcmDicomDirStudy(ListTag::iterator begin,ListTag::iterator end):
-   gdcmObject(begin,end)
+DicomDirStudy::DicomDirStudy():
+   DicomDirObject()
 {
 }
-
 /**
- * \ingroup gdcmDicomDirStudy
  * \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;
    }
@@ -30,18 +49,20 @@ gdcmDicomDirStudy::~gdcmDicomDirStudy()
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirStudy
  * \brief   Prints the Object
+ * @param os ostream to write to 
  * @return
  */ 
-void gdcmDicomDirStudy::Print(std::ostream &os)
+void DicomDirStudy::Print(std::ostream &os, std::string const & )
 {
-   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);
    }
 }
@@ -49,6 +70,67 @@ void gdcmDicomDirStudy::Print(std::ostream &os)
 //-----------------------------------------------------------------------------
 // Public
 
+/**
+ * \brief   Writes the Object
+ * @param fp ofstream to write to
+ * @param t Type of the File (explicit VR, implicitVR, ...) 
+ * @return
+ */ 
+void DicomDirStudy::WriteContent(std::ofstream *fp, FileType t)
+{
+   DicomDirObject::WriteContent(fp, t);
+
+   for(ListDicomDirSerie::iterator cc = Series.begin();
+                                   cc!= Series.end();
+                                 ++cc )
+   {
+      (*cc)->WriteContent( fp, t );
+   }
+}
+
+/**
+ * \brief   adds a new Serie at the begining of the SerieList
+ *          of a partially created DICOMDIR
+ */
+DicomDirSerie *DicomDirStudy::NewSerie()
+{
+   ListDicomDirSerieElem const &elemList = 
+      Global::GetDicomDirElements()->GetDicomDirSerieElements();   
+
+   DicomDirSerie* st = new DicomDirSerie();
+   FillObject(elemList);
+   Series.push_front(st);
+
+   return st;  
+} 
+
+ /**
+ * \brief   Get the first entry while visiting the DicomDirSeries
+ * \return  The first DicomDirSerie if found, otherwhise NULL
+ */
+DicomDirSerie *DicomDirStudy::GetFirstEntry()
+{
+   ItDicomDirSerie = Series.begin();
+   if (ItDicomDirSerie != Series.end())
+      return *ItDicomDirSerie;
+   return NULL;
+}
+
+/**
+ * \brief   Get the next entry while visiting the DicomDirSeries
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return  The next DicomDirSerie if found, otherwhise NULL
+ */
+DicomDirSerie *DicomDirStudy::GetNextEntry()
+{
+   gdcmAssertMacro (ItDicomDirSerie != Series.end());
+   {
+      ++ItDicomDirSerie;
+      if (ItDicomDirSerie != Series.end())
+         return *ItDicomDirSerie;
+   }
+   return NULL;
+}  
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -56,3 +138,5 @@ void gdcmDicomDirStudy::Print(std::ostream &os)
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+