Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2006/04/11 16:03:26 $
- Version: $Revision: 1.187 $
+ Date: $Date: 2007/04/12 13:06:03 $
+ Version: $Revision: 1.192 $
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 "gdcmDicomDirVisit.h"
#include "gdcmDicomDirImage.h"
+#include "gdcmDicomDirPrivate.h"
#include "gdcmDicomDirPatient.h"
#include "gdcmDicomDirMeta.h"
#include "gdcmDicomDirElement.h"
NewMeta();
}
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
/**
* \brief Constructor Parses recursively the directory and creates the DicomDir
* or uses an already built DICOMDIR, depending on 'parseDir' value.
* @deprecated use : new DicomDir() + [ SetLoadMode(lm) + ] SetDirectoryName(name)
* or : new DicomDir() + SetFileName(name)
*/
+ /*
DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
Document( )
{
// At this step, Document constructor is already executed,
// whatever user passed (either a root directory or a DICOMDIR)
// and whatever the value of parseDir was.
- // (nothing is cheked in Document constructor, to avoid overhead)
+ // (nothing is checked in Document constructor, to avoid overhead)
ParseDir = parseDir;
SetLoadMode (LD_ALL); // concerns only dicom files
SetFileName( fileName );
Load( );
}
-#endif
+*/
+//#endif
/**
* \brief Canonical destructor
}
return DoTheLoadingJob( );
}
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
/**
* \brief Loader. (DEPRECATED : kept not to break the API)
* @param fileName file to be open for parsing
* or no tag was found.
* @deprecated use SetFileName(n) + Load() instead
*/
+ /*
bool DicomDir::Load(std::string const &fileName )
{
// We should clean out anything that already exists.
}
return DoTheLoadingJob( );
}
-#endif
+*/
+//#endif
/**
* \brief Does the Loading Job (internal use only)
return false;
}
else
+ {
CreateDicomDir();
+ }
}
else
{
DicomDirMeta *DicomDir::NewMeta()
{
if ( MetaElems )
+ {
MetaElems->Delete();
-
+ }
DocEntry *entry = GetFirstEntry();
if ( entry )
{
if ( v == "IMAGE " )
{
- si = DicomDirImage::New(true);
+ si = DicomDirImage::New(true); // true = empty
if ( !AddImageToEnd( static_cast<DicomDirImage *>(si)) )
{
si->Delete();
}
else if ( v == "SERIES" )
{
- si = DicomDirSerie::New(true);
+ si = DicomDirSerie::New(true); // true = empty
if ( !AddSerieToEnd( static_cast<DicomDirSerie *>(si)) )
{
si->Delete();
}
else if ( v == "VISIT " )
{
- si = DicomDirVisit::New(true);
+ si = DicomDirVisit::New(true); // true = empty
if ( !AddVisitToEnd( static_cast<DicomDirVisit *>(si)) )
{
si->Delete();
}
else if ( v == "STUDY " )
{
- si = DicomDirStudy::New(true);
+ si = DicomDirStudy::New(true); // true = empty
if ( !AddStudyToEnd( static_cast<DicomDirStudy *>(si)) )
{
si->Delete();
}
else if ( v == "PATIENT " )
{
- si = DicomDirPatient::New(true);
+ si = DicomDirPatient::New(true); // true = empty
if ( !AddPatientToEnd( static_cast<DicomDirPatient *>(si)) )
{
si->Delete();
gdcmErrorMacro( "Add PatientToEnd failed");
}
}
+ /// \to do : deal with PRIVATE (not so easy, since PRIVATE appears
+ /// at different levels ?!? )
+
+ else if ( v == "PRIVATE " ) // for SIEMENS 'CSA Non Image'
+ {
+
+ gdcmWarningMacro( " -------------------------------------------"
+ << "a PRIVATE SQItem was found : " << v);
+ si = DicomDirPrivate::New(true); // true = empty
+ if ( !AddPrivateToEnd( static_cast<DicomDirPrivate *>(si)) )
+ {
+ si->Delete();
+ si = NULL;
+ gdcmErrorMacro( "Add PrivateToEnd failed");
+ }
+ }
else
{
// It was neither a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
// nor an 'IMAGE' SQItem. Skip to next item.
- gdcmDebugMacro( " -------------------------------------------"
+ gdcmWarningMacro( " -------------------------------------------"
<< "a non PATIENT/STUDY/SERIE/IMAGE SQItem was found : "
<< v);
return false;
}
+/**
+ * \brief AddPrivateToEnd
+ * @param dd SQ Item to enqueue to the DicomDirPrivate chained List
+ * (checked for SIEMENS 'CSA non image')
+ */
+bool DicomDir::AddPrivateToEnd(DicomDirPrivate *dd)
+{
+ if ( Patients.size() > 0 )
+ {
+ ListDicomDirPatient::iterator itp = Patients.end();
+ itp--;
+
+ DicomDirStudy *study = (*itp)->GetLastStudy();
+ if ( study )
+ {
+ DicomDirSerie *serie = study->GetLastSerie();
+ if ( serie )
+ {
+ serie->AddPrivate(dd);
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
/**
* \brief for each Header of the chained list,
* add/update the Patient/Study/Serie/Image info
ListDicomDirElem elemList;
ListDicomDirElem::const_iterator it;
uint16_t tmpGr, tmpEl;
- DictEntry *dictEntry;
+ //DictEntry *dictEntry;
DataEntry *entry;
std::string val;
SQItem *si;
-
switch( type )
{
case GDCM_DICOMDIR_IMAGE:
gdcmErrorMacro( "Add PatientToEnd failed");
}
break;
- case GDCM_DICOMDIR_META:
+ case GDCM_DICOMDIR_META: // never used ?!? --> Done within DoTheLoadingJob
if ( MetaElems )
{
MetaElems->Delete();
{
tmpGr = it->Group;
tmpEl = it->Elem;
- //dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl);
- //entry = DataEntry::New( dictEntry );
- entry = DataEntry::New(tmpGr, tmpEl, GDCM_VRUNKNOWN); /// \todo : modify dicomelements file, to store VR
+ entry = DataEntry::New(tmpGr, tmpEl, it->VR); // dicomelements file was modified, to store VR
entry->SetOffset(0); // just to avoid further missprinting
if ( header )
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff