Program: gdcm
Module: $RCSfile: gdcmDicomDir.h,v $
Language: C++
- Date: $Date: 2005/07/08 19:07:12 $
- Version: $Revision: 1.63 $
+ Date: $Date: 2005/07/21 05:02:11 $
+ Version: $Revision: 1.66 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMDICOMDIR_H
#include "gdcmDocument.h"
+#include "gdcmDebug.h"
#include <list>
#include <vector>
class DicomDirImage;
class SQItem;
-typedef std::list<DicomDirPatient *> ListDicomDirPatient;
-typedef std::vector<Document *> VectDocument;
+typedef std::list<DicomDirPatient *> ListDicomDirPatient;
+typedef std::vector<Document *> VectDocument;
//-----------------------------------------------------------------------------
/**
public:
typedef void Method(void*);
- DicomDir( std::string const &filename, bool parseDir = false );
DicomDir();
-
+ GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) );
~DicomDir();
- bool Load( std::string const &filename );
+ GDCM_LEGACY( bool Load(std::string const &filename) );
bool Load( );
void Print(std::ostream &os = std::cout, std::string const &indent = "" );
/// Sets the root Directory name to parse, recursively
void SetDirectoryName(std::string const &dirName)
{ ParseDir = true; if (Filename != dirName)
- Filename = dirName, IsDocumentModified = true; };
+ Filename = dirName, IsDocumentModified = true; }
/// Accessor to \ref Filename
virtual void SetFileName(std::string const &fileName)
{ ParseDir = false; if (Filename != fileName)
- Filename = fileName, IsDocumentModified = true; }
+ Filename = fileName, IsDocumentModified = true;}
/// DEPRECATED : use SetDirectoryName
- void SetParseDir(bool parseDir) { ParseDir = parseDir; };
+ GDCM_LEGACY( void SetParseDir(bool parseDir) );
// Informations contained in the parser
virtual bool IsReadable();
// Meta
DicomDirMeta *NewMeta();
/// Returns a pointer to the DicomDirMeta for this DICOMDIR.
- DicomDirMeta *GetMeta() { return MetaElems; };
+ DicomDirMeta *GetMeta() { return MetaElems; }
// Patients
DicomDirPatient *NewPatient();
void SetEndMethodArgDelete ( DicomDir::Method *m );
/// GetProgress GetProgress
- float GetProgress() { return Progress; };
+ float GetProgress() { return Progress; }
/// AbortProgress AbortProgress
- void AbortProgress() { Abort = true; };
+ void AbortProgress() { Abort = true; }
/// IsAborted IsAborted
- bool IsAborted() { return Abort; };
+ bool IsAborted() { return Abort; }
// Write
bool WriteDicomDir(std::string const &fileName);