Program: gdcm
Module: $RCSfile: gdcmDicomDirSerie.cxx,v $
Language: C++
- Date: $Date: 2005/01/20 16:16:42 $
- Version: $Revision: 1.32 $
+ Date: $Date: 2005/06/24 10:55:58 $
+ Version: $Revision: 1.38 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
namespace gdcm
{
-
//-----------------------------------------------------------------------------
// 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 indent
- */
-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();
}
//-----------------------------------------------------------------------------
}
/**
- * \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()
{
return st;
}
+/**
+ * \brief Remove all images in the serie
+ */
+void DicomDirSerie::ClearImage()
+{
+ for(ListDicomDirImage::iterator cc = Images.begin();
+ cc != Images.end();
+ ++cc)
+ {
+ delete *cc;
+ }
+ 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()
{
DicomDirImage *DicomDirSerie::GetNextImage()
{
gdcmAssertMacro (ItImage != Images.end());
- {
- ++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
- */
-DicomDirImage *DicomDirSerie::GetLastImage()
-{
- ItImage = Images.end();
- if (ItImage != Images.begin())
- {
- --ItImage;
+
+ ++ItImage;
+ if (ItImage != Images.end())
return *ItImage;
- }
return NULL;
}
// 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);
+ }
+}
+//-----------------------------------------------------------------------------
+} // end namespace gdcm