X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirStudy.cxx;h=e817e7340c52133fbc21ea62658018bf9edbb626;hb=3eff461b8ad6c34c5d4a9fa6b4ce1eca87daf550;hp=cd3b07c60445c98d4b142c8ea5707e2f2b4bd6d9;hpb=3fd520b58c8d1939994de2c63cc038c3e7ac9522;p=gdcm.git

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index cd3b07c6..e817e734 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/08/26 15:29:52 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/01/06 20:03:27 $
+  Version:   $Revision: 1.22 $
                                                                                 
   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,38 +19,28 @@
 #include "gdcmDicomDirStudy.h"
 #include "gdcmDicomDirElement.h"
 #include "gdcmGlobal.h"
-//-----------------------------------------------------------------------------
-// Constructor / Destructor
+#include "gdcmDicomDirSerie.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():
+   DicomDirObject()
 {
 }
 /**
- * \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;
    }
@@ -59,17 +49,17 @@ 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)
 {
    os << "STUDY" << std::endl;
-   gdcmObject::Print(os);
+   DicomDirObject::Print(os);
 
-   for(ListDicomDirSerie::iterator cc = series.begin();
-                                   cc != series.end();
+   for(ListDicomDirSerie::iterator cc = Series.begin();
+                                   cc != Series.end();
                                    ++cc)
    {
       (*cc)->SetPrintLevel(PrintLevel);
@@ -82,31 +72,34 @@ void gdcmDicomDirStudy::Print(std::ostream &os)
 
 /**
  * \brief   Writes the Object
+ * @param fp ofstream to write to
+ * @param t Type of the File (explicit VR, implicitVR, ...) 
  * @return
  */ 
-void gdcmDicomDirStudy::Write(FILE *fp, FileType t)
+void DicomDirStudy::WriteContent(std::ofstream *fp, FileType t)
 {
-   gdcmObject::Write(fp, t);
+   DicomDirObject::WriteContent(fp, t);
 
-   for(ListDicomDirSerie::iterator cc = series.begin();cc!=series.end();++cc)
+   for(ListDicomDirSerie::iterator cc = Series.begin();
+                                   cc!= Series.end();
+                                 ++cc )
    {
-      (*cc)->Write( fp, t );
+      (*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()
+DicomDirSerie *DicomDirStudy::NewSerie()
 {
-   std::list<gdcmElement> elemList = 
-      gdcmGlobal::GetDicomDirElements()->GetDicomDirSerieElements();   
+   ListDicomDirSerieElem const &elemList = 
+      Global::GetDicomDirElements()->GetDicomDirSerieElements();   
 
-   gdcmDicomDirSerie *st = new gdcmDicomDirSerie(PtagHT);
+   DicomDirSerie* st = new DicomDirSerie();
    FillObject(elemList);
-   series.push_front(st);
+   Series.push_front(st);
 
    return st;  
 }   
@@ -117,3 +110,5 @@ gdcmDicomDirSerie * gdcmDicomDirStudy::NewSerie()
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+