X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirStudy.cxx;h=8975dabdb0d4b825e69296f6aa358bba45aa75d4;hb=643a8d9fe7dc8470db4cf7a6de639beebb339076;hp=9a9f401c27984a0419ffda4e0b746084b551baf7;hpb=5c198a737e21a72460f81e81a1b9405b5a591b60;p=gdcm.git

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index 9a9f401c..8975dabd 100644
--- a/src/gdcmDicomDirStudy.cxx
+++ b/src/gdcmDicomDirStudy.cxx
@@ -1,82 +1,162 @@
-// gdcmDicomDirStudy.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirStudy.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/25 15:44:23 $
+  Version:   $Revision: 1.32 $
+                                                                                
+  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"
-//-----------------------------------------------------------------------------
-// Constructor / Destructor
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDebug.h"
 
-/**
- * \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)
- */
-gdcmDicomDirStudy::gdcmDicomDirStudy(gdcmSQItem *s, TagDocEntryHT *ptagHT):
-   gdcmObject(ptagHT)
+namespace gdcm 
 {
-   docEntries = s->GetDocEntries();
-}
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
 /**
- * \ingroup gdcmDicomDirStudy
- * \brief constructor  
- * @param ptagHT pointer to the HTable (gdcmObject needs it 
- *               to build the gdcmHeaderEntries)
+ * \brief  Constructor 
  */
-gdcmDicomDirStudy::gdcmDicomDirStudy(TagDocEntryHT *ptagHT):
-   gdcmObject(ptagHT)
+DicomDirStudy::DicomDirStudy(bool empty):
+   DicomDirObject()
 {
+   if( !empty )
+   {
+      ListDicomDirStudyElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirStudyElements();
+      FillObject(elemList);
+   }
 }
+
 /**
- * \ingroup gdcmDicomDirStudy
  * \brief   Canonical destructor.
  */
-gdcmDicomDirStudy::~gdcmDicomDirStudy() 
+DicomDirStudy::~DicomDirStudy() 
 {
-   for(ListDicomDirSerie::iterator cc = series.begin();cc != series.end();++cc)
-   {
-      delete *cc;
-   }
+   ClearSerie();
 }
 
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirStudy
  * \brief   Prints the Object
+ * @param os ostream to write to 
+ * @param indent Indentation string to be prepended during printing
  * @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);
    }
 }
 
 //-----------------------------------------------------------------------------
 // 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 );
+   }
+}
 
 /**
- * \ingroup gdcmDicomStudy
  * \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();   
-
-   gdcmDicomDirSerie *st = new gdcmDicomDirSerie(ptagHT);
-   FillObject(elemList);
-   series.push_front(st);
-   return st;  
-}   
+DicomDirSerie *DicomDirStudy::NewSerie()
+{
+   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 )
+   {
+      delete *cc;
+   }
+   Series.clear();
+}
+
+/**
+ * \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;
+}
+
+/**
+ * \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;
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -84,3 +164,5 @@ gdcmDicomDirSerie * gdcmDicomDirStudy::NewSerie(void) {
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+