Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2004/06/23 13:02:36 $
- Version: $Revision: 1.52 $
+ Date: $Date: 2005/07/07 16:37:40 $
+ Version: $Revision: 1.144 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
=========================================================================*/
-#include <string>
-#include <algorithm>
-#include <sys/types.h>
-#include <errno.h>
-
-#ifdef _MSC_VER
- #include <direct.h>
-#else
- #include <unistd.h>
-#endif
-
+//-----------------------------------------------------------------------------
+// For full DICOMDIR description, see:
+// PS 3.3-2003, pages 731-750
+//-----------------------------------------------------------------------------
#include "gdcmDicomDir.h"
#include "gdcmDicomDirStudy.h"
#include "gdcmDicomDirSerie.h"
#include "gdcmDicomDirImage.h"
+#include "gdcmDicomDirPatient.h"
+#include "gdcmDicomDirMeta.h"
+#include "gdcmDicomDirElement.h"
#include "gdcmDirList.h"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
#include "gdcmGlobal.h"
-#include "gdcmHeader.h"
+#include "gdcmFile.h"
#include "gdcmSeqEntry.h"
#include "gdcmSQItem.h"
#include "gdcmValEntry.h"
-//-----------------------------------------------------------------------------
-// For full DICOMDIR description, see:
-// PS 3.3-2003, pages 731-750
+#include <fstream>
+#include <string>
+#include <algorithm>
+#include <sys/types.h>
+
+#ifdef _MSC_VER
+# define getcwd _getcwd
+#endif
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+# include <direct.h>
+#else
+# include <unistd.h>
+#endif
+// ----------------------------------------------------------------------------
+// Note for future developpers
+// ----------------------------------------------------------------------------
+//
+// Dicom PS 3.3 describes the relationship between Directory Records, as follow
+// (see also PS 4.3, 2004, page 50 for Entity-Relationship model)
+//
+// Directory Record Type Directory Record Types which may be included
+// in the next lower-level directory Entity
+//
+// (Root directory Entity) PATIENT, TOPIC, PRIVATE
+//
+// PATIENT STUDY, PRIVATE
+//
+// STUDY SERIES, VISIT, RESULTS, STUDY COMPONENT, PRIVATE
+//
+// SERIES IMAGE, OVERLAYS, MODALITY LUT, VOI LUT,
+// CURVE, STORED PRINT, RT DOSE, RT STRUCTURE SET
+// RT PLAN, RT TREAT RECORD, PRESENTATION, WAVEFORM,
+// SR DOCUMENT, KEY OBJECT DOC, SPECTROSCOPY,
+// RAW DATA, REGISTRATION, FIDUCIAL, PRIVATE,
+// ENCAP DOC
+// IMAGE
+// OVERLAY
+// MODALITY LUT
+// VOI LUT
+// CURVE
+// STORED PRINT
+// RT DOSE
+// RT STRUCTURE SET
+// RT PLAN
+// RT TREAT RECORD
+// PRESENTATION
+// WAVEFORM
+// SR DOCUMENT
+// KEY OBJECT DOC
+// SPECTROSCOPY
+// RAW DATA
+// REGISTRATION
+// FIDUCIAL
+// PRIVATE
+// ENCAP DOC
+//
+// ----------------------
+// The current gdcm version only deals with :
+//
+// (Root directory Entity) PATIENT
+// PATIENT STUDY
+// STUDY SERIES
+// SERIES IMAGE
+// IMAGE /
+//
+// DicomDir::CreateDicomDir will have to be completed
+// Treelike structure management will have to be upgraded
+// ----------------------------------------------------------------------------
+
+namespace gdcm
+{
//-----------------------------------------------------------------------------
// Constructor / Destructor
-
-void gdcmDicomDir::Initialize(void)
+/**
+ * \brief Constructor : creates an empty DicomDir
+ */
+DicomDir::DicomDir()
+ :Document( )
{
- startMethod = NULL;
- progressMethod = NULL;
- endMethod = NULL;
- startMethodArgDelete = NULL;
- progressMethodArgDelete = NULL;
- endMethodArgDelete = NULL;
- startArg = NULL;
- progressArg = NULL;
- endArg = NULL;
-
- progress = 0.0;
- abort = false;
-
- metaElems = (gdcmDicomDirMeta *)0;
+ Initialize(); // sets all private fields to NULL
+ NewMeta();
}
-
/**
* \brief Constructor Parses recursively the directory and creates the DicomDir
* or uses an already built DICOMDIR, depending on 'parseDir' value.
- * @param FileName name
+ * @param fileName name
* - of the root directory (parseDir = true)
* - of the DICOMDIR (parseDir = false)
* @param parseDir boolean
* and wants to explore recursively the directories
* - false if user passed an already built DICOMDIR file
* and wants to use it
- * @param exception_on_error whether we want to throw an exception or not
*/
-gdcmDicomDir::gdcmDicomDir(const char *FileName, bool parseDir,
- bool exception_on_error):
- gdcmDocument(FileName,exception_on_error,true) // true : enable SeQuences
+DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
+ Document( )
{
- // que l'on ai passe un root directory ou un DICOMDIR
- // et quelle que soit la valeur de parseDir,
- // on a lance gdcmDocument
- Initialize();
+ // 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)
+
+ ParseDir = parseDir;
+ SetLoadMode (0x00000000); // concerns only dicom files
+ Load( fileName );
+}
- // gdcmDocument already executed
- // if user passed a root directory, sure we didn't get anything
+/**
+ * \brief Canonical destructor
+ */
+DicomDir::~DicomDir()
+{
+ SetStartMethod(NULL);
+ SetProgressMethod(NULL);
+ SetEndMethod(NULL);
- if( GetEntry().begin() == GetEntry().end() )
+ ClearPatient();
+ if ( MetaElems )
{
- dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : entry HT empty");
+ delete MetaElems;
+ }
+}
- if(strlen(FileName)==1 && FileName[0]=='.') { // user passed '.' as Name
- // we get current directory name
- char* dummy= new char[1000];
- getcwd(dummy, (size_t)1000);
- SetFileName(dummy); // will be converted into a string
- delete[] dummy; // no longer needed
+//-----------------------------------------------------------------------------
+// Public
+
+/**
+ * \brief Loader. use SetLoadMode(), SetFileName() before !
+ * @return false if file cannot be open or no swap info was found,
+ * or no tag was found.
+ */
+bool DicomDir::Load( )
+{
+ // We should clean out anything that already exists.
+ Initialize(); // sets all private fields to NULL
+
+ if (!ParseDir)
+ {
+ if ( ! this->Document::Load( ) )
+ return false;
+ }
+ return DoTheLoadingJob( );
+}
+
+/**
+ * \brief Loader. (DEPRECATED : not to break the API)
+ * @param fileName file to be open for parsing
+ * @return false if file cannot be open or no swap info was found,
+ * or no tag was found.
+ */
+bool DicomDir::Load(std::string const &fileName )
+{
+ // We should clean out anything that already exists.
+ Initialize(); // sets all private fields to NULL
+
+ SetFileName( fileName );
+ if (!ParseDir)
+ {
+ if ( ! this->Document::Load( ) )
+ return false;
+ }
+ return DoTheLoadingJob( );
+}
+
+/**
+ * \brief Does the Loading Job (internal use only)
+ * @return false if file cannot be open or no swap info was found,
+ * or no tag was found.
+ */
+bool DicomDir::DoTheLoadingJob( )
+{
+ // We should clean out anything that already exists.
+ Initialize(); // sets all private fields to NULL
+
+ if (!ParseDir)
+ {
+ // Only if user passed a DICOMDIR
+ // ------------------------------
+ Fp = 0;
+ if ( !OpenFile() )
+ {
+ return false;
+ }
+ if (!Document::Load() )
+ {
+ return false;
}
- if(parseDir)
+ if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse
{
- dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : Parse directory"
- " and create the DicomDir");
- ParseDirectory();
- } else {
- /// \todo if parseDir == false, it should be tagged as an error
+ gdcmWarningMacro( "Entry HT empty for file: "<< GetFileName());
+ return false;
}
+ // Directory record sequence
+ DocEntry *e = GetDocEntry(0x0004, 0x1220);
+ if ( !e )
+ {
+ gdcmWarningMacro( "NO 'Directory record sequence' (0x0004,0x1220)"
+ << " in file " << GetFileName());
+ return false;
+ }
+ else
+ CreateDicomDir();
}
else
{
- // Directory record sequence
- gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220);
- if (e==NULL) {
- dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : NO Directory record"
- " sequence (0x0004,0x1220)");
- /// \todo FIXME : what to do when the parsed file IS NOT a
- /// DICOMDIR file ?
- }
- CreateDicomDir();
- }
+ // Only if user passed a root directory
+ // ------------------------------------
+ if ( GetFileName() == "." )
+ {
+ // user passed '.' as Name
+ // we get current directory name
+ char dummy[1000];
+ getcwd(dummy, (size_t)1000);
+ SetFileName( dummy ); // will be converted into a string
+ }
+ NewMeta();
+ gdcmWarningMacro( "Parse directory and create the DicomDir : "
+ << GetFileName() );
+ ParseDirectory();
+ }
+ return true;
}
/**
- * \ingroup gdcmDicomDir
- * \brief Constructor : creates an empty gdcmDicomDir
- * @param exception_on_error whether we want to throw an exception or not
+ * \brief This predicate, based on hopefully reasonable heuristics,
+ * decides whether or not the current document was properly parsed
+ * and contains the mandatory information for being considered as
+ * a well formed and usable DicomDir.
+ * @return true when Document is the one of a reasonable DicomDir,
+ * false otherwise.
*/
-gdcmDicomDir::gdcmDicomDir(bool exception_on_error):
- gdcmDocument(exception_on_error)
-{
-
- Initialize();
+bool DicomDir::IsReadable()
+{
+ if ( Filetype == Unknown )
+ {
+ gdcmWarningMacro( "Wrong filetype");
+ return false;
+ }
+ if ( !MetaElems )
+ {
+ gdcmWarningMacro( "Meta Elements missing in DicomDir");
+ return false;
+ }
+ if ( Patients.size() <= 0 )
+ {
+ gdcmWarningMacro( "NO Patient in DicomDir");
+ return false;
+ }
- std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ...
- SetElement(pathBidon, GDCM_DICOMDIR_META, NULL); // Set the META elements
- AddDicomDirMeta();
+ return true;
}
/**
- * \brief Canonical destructor
- */
-gdcmDicomDir::~gdcmDicomDir()
+ * \brief adds *the* Meta to a partially created DICOMDIR
+ */
+DicomDirMeta *DicomDir::NewMeta()
{
- SetStartMethod(NULL);
- SetProgressMethod(NULL);
- SetEndMethod(NULL);
+ if ( MetaElems )
+ delete MetaElems;
- if(metaElems)
- delete metaElems;
-
- for(ListDicomDirPatient::iterator cc = patients.begin();
- cc!= patients.end();
- ++cc)
+ DocEntry *entry = GetFirstEntry();
+ if ( entry )
+ {
+ MetaElems = new DicomDirMeta(true); // true = empty
+
+ entry = GetFirstEntry();
+ while( entry )
+ {
+ if ( dynamic_cast<SeqEntry *>(entry) )
+ break;
+
+ RemoveEntryNoDestroy(entry);
+ MetaElems->AddEntry(entry);
+
+ entry = GetFirstEntry();
+ }
+ }
+ else // after root directory parsing
{
- delete *cc;
+ MetaElems = new DicomDirMeta(false); // false = not empty
}
+ MetaElems->SetSQItemNumber(0); // To avoid further missprinting
+ return MetaElems;
}
-//-----------------------------------------------------------------------------
-// Print
/**
- * \brief Canonical Printer
+ * \brief adds a new Patient (with the basic elements) to a partially created
+ * DICOMDIR
*/
-void gdcmDicomDir::Print(std::ostream &os)
+DicomDirPatient *DicomDir::NewPatient()
{
- if(metaElems)
- {
- metaElems->SetPrintLevel(printLevel);
- metaElems->Print(os);
- }
- for(ListDicomDirPatient::iterator cc = patients.begin();
- cc != patients.end();
+ DicomDirPatient *p = new DicomDirPatient();
+ AddPatientToEnd( p );
+ return p;
+}
+
+/**
+ * \brief Remove all Patients
+ */
+void DicomDir::ClearPatient()
+{
+ for(ListDicomDirPatient::iterator cc = Patients.begin();
+ cc!= Patients.end();
++cc)
{
- (*cc)->SetPrintLevel(printLevel);
- (*cc)->Print(os);
+ delete *cc;
}
+ Patients.clear();
}
-//-----------------------------------------------------------------------------
-// Public
/**
- * \brief This predicate, based on hopefully reasonable heuristics,
- * decides whether or not the current header was properly parsed
- * and contains the mandatory information for being considered as
- * a well formed and usable DicomDir.
- * @return true when gdcmDocument is the one of a reasonable DicomDir,
- * false otherwise.
+ * \brief Get the first entry while visiting the DicomDirPatients
+ * \return The first DicomDirPatient if found, otherwhise NULL
+ */
+DicomDirPatient *DicomDir::GetFirstPatient()
+{
+ ItPatient = Patients.begin();
+ if ( ItPatient != Patients.end() )
+ return *ItPatient;
+ return NULL;
+}
+
+/**
+ * \brief Get the next entry while visiting the DicomDirPatients
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return The next DicomDirPatient if found, otherwhise NULL
*/
-bool gdcmDicomDir::IsReadable(void)
+DicomDirPatient *DicomDir::GetNextPatient()
{
- if(!gdcmDocument::IsReadable())
- return(false);
- if(!metaElems)
- return(false);
- if(patients.size()<=0)
- return(false);
+ gdcmAssertMacro (ItPatient != Patients.end());
- return(true);
+ ++ItPatient;
+ if ( ItPatient != Patients.end() )
+ return *ItPatient;
+ return NULL;
}
/**
- * \ingroup gdcmDicomDir
* \brief fills the whole structure, starting from a root Directory
*/
-void gdcmDicomDir::ParseDirectory(void)
+void DicomDir::ParseDirectory()
{
- CreateDicomDirChainedList(GetFileName());
+ CreateDicomDirChainedList( GetFileName() );
CreateDicomDir();
}
/**
- * \ingroup gdcmDicomDir
- * \brief Set the start method to call when the parsing of the directory starts
+ * \brief Set the start method to call when the parsing of the
+ * directory starts.
* @param method Method to call
* @param arg Argument to pass to the method
* @param argDelete Argument
* \warning In python : the arg parameter isn't considered
*/
-void gdcmDicomDir::SetStartMethod(gdcmMethod *method,void *arg,gdcmMethod *argDelete)
+void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg,
+ DicomDir::Method *argDelete )
{
- if((startArg)&&(startMethodArgDelete))
- startMethodArgDelete(startArg);
+ if ( StartArg && StartMethodArgDelete )
+ {
+ StartMethodArgDelete( StartArg );
+ }
- startMethod=method;
- startArg=arg;
- startMethodArgDelete=argDelete;
+ StartMethod = method;
+ StartArg = arg;
+ StartMethodArgDelete = argDelete;
}
+
/**
- * \ingroup gdcmDicomDir
- * \brief Set the method to delete the argument
- * The argument is destroyed when the method is changed or when the
- * class is destroyed
- * @param method Method to call to delete the argument
+ * \brief Set the progress method to call when the parsing of the
+ * directory progress
+ * @param method Method to call
+ * @param arg Argument to pass to the method
+ * @param argDelete Argument
+ * \warning In python : the arg parameter isn't considered
*/
-void gdcmDicomDir::SetStartMethodArgDelete(gdcmMethod *method)
+void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg,
+ DicomDir::Method *argDelete )
{
- startMethodArgDelete=method;
+ if ( ProgressArg && ProgressMethodArgDelete )
+ {
+ ProgressMethodArgDelete( ProgressArg );
+ }
+
+ ProgressMethod = method;
+ ProgressArg = arg;
+ ProgressMethodArgDelete = argDelete;
}
/**
- * \ingroup gdcmDicomDir
- * \brief Set the progress method to call when the parsing of the directory progress
+ * \brief Set the end method to call when the parsing of the directory ends
* @param method Method to call
* @param arg Argument to pass to the method
- * @param argDelete Argument
+ * @param argDelete Argument
* \warning In python : the arg parameter isn't considered
*/
-void gdcmDicomDir::SetProgressMethod(gdcmMethod *method,void *arg,gdcmMethod *argDelete)
+void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg,
+ DicomDir::Method *argDelete )
{
- if((progressArg)&&(progressMethodArgDelete))
- progressMethodArgDelete(progressArg);
+ if ( EndArg && EndMethodArgDelete )
+ {
+ EndMethodArgDelete( EndArg );
+ }
- progressMethod=method;
- progressArg=arg;
- progressMethodArgDelete=argDelete;
+ EndMethod = method;
+ EndArg = arg;
+ EndMethodArgDelete = argDelete;
}
/**
- * \ingroup gdcmDicomDir
* \brief Set the method to delete the argument
- * The argument is destroyed when the method is changed or when the
- * class is destroyed
+ * The argument is destroyed when the method is changed or when the
+ * class is destroyed
* @param method Method to call to delete the argument
*/
-void gdcmDicomDir::SetProgressMethodArgDelete(gdcmMethod *method)
+void DicomDir::SetStartMethodArgDelete( DicomDir::Method *method )
{
- progressMethodArgDelete=method;
+ StartMethodArgDelete = method;
}
/**
- * \ingroup gdcmDicomDir
- * \brief Set the end method to call when the parsing of the directory ends
- * @param method Method to call
- * @param arg Argument to pass to the method
- * @param argDelete Argument
- * \warning In python : the arg parameter isn't considered
+ * \brief Set the method to delete the argument
+ * The argument is destroyed when the method is changed or when the
+ * class is destroyed
+ * @param method Method to call to delete the argument
*/
-void gdcmDicomDir::SetEndMethod(gdcmMethod *method, void *arg, gdcmMethod *argDelete)
+void DicomDir::SetProgressMethodArgDelete( DicomDir::Method *method )
{
- if((endArg)&&(endMethodArgDelete))
- endMethodArgDelete(endArg);
-
- endMethod=method;
- endArg=arg;
- endMethodArgDelete=argDelete;
+ ProgressMethodArgDelete = method;
}
/**
- * \ingroup gdcmDicomDir
* \brief Set the method to delete the argument
- * The argument is destroyed when the method is changed or when the class
- * is destroyed
+ * The argument is destroyed when the method is changed or when
+ * the class is destroyed
* @param method Method to call to delete the argument
*/
-void gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod *method)
+void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method )
{
- endMethodArgDelete=method;
+ EndMethodArgDelete = method;
}
/**
- * \ingroup gdcmDicomDir
- * \brief writes on disc a DICOMDIR
+ * \brief writes on disc a DICOMDIR
* \ warning does NOT add the missing elements in the header :
* it's up to the user doing it !
- * \todo : to be re-written using the DICOMDIR tree-like structure
- * *not* the chained list
- * (does NOT exist if the DICOMDIR is user-forged !)
* @param fileName file to be written to
* @return false only when fail to open
*/
-bool gdcmDicomDir::Write(std::string fileName)
-{
- FILE * fp1;
+bool DicomDir::WriteDicomDir(std::string const &fileName)
+{
+ int i;
+ uint16_t sq[4] = { 0x0004, 0x1220, 0xffff, 0xffff };
+ uint16_t sqt[4]= { 0xfffe, 0xe0dd, 0xffff, 0xffff };
+
+ std::ofstream *fp = new std::ofstream(fileName.c_str(),
+ std::ios::out | std::ios::binary);
+ if ( !fp )
+ {
+ gdcmWarningMacro("Failed to open(write) File: " << fileName.c_str());
+ return false;
+ }
- fp1=fopen(fileName.c_str(),"wb");
- if(fp1==NULL)
+ char filePreamble[128];
+ memset(filePreamble, 0, 128);
+ fp->write(filePreamble, 128);
+ binary_write( *fp, "DICM");
+
+ DicomDirMeta *ptrMeta = GetMeta();
+ ptrMeta->WriteContent(fp, ExplicitVR);
+
+ // force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta
+ for(i=0;i<4;++i)
+ {
+ binary_write(*fp, sq[i]);
+ }
+
+ for(ListDicomDirPatient::iterator cc = Patients.begin();
+ cc != Patients.end();
+ ++cc )
+ {
+ (*cc)->WriteContent( fp, ExplicitVR );
+ }
+
+ // force writing Sequence Delimitation Item
+ for(i=0;i<4;++i)
{
- printf("Failed to open(write) File [%s] \n",fileName.c_str());
- return(false);
+ binary_write(*fp, sqt[i]); // fffe e0dd ffff ffff
}
- char * filePreamble = new char[128];
- fwrite(filePreamble,128,1,fp1);
- fwrite("DICM",4,1,fp1);
- delete[] filePreamble;
- UpdateDirectoryRecordSequenceLength();
- WriteEntries(fp1);
+ fp->close();
+ delete fp;
- fclose(fp1);
return true;
}
/**
- * \brief Writes in a file using the tree-like structure.
- * @param _fp already open file pointer
+ * \brief Anonymize a DICOMDIR
+ * @return true
*/
+
+bool DicomDir::AnonymizeDicomDir()
+{
+ ValEntry *v;
+ // Something clever to be found to forge the Patient names
+ std::ostringstream s;
+ int i = 1;
+ for(ListDicomDirPatient::iterator cc = Patients.begin();
+ cc!= Patients.end();
+ ++cc)
+ {
+ s << i;
+ v = (*cc)->GetValEntry(0x0010, 0x0010) ; // Patient's Name
+ if (v)
+ {
+ v->SetValue(s.str());
+ }
-void gdcmDicomDir::WriteEntries(FILE *) //_fp
-{
- /// \todo (?) tester les echecs en ecriture
- /// (apres chaque fwrite, dans le WriteEntry)
-
-
-/* TODO : to go on compiling
+ v = (*cc)->GetValEntry(0x0010, 0x0020) ; // Patient ID
+ if (v)
+ {
+ v->SetValue(" ");
+ }
- gdcmDicomDirMeta *ptrMeta;
- ListDicomDirPatient::iterator itPatient;
- ListDicomDirStudy::iterator itStudy;
- ListDicomDirSerie::iterator itSerie;
- ListDicomDirImage::iterator itImage;
- ListTag::iterator i;
-
- ptrMeta= GetDicomDirMeta();
- for(i=ptrMeta->debut();i!=ptrMeta->fin();++i) {
- WriteEntry(*i,_fp, gdcmExplicitVR);
- }
-
- itPatient = GetDicomDirPatients().begin();
- while ( itPatient != GetDicomDirPatients().end() ) {
- for(i=(*itPatient)->debut();i!=(*itPatient)->fin();++i) {
- WriteEntry(*i,_fp, gdcmExplicitVR);
+ v = (*cc)->GetValEntry(0x0010, 0x0030) ; // Patient's BirthDate
+ if (v)
+ {
+ v->SetValue(" ");
}
- itStudy = ((*itPatient)->GetDicomDirStudies()).begin();
- while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) {
- for(i=(*itStudy)->debut();i!=(*itStudy)->fin();++i) {
- WriteEntry(*i,_fp, gdcmExplicitVR);
- }
- itSerie = ((*itStudy)->GetDicomDirSeries()).begin();
- while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) {
- for(i=(*itSerie)->debut();i!=(*itSerie)->fin();++i) {
- WriteEntry(*i,_fp, gdcmExplicitVR);
- }
- itImage = ((*itSerie)->GetDicomDirImages()).begin();
- while (itImage != (*itSerie)->GetDicomDirImages().end() ) {
- for(i=(*itImage)->debut();i!=(*itImage)->fin();++i) {
- WriteEntry(*i,_fp, gdcmExplicitVR);
- }
- ++itImage;
- }
- ++itSerie;
- }
- ++itStudy;
- }
- ++itPatient;
+ s << "";
+ i++;
}
- */
-}
-
+ return true;
+}
+
//-----------------------------------------------------------------------------
// Protected
-
/**
- * \ingroup gdcmDicomDir
- * \brief create a gdcmDocument-like chained list from a root Directory
+ * \brief create a Document-like chained list from a root Directory
* @param path entry point of the tree-like structure
*/
-void gdcmDicomDir::CreateDicomDirChainedList(std::string path)
+void DicomDir::CreateDicomDirChainedList(std::string const &path)
{
CallStartMethod();
-
- gdcmDirList fileList(path,1); // gets recursively the file list
- unsigned int count=0;
+ DirList dirList(path,1); // gets recursively the file list
+ unsigned int count = 0;
VectDocument list;
- gdcmHeader *header;
+ File *f;
- tagHT.clear();
- patients.clear();
+ DirListType fileList = dirList.GetFilenames();
- for(gdcmDirList::iterator it=fileList.begin();
- it!=fileList.end();
- ++it)
+ for( DirListType::iterator it = fileList.begin();
+ it != fileList.end();
+ ++it )
{
- progress=(float)(count+1)/(float)fileList.size();
+ Progress = (float)(count+1)/(float)fileList.size();
CallProgressMethod();
- if(abort)
+ if ( Abort )
+ {
break;
+ }
- header=new gdcmHeader(it->c_str());
- if(header->IsReadable())
- list.push_back(header); // adds the file header to the chained list
- else
- delete header;
+ f = new File( );
+ f->SetLoadMode(LoadMode); // we allow user not to load Sequences...
+ f->Load( it->c_str() );
- count++;
+// if ( !f )
+// {
+// gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() );
+// continue;
+// }
+
+ if ( f->IsReadable() )
+ {
+ // Add the file to the chained list:
+ list.push_back(f);
+ gdcmWarningMacro( "Readable " << it->c_str() );
+ }
+ else
+ {
+ delete f;
+ }
+ count++;
}
// sorts Patient/Study/Serie/
- std::sort(list.begin(),list.end(),gdcmDicomDir::HeaderLessThan);
-
- std::string tmp=fileList.GetDirName();
-
- //for each Header of the chained list, add/update the Patient/Study/Serie/Image info
- SetElements(tmp,list);
-
+ std::sort(list.begin(), list.end(), DicomDir::HeaderLessThan );
+
+ std::string tmp = dirList.GetDirName();
+ //for each File of the chained list, add/update the Patient/Study/Serie/Image info
+ SetElements(tmp, list);
CallEndMethod();
-}
-/**
- * \ingroup gdcmDicomDir
- * \brief adds *the* Meta to a partially created DICOMDIR
- */
-
- // FIXME : Heuuuuu ! Il prend les Entries du Document deja parse,
- // il ne fabrique rien !
-
-gdcmDicomDirMeta * gdcmDicomDir::NewMeta(void) {
- gdcmDicomDirMeta *m = new gdcmDicomDirMeta(&tagHT);
- for (TagDocEntryHT::iterator cc = tagHT.begin();cc != tagHT.end();++cc) {
- m->AddDocEntry(cc->second);
+ for(VectDocument::iterator itDoc=list.begin();
+ itDoc!=list.end();
+ ++itDoc)
+ {
+ delete dynamic_cast<File *>(*itDoc);
}
- return m;
}
-
/**
- * \ingroup gdcmDicomDir
- * \brief adds a new Patient (with the basic elements) to a partially created DICOMDIR
+ * \brief CallStartMethod
*/
-gdcmDicomDirPatient * gdcmDicomDir::NewPatient(void) {
- std::list<gdcmElement> elemList;
- std::list<gdcmElement>::iterator it;
- guint16 tmpGr,tmpEl;
- gdcmDictEntry *dictEntry;
- gdcmValEntry *entry;
-
- gdcmSQItem *s = new gdcmSQItem(0);
-
- elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements();
-
- // TODO : use FillObject !!!
-
- // for all the DicomDirPatient Elements
-
- for(it=elemList.begin();it!=elemList.end();++it)
+void DicomDir::CallStartMethod()
+{
+ Progress = 0.0f;
+ Abort = false;
+ if ( StartMethod )
{
- tmpGr=it->group;
- tmpEl=it->elem;
- dictEntry=GetPubDict()->GetDictEntryByNumber(tmpGr,tmpEl);
- entry=new gdcmValEntry(dictEntry);
- entry->SetOffset(0); // just to avoid further missprinting
- entry->SetValue(it->value);
-
- // dealing with value length ...
-
- if(dictEntry->GetGroup()==0xfffe)
- {
- entry->SetLength(entry->GetValue().length());
- }
- else if( (dictEntry->GetVR()=="UL") || (dictEntry->GetVR()=="SL") )
- {
- entry->SetLength(4);
- }
- else if( (dictEntry->GetVR()=="US") || (dictEntry->GetVR()=="SS") )
- {
- entry->SetLength(2);
- }
- else if(dictEntry->GetVR()=="SQ")
- {
- entry->SetLength(0xffffffff);
- }
- else
- {
- entry->SetLength(entry->GetValue().length());
- }
- s->AddDocEntry(entry);
+ StartMethod( StartArg );
}
-
- gdcmDicomDirPatient *p = new gdcmDicomDirPatient(s, &tagHT);
- patients.push_front(p);
- return p;
}
/**
- * \brief adds to the HTable
- * the gdcmEntries (Dicom Elements) corresponding to the given type
- * @param path full path file name (only used when type = GDCM_DICOMDIR_IMAGE
- * @param type gdcmObject type to create (GDCM_DICOMDIR_PATIENT,
- * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...)
- * @param header gdcmHeader of the current file
+ * \brief CallProgressMethod
*/
-void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type,
- gdcmDocument *header)
+void DicomDir::CallProgressMethod()
{
- std::list<gdcmElement> elemList;
- std::list<gdcmElement>::iterator it;
- guint16 tmpGr, tmpEl;
- gdcmDictEntry *dictEntry;
- gdcmValEntry *entry;
- std::string val;
-
- switch(type){
- case GDCM_DICOMDIR_PATIENT:
- elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements();
- break;
- case GDCM_DICOMDIR_STUDY:
- elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements();
- break;
- case GDCM_DICOMDIR_SERIE:
- elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirSerieElements();
- break;
- case GDCM_DICOMDIR_IMAGE:
- elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirImageElements();
- break;
- case GDCM_DICOMDIR_META:
- elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirMetaElements();
- break;
- default:
- return;
+ if ( ProgressMethod )
+ {
+ ProgressMethod( ProgressArg );
}
-
- for(it=elemList.begin();it!=elemList.end();++it) {
- tmpGr=it->group;
- tmpEl=it->elem;
- dictEntry=GetPubDict()->GetDictEntryByNumber(tmpGr,tmpEl);
- entry=new gdcmValEntry(dictEntry); // Be sure it's never a BinEntry !
-
- entry->SetOffset(0); // just to avoid further missprinting
-
- if(header)
- val=header->GetEntryByNumber(tmpGr,tmpEl);
- else
- val=GDCM_UNFOUND;
-
- if(val==GDCM_UNFOUND)
- {
- if((tmpGr==0x0004) &&(tmpEl==0x1130) ) // File-set ID
- {
- // force to the *end* File Name
- val=GetName(path);
- }
- else if( (tmpGr==0x0004) && (tmpEl==0x1500) ) // Only used for image
- {
- if(header->GetFileName().substr(0,path.length())!=path)
- {
- dbg.Verbose(0, "gdcmDicomDir::SetElement : the base path"
- " of file name is incorrect");
- val=header->GetFileName();
- }
- else
- {
- val=&(header->GetFileName().c_str()[path.length()]);
- }
- }
- else
- {
- val=it->value;
- }
- }
- else
- {
- if (header->GetEntryLengthByNumber(tmpGr,tmpEl)== 0)
- val=it->value;
- }
-
- entry->SetValue(val);
-
- if(dictEntry)
- {
- if(dictEntry->GetGroup()==0xfffe) {
- entry->SetLength(entry->GetValue().length());
- }
- else if( (dictEntry->GetVR()=="UL") || (dictEntry->GetVR()=="SL") )
- {
- entry->SetLength(4);
- }
- else if( (dictEntry->GetVR()=="US") || (dictEntry->GetVR()=="SS") )
- {
- entry->SetLength(2);
- }
- else if(dictEntry->GetVR()=="SQ")
- {
- entry->SetLength(0xffffffff);
- }
- else
- {
- entry->SetLength(entry->GetValue().length());
- }
- }
- //AddDocEntry(entry); // both in H Table and in chained list
- tagHT[entry->GetKey()] = entry; // FIXME : use a SEQUENCE !
- }
}
/**
- * \brief CallStartMethod
- */
-void gdcmDicomDir::CallStartMethod(void)
-{
- progress=0.0f;
- abort=false;
- if(startMethod)
- startMethod(startArg);
-}
-/**
- * \ingroup gdcmDicomDir
- * \brief CallProgressMethod
+ * \brief CallEndMethod
*/
-void gdcmDicomDir::CallProgressMethod(void)
+void DicomDir::CallEndMethod()
{
- if(progressMethod)
- progressMethod(progressArg);
+ Progress = 1.0f;
+ if ( EndMethod )
+ {
+ EndMethod( EndArg );
+ }
}
+
+//-----------------------------------------------------------------------------
+// Private
/**
- * \ingroup gdcmDicomDir
- * \brief CallEndMethod
+ * \brief Sets all fields to NULL
*/
-void gdcmDicomDir::CallEndMethod(void)
+void DicomDir::Initialize()
{
- progress=1.0f;
- if(endMethod)
- endMethod(endArg);
+ StartMethod = NULL;
+ ProgressMethod = NULL;
+ EndMethod = NULL;
+ StartMethodArgDelete = NULL;
+ ProgressMethodArgDelete = NULL;
+ EndMethodArgDelete = NULL;
+ StartArg = NULL;
+ ProgressArg = NULL;
+ EndArg = NULL;
+
+ Progress = 0.0;
+ Abort = false;
+
+ MetaElems = NULL;
}
-//-----------------------------------------------------------------------------
-// Private
/**
- * \ingroup gdcmDicomDir
- * \brief create a 'gdcmDicomDir' from a DICOMDIR gdcmHeader
+ * \brief create a 'gdcm::DicomDir' from a DICOMDIR Header
*/
-void gdcmDicomDir::CreateDicomDir()
+void DicomDir::CreateDicomDir()
{
- // The list is parsed.
+ // The SeqEntries of "Directory Record Sequence" are parsed.
// When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found :
// 1 - we save the beginning iterator
// 2 - we continue to parse
// + we create the object for the precedent tag
// + loop to 1 -
- gdcmDicomDirType type=gdcmDicomDir::GDCM_DICOMDIR_META;
-
// Directory record sequence
- gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220);
- if (e==NULL)
+ DocEntry *e = GetDocEntry(0x0004, 0x1220);
+ if ( !e )
{
- dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : NO Directory record"
- " sequence (0x0004,0x1220)");
- /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ?
+ gdcmWarningMacro( "No Directory Record Sequence (0004,1220) found");
return;
}
- gdcmSeqEntry* s = dynamic_cast<gdcmSeqEntry*>(e);
- if (!s)
+ SeqEntry *s = dynamic_cast<SeqEntry *>(e);
+ if ( !s )
{
- dbg.Verbose(0, "gdcmDicomDir::CreateDicomDir: no SeqEntry present");
+ gdcmWarningMacro( "Element (0004,1220) is not a Sequence ?!?");
return;
}
- ListSQItem listItems = s->GetSQItems();
- gdcmDicomDirMeta *m = new gdcmDicomDirMeta(&tagHT);
- (void)m; //??
+ NewMeta();
- gdcmDocEntry * d;
+ DocEntry *d;
std::string v;
- for(ListSQItem::iterator i=listItems.begin(); i !=listItems.end();++i)
- {
- d=(*i)->GetDocEntryByNumber(0x0004, 0x1430); // Directory Record Type
- if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(d) )
+ SQItem *si;
+
+ SQItem *tmpSI=s->GetFirstSQItem();
+ while(tmpSI)
+ {
+ d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type
+ if ( ValEntry* valEntry = dynamic_cast<ValEntry *>(d) )
{
- v = ValEntry->GetValue();
+ v = valEntry->GetValue();
}
- else
+ else
{
- dbg.Verbose(0, "gdcmDicomDir::CreateDicomDir: not a ValEntry.");
+ gdcmWarningMacro( "(0004,1430) not a ValEntry ?!?");
continue;
- }
-
- if(v=="PATIENT ")
- {
- AddDicomDirPatientToEnd(*i);
- //AddObjectToEnd(type,*i);
- type=gdcmDicomDir::GDCM_DICOMDIR_PATIENT;
}
- else if(v=="STUDY ")
+ // A decent DICOMDIR has much more images than series,
+ // more series than studies, and so on.
+ // This is the right order to preform the tests
+
+ if ( v == "IMAGE " )
{
- AddDicomDirStudyToEnd(*i);
- // AddObjectToEnd(type,*i);
- type=gdcmDicomDir::GDCM_DICOMDIR_STUDY;
+ si = new DicomDirImage(true);
+ if ( !AddImageToEnd( static_cast<DicomDirImage *>(si)) )
+ {
+ delete si;
+ si = NULL;
+ gdcmErrorMacro( "Add AddImageToEnd failed");
+ }
}
-
- else if(v=="SERIES")
+ else if ( v == "SERIES" )
{
- AddDicomDirSerieToEnd(*i);
- // AddObjectToEnd(type,*i);
- type=gdcmDicomDir::GDCM_DICOMDIR_SERIE;
+ si = new DicomDirSerie(true);
+ if ( !AddSerieToEnd( static_cast<DicomDirSerie *>(si)) )
+ {
+ delete si;
+ si = NULL;
+ gdcmErrorMacro( "Add AddSerieToEnd failed");
+ }
}
-
- else if(v=="IMAGE ")
+ else if ( v == "STUDY " )
{
- AddDicomDirImageToEnd(*i);
- // AddObjectToEnd(type,*i);
- type=gdcmDicomDir::GDCM_DICOMDIR_IMAGE;
+ si = new DicomDirStudy(true);
+ if ( !AddStudyToEnd( static_cast<DicomDirStudy *>(si)) )
+ {
+ delete si;
+ si = NULL;
+ gdcmErrorMacro( "Add AddStudyToEnd failed");
+ }
+ }
+ else if ( v == "PATIENT " )
+ {
+ si = new DicomDirPatient(true);
+ if ( !AddPatientToEnd( static_cast<DicomDirPatient *>(si)) )
+ {
+ delete si;
+ si = NULL;
+ gdcmErrorMacro( "Add PatientToEnd failed");
+ }
}
-
else
- // It was not a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
- // neither an 'IMAGE' SQItem. Skip to next item.
- continue;
- }
-}
-/**
- * \ingroup gdcmDicomDir
- * \brief AddObjectToEnd
- * @param type
- * @param begin iterator on the first DocEntry within the chained List
- * @param end iterator on the last DocEntry within the chained List
- */
-
-// now useless ?
-
-/*void gdcmDicomDir::AddObjectToEnd(gdcmDicomDirType type,gdcmSQItem *s)
-{
- if(s==NULL) // ??
- return;
+ {
+ // It was neither a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
+ // nor an 'IMAGE' SQItem. Skip to next item.
+ gdcmWarningMacro( " -------------------------------------------"
+ << "a non PATIENT/STUDY/SERIE/IMAGE SQItem was found : "
+ << v);
+
+ // FIXME : deal with other item types !
+ tmpSI=s->GetNextSQItem(); // To avoid infinite loop
+ continue;
+ }
+ if ( si )
+ MoveSQItem(si,tmpSI);
- switch(type)
- {
- case gdcmDicomDir::GDCM_DICOMDIR_META:
- AddDicomDirMeta();
- break;
- case gdcmDicomDir::GDCM_DICOMDIR_PATIENT:
- AddDicomDirPatientToEnd(s);
- break;
- case gdcmDicomDir::GDCM_DICOMDIR_STUDY:
- AddDicomDirStudyToEnd(s);
- break;
- case gdcmDicomDir::GDCM_DICOMDIR_SERIE:
- AddDicomDirSerieToEnd(s);
- break;
- case gdcmDicomDir::GDCM_DICOMDIR_IMAGE:
- AddDicomDirImageToEnd(s);
- break;
- case gdcmDicomDir::GDCM_DICOMDIR_NONE:
- AddDicomDirImageToEnd(s); //FIXME
- break;
+ tmpSI=s->GetNextSQItem();
}
-}
-
-*/
-
-/**
- * \ingroup gdcmDicomDir
- * \brief Well ... there is only one occurence
-*/
-void gdcmDicomDir::AddDicomDirMeta()
-{
- if(metaElems)
- delete metaElems;
- metaElems = new gdcmDicomDirMeta(&tagHT);
+ ClearEntry();
}
/**
- * \ingroup gdcmDicomDir
- * \brief AddDicomDirPatientToEnd
- * @param s SQ Item to enqueue to the DicomPatient chained List
-*/
-void gdcmDicomDir::AddDicomDirPatientToEnd(gdcmSQItem *s)
+ * \brief AddPatientToEnd
+ * @param dd SQ Item to enqueue to the DicomPatient chained List
+ */
+bool DicomDir::AddPatientToEnd(DicomDirPatient *dd)
{
- patients.push_back(new gdcmDicomDirPatient(s, &tagHT));
+ Patients.push_back(dd);
+ return true;
}
/**
- * \ingroup gdcmDicomDir
- * \brief AddDicomDirStudyToEnd
- * @param s SQ Item to enqueue to the DicomDirStudy chained List
+ * \brief AddStudyToEnd
+ * @param dd SQ Item to enqueue to the DicomDirStudy chained List
*/
- void gdcmDicomDir::AddDicomDirStudyToEnd(gdcmSQItem *s)
+bool DicomDir::AddStudyToEnd(DicomDirStudy *dd)
{
- if(patients.size()>0)
+ if ( Patients.size() > 0 )
{
- ListDicomDirPatient::iterator itp=patients.end();
+ ListDicomDirPatient::iterator itp = Patients.end();
itp--;
- (*itp)->AddDicomDirStudy(new gdcmDicomDirStudy(s, &tagHT));
+ (*itp)->AddStudy(dd);
+ return true;
}
+ return false;
}
+
/**
- * \ingroup gdcmDicomDir
- * \brief AddDicomDirSerieToEnd
- * @param s SQ Item to enqueue to the DicomDirSerie chained List
+ * \brief AddSerieToEnd
+ * @param dd SQ Item to enqueue to the DicomDirSerie chained List
*/
-void gdcmDicomDir::AddDicomDirSerieToEnd(gdcmSQItem *s)
+bool DicomDir::AddSerieToEnd(DicomDirSerie *dd)
{
- if(patients.size()>0)
+ if ( Patients.size() > 0 )
{
- ListDicomDirPatient::iterator itp=patients.end();
+ ListDicomDirPatient::iterator itp = Patients.end();
itp--;
- if((*itp)->GetDicomDirStudies().size()>0)
+ DicomDirStudy *study = (*itp)->GetLastStudy();
+ if ( study )
{
- ListDicomDirStudy::iterator itst=(*itp)->GetDicomDirStudies().end();
- itst--;
- (*itst)->AddDicomDirSerie(new gdcmDicomDirSerie(s, &tagHT));
+ study->AddSerie(dd);
+ return true;
}
}
+ return false;
}
/**
- * \ingroup gdcmDicomDir
- * \brief AddDicomDirImageToEnd
- * @param s SQ Item to enqueue to the DicomDirImage chained List
+ * \brief AddImageToEnd
+ * @param dd SQ Item to enqueue to the DicomDirImage chained List
*/
- void gdcmDicomDir::AddDicomDirImageToEnd(gdcmSQItem *s)
+bool DicomDir::AddImageToEnd(DicomDirImage *dd)
{
- if(patients.size()>0)
+ if ( Patients.size() > 0 )
{
- ListDicomDirPatient::iterator itp=patients.end();
+ ListDicomDirPatient::iterator itp = Patients.end();
itp--;
- if((*itp)->GetDicomDirStudies().size()>0)
+ DicomDirStudy *study = (*itp)->GetLastStudy();
+ if ( study )
{
- ListDicomDirStudy::iterator itst=(*itp)->GetDicomDirStudies().end();
- itst--;
-
- if((*itst)->GetDicomDirSeries().size()>0)
+ DicomDirSerie *serie = study->GetLastSerie();
+ if ( serie )
{
- ListDicomDirSerie::iterator its=(*itst)->GetDicomDirSeries().end();
- its--;
- (*its)->AddDicomDirImage(new gdcmDicomDirImage(s, &tagHT));
+ serie->AddImage(dd);
+ return true;
}
}
}
+ return false;
}
/**
- * \ingroup gdcmDicomDir
- * \brief for each Header of the chained list, add/update the Patient/Study/Serie/Image info
+ * \brief for each Header of the chained list,
+ * add/update the Patient/Study/Serie/Image info
* @param path path of the root directory
* @param list chained list of Headers
*/
-void gdcmDicomDir::SetElements(std::string &path, VectDocument &list)
+void DicomDir::SetElements(std::string const &path, VectDocument const &list)
{
- std::string patPrevName="", patPrevID="";
- std::string studPrevInstanceUID="", studPrevID="";
- std::string serPrevInstanceUID="", serPrevID="";
+ ClearEntry();
+ ClearPatient();
+
+ std::string patPrevName = "", patPrevID = "";
+ std::string studPrevInstanceUID = "", studPrevID = "";
+ std::string serPrevInstanceUID = "", serPrevID = "";
std::string patCurName, patCurID;
std::string studCurInstanceUID, studCurID;
std::string serCurInstanceUID, serCurID;
- SetElement(path,GDCM_DICOMDIR_META,NULL);
-
- for(VectDocument::iterator it=list.begin();it!=list.end();++it)
+ bool first = true;
+ for( VectDocument::const_iterator it = list.begin();
+ it != list.end();
+ ++it )
{
// get the current file characteristics
- patCurName= (*it)->GetEntryByNumber(0x0010,0x0010);
- patCurID= (*it)->GetEntryByNumber(0x0010,0x0011);
- studCurInstanceUID=(*it)->GetEntryByNumber(0x0020,0x000d);
- studCurID= (*it)->GetEntryByNumber(0x0020,0x0010);
- serCurInstanceUID= (*it)->GetEntryByNumber(0x0020,0x000e);
- serCurID= (*it)->GetEntryByNumber(0x0020,0x0011);
-
- if(patCurName!=patPrevName || patCurID!=patPrevID)
- SetElement(path,GDCM_DICOMDIR_PATIENT,*it);
-
- // if new Study Deal with 'STUDY' Elements
- if(studCurInstanceUID!=studPrevInstanceUID || studCurID!=studPrevID)
- SetElement(path,GDCM_DICOMDIR_STUDY,*it);
-
- // if new Serie Deal with 'SERIE' Elements
- if(serCurInstanceUID!=serPrevInstanceUID || serCurID!=serPrevID)
- SetElement(path,GDCM_DICOMDIR_SERIE,*it);
+ patCurName = (*it)->GetEntryValue(0x0010,0x0010);
+ patCurID = (*it)->GetEntryValue(0x0010,0x0011);
+ studCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000d);
+ studCurID = (*it)->GetEntryValue(0x0020,0x0010);
+ serCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000e);
+ serCurID = (*it)->GetEntryValue(0x0020,0x0011);
+
+ if ( patCurName != patPrevName || patCurID != patPrevID || first )
+ {
+ SetElement(path, GDCM_DICOMDIR_PATIENT, *it);
+ first = true;
+ }
+
+ // if new Study, deal with 'STUDY' Elements
+ if ( studCurInstanceUID != studPrevInstanceUID || studCurID != studPrevID
+ || first )
+ {
+ SetElement(path, GDCM_DICOMDIR_STUDY, *it);
+ first = true;
+ }
+
+ // if new Serie, deal with 'SERIE' Elements
+ if ( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID
+ || first )
+ {
+ SetElement(path, GDCM_DICOMDIR_SERIE, *it);
+ }
// Always Deal with 'IMAGE' Elements
- SetElement(path,GDCM_DICOMDIR_IMAGE,*it);
-
- patPrevName= patCurName;
- patPrevID= patCurID;
- studPrevInstanceUID=studCurInstanceUID;
- studPrevID= studCurID;
- serPrevInstanceUID= serCurInstanceUID;
- serPrevID= serCurID;
+ SetElement(path, GDCM_DICOMDIR_IMAGE, *it);
+
+ patPrevName = patCurName;
+ patPrevID = patCurID;
+ studPrevInstanceUID = studCurInstanceUID;
+ studPrevID = studCurID;
+ serPrevInstanceUID = serCurInstanceUID;
+ serPrevID = serCurID;
+ first = false;
}
}
/**
- * \ingroup gdcmDicomDir
- * \brief compares two dgcmHeaders
+ * \brief adds to the HTable
+ * the Entries (Dicom Elements) corresponding to the given type
+ * @param path full path file name (only used when type = GDCM_DICOMDIR_IMAGE
+ * @param type DicomDirObject type to create (GDCM_DICOMDIR_PATIENT,
+ * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...)
+ * @param header Header of the current file
*/
-bool gdcmDicomDir::HeaderLessThan(gdcmDocument *header1,gdcmDocument *header2)
+void DicomDir::SetElement(std::string const &path, DicomDirType type,
+ Document *header)
{
- return(*header1<*header2);
+ ListDicomDirElem elemList;
+ ListDicomDirElem::const_iterator it;
+ uint16_t tmpGr, tmpEl;
+ DictEntry *dictEntry;
+ ValEntry *entry;
+ std::string val;
+ SQItem *si;
+
+ switch( type )
+ {
+ case GDCM_DICOMDIR_IMAGE:
+ elemList = Global::GetDicomDirElements()->GetDicomDirImageElements();
+ si = new DicomDirImage(true);
+ if ( !AddImageToEnd(static_cast<DicomDirImage *>(si)) )
+ {
+ delete si;
+ gdcmErrorMacro( "Add ImageToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_SERIE:
+ elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements();
+ si = new DicomDirSerie(true);
+ if ( !AddSerieToEnd(static_cast<DicomDirSerie *>(si)) )
+ {
+ delete si;
+ gdcmErrorMacro( "Add SerieToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_STUDY:
+ elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements();
+ si = new DicomDirStudy(true);
+ if ( !AddStudyToEnd(static_cast<DicomDirStudy *>(si)) )
+ {
+ delete si;
+ gdcmErrorMacro( "Add StudyToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_PATIENT:
+ elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements();
+ si = new DicomDirPatient(true);
+ if ( !AddPatientToEnd(static_cast<DicomDirPatient *>(si)) )
+ {
+ delete si;
+ gdcmErrorMacro( "Add PatientToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_META:
+ elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements();
+ si = new DicomDirMeta(true);
+ if ( MetaElems )
+ {
+ delete MetaElems;
+ gdcmErrorMacro( "MetaElements already exist, they will be destroyed");
+ }
+ MetaElems = static_cast<DicomDirMeta *>(si);
+ break;
+ default:
+ return;
+ }
+ // removed all the seems-to-be-useless stuff about Referenced Image Sequence
+ // to avoid further troubles
+ // imageElem 0008 1140 "" // Referenced Image Sequence
+ // imageElem fffe e000 "" // 'no length' item : length to be set to 0xffffffff later
+ // imageElem 0008 1150 "" // Referenced SOP Class UID : to be set/forged later
+ // imageElem 0008 1155 "" // Referenced SOP Instance UID : to be set/forged later
+ // imageElem fffe e00d "" // Item delimitation : length to be set to ZERO later
+
+ // FIXME : troubles found when it's a SeqEntry
+
+ // for all the relevant elements found in their own spot of the DicomDir.dic
+ for( it = elemList.begin(); it != elemList.end(); ++it)
+ {
+ tmpGr = it->Group;
+ tmpEl = it->Elem;
+ dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl);
+
+ entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry !
+
+ entry->SetOffset(0); // just to avoid further missprinting
+
+ if ( header )
+ {
+ // NULL when we Build Up (ex nihilo) a DICOMDIR
+ // or when we add the META elems
+ val = header->GetEntryValue(tmpGr, tmpEl);
+ }
+ else
+ {
+ val = GDCM_UNFOUND;
+ }
+
+ if ( val == GDCM_UNFOUND)
+ {
+ if ( tmpGr == 0x0004 && tmpEl == 0x1130 ) // File-set ID
+ {
+ // force to the *end* File Name
+ val = Util::GetName( path );
+ }
+ else if ( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image
+ {
+ if ( header->GetFileName().substr(0, path.length()) != path )
+ {
+ gdcmWarningMacro( "The base path of file name is incorrect");
+ val = header->GetFileName();
+ }
+ else
+ {
+ val = &(header->GetFileName().c_str()[path.length()]);
+ }
+ }
+ else
+ {
+ val = it->Value;
+ }
+ }
+ else
+ {
+ if ( header->GetEntryLength(tmpGr,tmpEl) == 0 )
+ val = it->Value;
+ }
+
+ entry->SetValue( val ); // troubles expected when vr=SQ ...
+
+ if ( type == GDCM_DICOMDIR_META ) // fusible : should never print !
+ {
+ gdcmWarningMacro("GDCM_DICOMDIR_META ?!? should never print that");
+ }
+ si->AddEntry(entry);
+ }
}
/**
- * \ingroup gdcmDicomDir
- * \brief Sets the accurate value for the (0x0004,0x1220) element of a DICOMDIR
+ * \brief Move the content of the source SQItem to the destination SQItem
+ * Only DocEntry's are moved
+ * @param dst destination SQItem
+ * @param src source SQItem
*/
+void DicomDir::MoveSQItem(DocEntrySet *dst,DocEntrySet *src)
+{
+ DocEntry *entry;
-void gdcmDicomDir::UpdateDirectoryRecordSequenceLength() {
+ entry = src->GetFirstEntry();
+ while(entry)
+ {
+ src->RemoveEntryNoDestroy(entry);
+ dst->AddEntry(entry);
+ // we destroyed -> the current iterator is not longer valid
+ entry = src->GetFirstEntry();
+ }
+}
-// FIXME : to go on compiling
+/**
+ * \brief compares two files
+ */
+bool DicomDir::HeaderLessThan(Document *header1, Document *header2)
+{
+ return *header1 < *header2;
+}
-// to be re written !
-/*
- int offset = 0;
- ListTag::iterator it;
- guint16 gr, el;
- std::string vr;
- for(it=listEntries.begin();it!=listEntries.end();++it) {
- gr = (*it)->GetGroup();
- el = (*it)->GetElement();
- vr = (*it)->GetVR();
- if (gr !=0xfffe) {
- if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) {
- offset += 4; // explicit VR AND OB, OW, SQ : 4 more bytes
- }
- offset += 2 + 2 + 4 + (*it)->GetLength();
- } else {
- offset += 4; // delimiters don't have a value.
- }
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief Canonical Printer
+ * @param os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
+ */
+void DicomDir::Print(std::ostream &os, std::string const & )
+{
+ if ( MetaElems )
+ {
+ MetaElems->SetPrintLevel(PrintLevel);
+ MetaElems->Print(os);
}
- //bool res=SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps.
- SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps.
- return;
- */
+ for(ListDicomDirPatient::iterator cc = Patients.begin();
+ cc != Patients.end();
+ ++cc)
+ {
+ (*cc)->SetPrintLevel(PrintLevel);
+ (*cc)->Print(os);
+ }
}
//-----------------------------------------------------------------------------
+} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff