X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirStudy.cxx;h=5e34175cd02c3c1a27c297c3ff31b399dc44b62b;hb=add6c88b334e9cf4ddb0ae1849f1380f9844f99c;hp=6cac6bebf371a0fa0ca63239620a82a5dfbbfa20;hpb=1ce6ae86daabc8b64c9309acce4ecf137ee79f07;p=gdcm.git

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index 6cac6beb..5e34175c 100644
--- a/src/gdcmDicomDirStudy.cxx
+++ b/src/gdcmDicomDirStudy.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirStudy.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/31 12:19:33 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2007/10/08 15:20:17 $
+  Version:   $Revision: 1.46 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,9 +20,10 @@
 #include "gdcmDicomDirElement.h"
 #include "gdcmGlobal.h"
 #include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirVisit.h"
 #include "gdcmDebug.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -30,10 +31,10 @@ namespace gdcm
  * \brief  Constructor 
  * \note End user must use : DicomDirPatient::NewStudy()
  */
-DicomDirStudy::DicomDirStudy(bool empty):
-   DicomDirObject()
+DicomDirStudy::DicomDirStudy(bool empty)
+              :DicomDirObject()
 {
-   if( !empty )
+   if ( !empty )
    {
       ListDicomDirStudyElem const &elemList = 
          Global::GetDicomDirElements()->GetDicomDirStudyElements();
@@ -49,28 +50,6 @@ DicomDirStudy::~DicomDirStudy()
    ClearSerie();
 }
 
-//-----------------------------------------------------------------------------
-// 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);
-   }
-}
-
 //-----------------------------------------------------------------------------
 // Public
 /**
@@ -79,15 +58,22 @@ void DicomDirStudy::Print(std::ostream &os, std::string const & )
  * @param t Type of the File (explicit VR, implicitVR, ...) 
  * @return
  */ 
-void DicomDirStudy::WriteContent(std::ofstream *fp, FileType t)
+void DicomDirStudy::WriteContent(std::ofstream *fp, FileType t, bool , bool )
 {
-   DicomDirObject::WriteContent(fp, t);
+   DicomDirObject::WriteContent(fp, t, false, true);
 
    for(ListDicomDirSerie::iterator cc = Series.begin();
                                    cc!= Series.end();
                                  ++cc )
    {
-      (*cc)->WriteContent( fp, t );
+      (*cc)->WriteContent( fp, t, false, true );
+   }
+
+   for(ListDicomDirVisit::iterator icc = Visits.begin();
+                                   icc!= Visits.end();
+                                 ++icc )
+   {
+      (*icc)->WriteContent( fp, t, false, true );
    }
 }
 
@@ -97,9 +83,9 @@ void DicomDirStudy::WriteContent(std::ofstream *fp, FileType t)
  */
 DicomDirSerie *DicomDirStudy::NewSerie()
 {
-   DicomDirSerie* st = new DicomDirSerie();
-   Series.push_back(st);
-   return st;
+   DicomDirSerie *dd = DicomDirSerie::New();
+   Series.push_back(dd);
+   return dd;
 } 
 
 /**
@@ -111,7 +97,7 @@ void DicomDirStudy::ClearSerie()
                                    cc != Series.end();
                                  ++cc )
    {
-      delete *cc;
+      (*cc)->Delete();
    }
    Series.clear();
 }
@@ -145,7 +131,7 @@ DicomDirSerie *DicomDirStudy::GetNextSerie()
 
 /**
  * \brief   Get the last entry while visiting the DicomDirSeries
- * \return  The first DicomDirSerie if found, otherwhise NULL
+ * \return  The last DicomDirSerie if found, otherwhise NULL
  */
 DicomDirSerie *DicomDirStudy::GetLastSerie()
 {
@@ -158,6 +144,101 @@ DicomDirSerie *DicomDirStudy::GetLastSerie()
    return NULL;
 }
 
+
+/**
+ * \brief   adds a new Visit at the beginning of the VisitList
+ *          of a partially created DICOMDIR
+ */
+DicomDirVisit *DicomDirStudy::NewVisit()
+{
+   DicomDirVisit *dd = DicomDirVisit::New();
+   Visits.push_back(dd);
+   dd->Delete();
+   return dd;
+} 
+
+/**
+ * \brief  Remove all visits in the study 
+ */
+void DicomDirStudy::ClearVisit()
+{
+   for(ListDicomDirVisit::iterator cc =  Visits.begin();
+                                   cc != Visits.end();
+                                 ++cc )
+   {
+      (*cc)->Delete();
+   }
+   Visits.clear();
+}
+
+/**
+ * \brief   Get the first entry while visiting the DicomDirVisit
+ * \return  The first DicomDirVisit if found, otherwhise NULL
+ */
+DicomDirVisit *DicomDirStudy::GetFirstVisit()
+{
+   ItVisit = Visits.begin();
+   if (ItVisit != Visits.end())
+      return *ItVisit;
+   return NULL;
+}
+
+/**
+ * \brief   Get the next entry while visiting the DicomDirVisit
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return  The next DicomDirVisit if found, otherwhise NULL
+ */
+DicomDirVisit *DicomDirStudy::GetNextVisit()
+{
+   gdcmAssertMacro (ItVisit != Visits.end());
+
+   ++ItVisit;
+   if (ItVisit != Visits.end())
+      return *ItVisit;
+   return NULL;
+}
+
+/**
+ * \brief   Get the last entry while visiting the DicomDirVisit
+ * \return  The last DicomDirVisit if found, otherwhise NULL
+ */
+DicomDirVisit *DicomDirStudy::GetLastVisit()
+{
+   ItVisit = Visits.end();
+   if (ItVisit != Visits.begin())
+   {
+     --ItVisit;
+      return *ItVisit;
+   }
+   return NULL;
+}
+
+/**
+ * \brief Copies all the attributes from an other DocEntrySet 
+ * @param set entry to copy from
+ * @remarks The contained DocEntries a not copied, only referenced
+ */
+void DicomDirStudy::Copy(DocEntrySet *set)
+{
+   // Remove all previous childs
+   ClearSerie();
+   ClearVisit();
+
+   DicomDirObject::Copy(set);
+
+   DicomDirStudy *ddEntry = dynamic_cast<DicomDirStudy *>(set);
+   if( ddEntry )
+   {
+      Series = ddEntry->Series;
+      for(ItSerie = Series.begin();ItSerie != Series.end();++ItSerie)
+         (*ItSerie)->Register();
+
+      Visits = ddEntry->Visits;
+      for(ItVisit = Visits.begin();ItVisit != Visits.end();++ItVisit)
+         (*ItVisit)->Register();
+   }
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -165,5 +246,35 @@ DicomDirSerie *DicomDirStudy::GetLastSerie()
 // 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);
+   }
+
+   for(ListDicomDirVisit::iterator cc2 =  Visits.begin();
+                                   cc2 != Visits.end();
+                                   ++cc2)
+   {
+      (*cc2)->SetPrintLevel(PrintLevel);
+      (*cc2)->Print(os);
+   }
+
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm