X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirStudy.cxx;h=5d30d595871454551076915352d5c77670fb76c6;hb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;hp=3dffdb3a6e1d2e437eee769db7bf8eb9120a7ca1;hpb=2012716d624d631dcdb825fdd4470908e115a717;p=gdcm.git

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index 3dffdb3a..5d30d595 100644
--- a/src/gdcmDicomDirStudy.cxx
+++ b/src/gdcmDicomDirStudy.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirStudy.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:47 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/02/02 10:02:16 $
+  Version:   $Revision: 1.36 $
                                                                                 
   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
@@ -19,80 +19,123 @@
 #include "gdcmDicomDirStudy.h"
 #include "gdcmDicomDirElement.h"
 #include "gdcmGlobal.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDebug.h"
+
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-
 /**
- * \ingroup gdcmDicomDirStudy
- * \brief constructor  
- * @param  s SQ Item holding the elements related to this "STUDY" part
- * @param ptagHT pointer to the HTable (gdcmObject needs it 
- *               to build the gdcmHeaderEntries)
+ * \brief  Constructor 
+ * \note End user must use : DicomDirPatient::NewStudy()
  */
-gdcmDicomDirStudy::gdcmDicomDirStudy(gdcmSQItem *s, TagDocEntryHT *ptagHT):
-   gdcmObject(ptagHT)
+DicomDirStudy::DicomDirStudy(bool empty)
+              :DicomDirObject()
 {
-   docEntries = s->GetDocEntries();
+   if( !empty )
+   {
+      ListDicomDirStudyElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirStudyElements();
+      FillObject(elemList);
+   }
 }
+
 /**
- * \ingroup gdcmDicomDirStudy
- * \brief constructor  
- * @param ptagHT pointer to the HTable (gdcmObject needs it 
- *               to build the gdcmHeaderEntries)
+ * \brief   Canonical destructor.
  */
-gdcmDicomDirStudy::gdcmDicomDirStudy(TagDocEntryHT *ptagHT):
-   gdcmObject(ptagHT)
+DicomDirStudy::~DicomDirStudy() 
 {
+   ClearSerie();
 }
+
+//-----------------------------------------------------------------------------
+// Public
 /**
- * \ingroup gdcmDicomDirStudy
- * \brief   Canonical destructor.
- */
-gdcmDicomDirStudy::~gdcmDicomDirStudy() 
+ * \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)
 {
-   for(ListDicomDirSerie::iterator cc = series.begin();cc != series.end();++cc)
+   DicomDirObject::WriteContent(fp, t);
+
+   for(ListDicomDirSerie::iterator cc = Series.begin();
+                                   cc!= Series.end();
+                                 ++cc )
    {
-      delete *cc;
+      (*cc)->WriteContent( fp, t );
    }
 }
 
-//-----------------------------------------------------------------------------
-// Print
 /**
- * \ingroup gdcmDicomDirStudy
- * \brief   Prints the Object
- * @return
- */ 
-void gdcmDicomDirStudy::Print(std::ostream &os)
+ * \brief   adds a new Serie at the beginning of the SerieList
+ *          of a partially created DICOMDIR
+ */
+DicomDirSerie *DicomDirStudy::NewSerie()
 {
-   os<<"STUDY"<<std::endl;
-   gdcmObject::Print(os);
+   DicomDirSerie *st = new DicomDirSerie();
+   Series.push_back(st);
+   return st;
+} 
 
-   for(ListDicomDirSerie::iterator cc = series.begin();cc != series.end();++cc)
+/**
+ * \brief  Remove all series in the study 
+ */
+void DicomDirStudy::ClearSerie()
+{
+   for(ListDicomDirSerie::iterator cc = Series.begin();
+                                   cc != Series.end();
+                                 ++cc )
    {
-      (*cc)->SetPrintLevel(printLevel);
-      (*cc)->Print(os);
+      delete *cc;
    }
+   Series.clear();
 }
 
-//-----------------------------------------------------------------------------
-// Public
+/**
+ * \brief   Get the first entry while visiting the DicomDirSeries
+ * \return  The first DicomDirSerie if found, otherwhise NULL
+ */
+DicomDirSerie *DicomDirStudy::GetFirstSerie()
+{
+   ItSerie = Series.begin();
+   if (ItSerie != Series.end())
+      return *ItSerie;
+   return NULL;
+}
 
 /**
- * \ingroup gdcmDicomStudy
- * \brief   adds a new Serie at the begining of the SerieList
- *          of a partially created DICOMDIR
+ * \brief   Get the next entry while visiting the DicomDirSeries
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return  The next DicomDirSerie if found, otherwhise NULL
  */
-gdcmDicomDirSerie * gdcmDicomDirStudy::NewSerie(void) {
-  
-   std::list<gdcmElement> elemList;
-   elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirSerieElements();   
-
-   gdcmDicomDirSerie *st = new gdcmDicomDirSerie(ptagHT);
-   FillObject(elemList);
-   series.push_front(st);
-   return st;  
-}   
+DicomDirSerie *DicomDirStudy::GetNextSerie()
+{
+   gdcmAssertMacro (ItSerie != Series.end());
+
+   ++ItSerie;
+   if (ItSerie != Series.end())
+      return *ItSerie;
+   return NULL;
+}  
+
+/**
+ * \brief   Get the last entry while visiting the DicomDirSeries
+ * \return  The first DicomDirSerie if found, otherwhise NULL
+ */
+DicomDirSerie *DicomDirStudy::GetLastSerie()
+{
+   ItSerie = Series.end();
+   if (ItSerie != Series.begin())
+   {
+     --ItSerie;
+      return *ItSerie;
+   }
+   return NULL;
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -100,3 +143,26 @@ gdcmDicomDirSerie * gdcmDicomDirStudy::NewSerie(void) {
 // Private
 
 //-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Prints the Object
+ * @param os ostream to write to 
+ * @param indent Indentation string to be prepended during printing
+ * @return
+ */ 
+void DicomDirStudy::Print(std::ostream &os, std::string const & )
+{
+   os << "STUDY" << std::endl;
+   DicomDirObject::Print(os);
+
+   for(ListDicomDirSerie::iterator cc = Series.begin();
+                                   cc != Series.end();
+                                   ++cc)
+   {
+      (*cc)->SetPrintLevel(PrintLevel);
+      (*cc)->Print(os);
+   }
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm