Program: gdcm
Module: $RCSfile: gdcmDicomDirSerie.cxx,v $
Language: C++
- Date: $Date: 2005/01/23 10:12:33 $
- Version: $Revision: 1.33 $
+ Date: $Date: 2007/08/29 15:30:49 $
+ Version: $Revision: 1.45 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirSerie.h"
#include "gdcmDicomDirElement.h"
#include "gdcmDicomDirImage.h"
+#include "gdcmDicomDirPrivate.h"
#include "gdcmGlobal.h"
#include "gdcmDebug.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
-
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \brief Constructor
+ * \brief Constructor
+ * \note End user must use : DicomDirStudy::NewSerie()
*/
DicomDirSerie::DicomDirSerie(bool empty):
DicomDirObject()
{
- if( !empty )
+ if ( !empty )
{
ListDicomDirSerieElem const &elemList =
Global::GetDicomDirElements()->GetDicomDirSerieElements();
*/
DicomDirSerie::~DicomDirSerie()
{
- for(ListDicomDirImage::iterator cc = Images.begin();
- cc != Images.end();
- ++cc)
- {
- delete *cc;
- }
-}
-
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief Prints the Object
- * @param os ostream to write to
- * @param indent Indentation string to be prepended during printing
- */
-void DicomDirSerie::Print(std::ostream &os, std::string const &)
-{
- os << "SERIE" << std::endl;
- DicomDirObject::Print(os);
-
- for(ListDicomDirImage::iterator cc = Images.begin();
- cc != Images.end();
- ++cc)
- {
- (*cc)->SetPrintLevel(PrintLevel);
- (*cc)->Print(os);
- }
+ ClearImage();
+ ClearPrivate(); // For SIEMENS 'CSA non image'
}
//-----------------------------------------------------------------------------
* @param fp ofstream to write to
* @param t Type of the File (explicit VR, implicitVR, ...)
*/
-void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t)
+void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t, bool dummy, bool dummy2)
{
- DicomDirObject::WriteContent(fp, t);
+ DicomDirObject::WriteContent(fp, t, false, true);
for(ListDicomDirImage::iterator cc = Images.begin();
cc!= Images.end();
++cc )
{
- (*cc)->WriteContent( fp, t );
- }
+ (*cc)->WriteContent( fp, t, false, true );
+ }
+ for(ListDicomDirPrivate::iterator cc2 = Privates.begin();
+ cc2!= Privates.end();
+ ++cc2 )
+ {
+ (*cc2)->WriteContent( fp, t, false, true);
+ }
}
/**
- * \brief adds a new Image (with the basic elements) to a partially created DICOMDIR
+ * \brief adds a new Image (with the basic elements) to a partially created
+ * DICOMDIR
*/
DicomDirImage *DicomDirSerie::NewImage()
{
- DicomDirImage *st = new DicomDirImage();
- Images.push_back(st);
- return st;
+ DicomDirImage *dd = DicomDirImage::New();
+ Images.push_back(dd);
+ return dd;
+}
+
+/**
+ * \brief adds a new Private (with the basic elements) to a partially created
+ * DICOMDIR
+ */
+
+DicomDirPrivate *DicomDirSerie::NewPrivate()
+{
+ DicomDirPrivate *dd = DicomDirPrivate::New();
+ Privates.push_back(dd);
+ return dd;
+}
+
+/**
+ * \brief Remove all 'Privates' in the serie
+ */
+void DicomDirSerie::ClearPrivate()
+{
+ for(ListDicomDirPrivate::iterator cc = Privates.begin();
+ cc!= Privates.end();
+ ++cc)
+ {
+ (*cc)->Delete();
+ }
+ Privates.clear();
+}
+
+/**
+ * \brief Remove all 'Images' in the serie
+ */
+void DicomDirSerie::ClearImage()
+{
+ for(ListDicomDirImage::iterator cc = Images.begin();
+ cc!= Images.end();
+ ++cc)
+ {
+ (*cc)->Delete();
+ }
+ Images.clear();
}
/**
* \brief Get the first entry while visiting the DicomDirImage
- * \return The first DicomDirImage if found, otherwhise NULL
+ * \return The first DicomDirImage if DicomDirserie not empty, otherwhise NULL
*/
DicomDirImage *DicomDirSerie::GetFirstImage()
{
/**
* \brief Get the next entry while visiting the DicomDirImages
- * \note : meaningfull only if GetFirstEntry already called
+ * \note : meaningfull only if GetFirstImage already called
* \return The next DicomDirImages if found, otherwhise NULL
*/
DicomDirImage *DicomDirSerie::GetNextImage()
{
gdcmAssertMacro (ItImage != Images.end());
- {
- ++ItImage;
- if (ItImage != Images.end())
- return *ItImage;
- }
+
+ ++ItImage;
+ if (ItImage != Images.end())
+ return *ItImage;
return NULL;
}
-
+
/**
- * \brief Get the first entry while visiting the DicomDirImage
- * \return The first DicomDirImage if found, otherwhise NULL
+ * \brief Get the first entry while visiting the DicomDirPrivate
+ * \return The first DicomDirPrivate if DicomDirserie not empty, otherwhise NULL
*/
-DicomDirImage *DicomDirSerie::GetLastImage()
+DicomDirPrivate *DicomDirSerie::GetFirstPrivate()
{
- ItImage = Images.end();
- if (ItImage != Images.begin())
- {
- --ItImage;
- return *ItImage;
- }
+ ItPrivate = Privates.begin();
+ if (ItPrivate != Privates.end())
+ return *ItPrivate;
return NULL;
}
+/**
+ * \brief Get the next entry while visiting the DicomDirPrivates
+ * \note : meaningfull only if GetFirstPrivate already called
+ * \return The next DicomDirPrivates if found, otherwhise NULL
+ */
+DicomDirPrivate *DicomDirSerie::GetNextPrivate()
+{
+ gdcmAssertMacro (ItPrivate != Privates.end());
+
+ ++ItPrivate;
+ if (ItPrivate != Privates.end())
+ return *ItPrivate;
+ 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 DicomDirSerie::Copy(DocEntrySet *set)
+{
+ // Remove all previous childs
+ ClearImage();
+ ClearPrivate();
+
+ DicomDirObject::Copy(set);
+
+ DicomDirSerie *ddEntry = dynamic_cast<DicomDirSerie *>(set);
+ if( ddEntry )
+ {
+ Images = ddEntry->Images;
+ for(ItImage = Images.begin();ItImage != Images.end();++ItImage)
+ (*ItImage)->Register();
+
+ Privates = ddEntry->Privates;
+ for(ItPrivate = Privates.begin();ItPrivate != Privates.end();++ItPrivate)
+ (*ItPrivate)->Register();
+ }
+}
+
//-----------------------------------------------------------------------------
// Protected
// Private
//-----------------------------------------------------------------------------
-} // end namespace gdcm
+// Print
+/**
+ * \brief Prints the Object
+ * @param os ostream to write to
+ * @param indent Indentation string to be prepended during printing
+ */
+void DicomDirSerie::Print(std::ostream &os, std::string const &)
+{
+ os << "SERIE" << std::endl;
+ DicomDirObject::Print(os);
+ for(ListDicomDirImage::iterator cc = Images.begin();
+ cc != Images.end();
+ ++cc)
+ {
+ (*cc)->SetPrintLevel(PrintLevel);
+ (*cc)->Print(os);
+ }
+
+ for(ListDicomDirPrivate::iterator cc2 = Privates.begin();
+ cc2 != Privates.end();
+ ++cc2)
+ {
+ (*cc2)->SetPrintLevel(PrintLevel);
+ (*cc2)->Print(os);
+ }
+
+}
+//-----------------------------------------------------------------------------
+} // end namespace gdcm