X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirStudy.cxx;h=5d30d595871454551076915352d5c77670fb76c6;hb=8d704be3e460a26db22f2d41dbaf02811bc71a45;hp=d15c62efa8c92aab7728a43a197614042599417b;hpb=1bae8d2ba47d1b9cc8acfb7b5ab82026e48275dd;p=gdcm.git

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index d15c62ef..5d30d595 100644
--- a/src/gdcmDicomDirStudy.cxx
+++ b/src/gdcmDicomDirStudy.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirStudy.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/25 15:46:11 $
-  Version:   $Revision: 1.18 $
+  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
@@ -19,104 +19,123 @@
 #include "gdcmDicomDirStudy.h"
 #include "gdcmDicomDirElement.h"
 #include "gdcmGlobal.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDebug.h"
 
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-
-/**
- * \ingroup DicomDirStudy
- * \brief constructor  
- * @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)
- */
-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)
+ * \brief  Constructor 
+ * \note End user must use : DicomDirPatient::NewStudy()
  */
-DicomDirStudy::DicomDirStudy(TagDocEntryHT* ptagHT):
-   DicomDirObject(ptagHT)
+DicomDirStudy::DicomDirStudy(bool empty)
+              :DicomDirObject()
 {
+   if( !empty )
+   {
+      ListDicomDirStudyElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirStudyElements();
+      FillObject(elemList);
+   }
 }
+
 /**
- * \ingroup DicomDirStudy
  * \brief   Canonical destructor.
  */
 DicomDirStudy::~DicomDirStudy() 
 {
-   for(ListDicomDirSerie::iterator cc = Series.begin();
-                                   cc != Series.end();
-                                 ++cc )
-   {
-      delete *cc;
-   }
+   ClearSerie();
 }
 
 //-----------------------------------------------------------------------------
-// Print
+// Public
 /**
- * \ingroup DicomDirStudy
- * \brief   Prints the Object
+ * \brief   Writes the Object
+ * @param fp ofstream to write to
+ * @param t Type of the File (explicit VR, implicitVR, ...) 
  * @return
  */ 
-void DicomDirStudy::Print(std::ostream& os)
+void DicomDirStudy::WriteContent(std::ofstream *fp, FileType t)
 {
-   os << "STUDY" << std::endl;
-   DicomDirObject::Print(os);
+   DicomDirObject::WriteContent(fp, t);
 
    for(ListDicomDirSerie::iterator cc = Series.begin();
-                                   cc != Series.end();
-                                   ++cc)
+                                   cc!= Series.end();
+                                 ++cc )
    {
-      (*cc)->SetPrintLevel(PrintLevel);
-      (*cc)->Print(os);
+      (*cc)->WriteContent( fp, t );
    }
 }
 
-//-----------------------------------------------------------------------------
-// Public
-
 /**
- * \brief   Writes the Object
- * @return
- */ 
-void DicomDirStudy::WriteContent(std::ofstream* fp, FileType t)
+ * \brief   adds a new Serie at the beginning of the SerieList
+ *          of a partially created DICOMDIR
+ */
+DicomDirSerie *DicomDirStudy::NewSerie()
 {
-   DicomDirObject::WriteContent(fp, t);
+   DicomDirSerie *st = new DicomDirSerie();
+   Series.push_back(st);
+   return st;
+} 
 
+/**
+ * \brief  Remove all series in the study 
+ */
+void DicomDirStudy::ClearSerie()
+{
    for(ListDicomDirSerie::iterator cc = Series.begin();
-                                   cc!= Series.end();
+                                   cc != Series.end();
                                  ++cc )
    {
-      (*cc)->WriteContent( fp, t );
+      delete *cc;
    }
+   Series.clear();
 }
 
 /**
- * \ingroup DicomDirStudy
- * \brief   adds a new Serie at the begining of the SerieList
- *          of a partially created DICOMDIR
+ * \brief   Get the first entry while visiting the DicomDirSeries
+ * \return  The first DicomDirSerie if found, otherwhise NULL
  */
-DicomDirSerie* DicomDirStudy::NewSerie()
+DicomDirSerie *DicomDirStudy::GetFirstSerie()
 {
-   ListDicomDirSerieElem const & elemList = 
-      Global::GetDicomDirElements()->GetDicomDirSerieElements();   
+   ItSerie = Series.begin();
+   if (ItSerie != Series.end())
+      return *ItSerie;
+   return NULL;
+}
 
-   DicomDirSerie* st = new DicomDirSerie(PtagHT);
-   FillObject(elemList);
-   Series.push_front(st);
+/**
+ * \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::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;
+}
 
-   return st;  
-}   
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -124,5 +143,26 @@ DicomDirSerie* DicomDirStudy::NewSerie()
 // Private
 
 //-----------------------------------------------------------------------------
-} // end namespace gdcm
+// 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