-// gdcmDicomDir.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: gdcmDicomDir.cxx,v $
+ Language: C++
+ Date: $Date: 2004/11/03 20:52:13 $
+ Version: $Revision: 1.77 $
+
+ 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.html for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+#include "gdcmDicomDir.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirImage.h"
+#include "gdcmDirList.h"
+#include "gdcmUtil.h"
+#include "gdcmDebug.h"
+#include "gdcmGlobal.h"
+#include "gdcmHeader.h"
+#include "gdcmSeqEntry.h"
+#include "gdcmSQItem.h"
+#include "gdcmValEntry.h"
+
+#include <fstream>
#include <string>
#include <algorithm>
#include <sys/types.h>
-#include <errno.h>
#ifdef _MSC_VER
#include <direct.h>
#else
#include <unistd.h>
#endif
-
-#include "gdcmDicomDir.h"
-#include "gdcmDicomDirStudy.h"
-#include "gdcmDicomDirSerie.h"
-#include "gdcmDicomDirImage.h"
-#include "gdcmDirList.h"
-#include "gdcmUtil.h"
-#include "gdcmDebug.h"
+namespace gdcm
+{
//-----------------------------------------------------------------------------
// For full DICOMDIR description, see:
// PS 3.3-2003, pages 731-750
//-----------------------------------------------------------------------------
-
// Constructor / Destructor
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
+ * \brief Constructor : creates an empty DicomDir
+ */
+DicomDir::DicomDir()
+ :Document( )
+{
+ Initialize(); // sets all private fields to NULL
+ std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ...
+ MetaElems = NewMeta();
+}
+
+/**
* \brief Constructor Parses recursively the directory and creates the DicomDir
- * or uses an already built DICOMDIR, depending on 'parseDir' value
- * @param FileName name
- - of the root directory (parseDir = true)
+ * or uses an already built DICOMDIR, depending on 'parseDir' value.
+ * @param fileName name
+ * - of the root directory (parseDir = true)
* - of the DICOMDIR (parseDir = false)
* @param parseDir boolean
* - true if user passed an entry point
* 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):
- gdcmParser(FileName,exception_on_error,true) // true : enable SeQuences
+DicomDir::DicomDir(std::string const & fileName, bool parseDir ):
+ Document( fileName )
{
- // que l'on ai passe un root directory ou un DICOMDIR
- // et quelle que soit la valeur de parseDir,
- // on a lance gdcmParser
-
- 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;
-
-// gdcmParser already executed
-// if user passed a root directory, sure we didn't get anything
-
- if( GetListEntry().begin()==GetListEntry().end() )
- {
- // if parseDir == false, it should be tagged as an error
- dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : entry list empty");
-
- if(strlen(FileName)==1 && FileName[0]=='.') { // user passed '.' as Name
- // we get current directory name
- char*dummy=(char*) malloc(1000);
-#ifdef _MSC_VER
- _getcwd(dummy,(size_t)1000);
-#else
- getcwd(dummy,(size_t)1000);
-#endif
- SetFileName(dummy); // will be converted into a string
- free(dummy); // no longer needed
+ // Whatever user passed (a root directory or a DICOMDIR)
+ // and whatever the value of parseDir was,
+ // Document is already executed
+ Initialize(); // sets all private fields to NULL
+
+ // if user passed a root directory, sure we didn't get anything
+
+ if ( TagHT.begin() == TagHT.end() ) // when user passed a Directory to parse
+ {
+ dbg.Verbose(0, "DicomDir::DicomDir : entry HT empty");
+
+ if ( fileName.size() == 1 && fileName[0] == '.' )
+ {
+ // 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
}
- if(parseDir)
+ if ( parseDir ) // user asked for a recursive parsing of a root directory
+ {
+ MetaElems = NewMeta();
+
+ dbg.Verbose(0, "DicomDir::DicomDir : Parse directory"
+ " and create the DicomDir");
+ ParseDirectory();
+ }
+ else
{
- dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : Parse directory and create the DicomDir");
- ParseDirectory();
+ /// \todo if parseDir == false, it should be tagged as an error
+ // NON ! il suffit d'appeler ParseDirectory()
+ // apres le constructeur
}
}
- else {
+ else // Only if user passed a DICOMDIR
+ {
+ // Directory record sequence
+ DocEntry *e = GetDocEntryByNumber(0x0004, 0x1220);
+ if ( !e )
+ {
+ dbg.Verbose(0, "DicomDir::DicomDir : NO Directory record"
+ " sequence (0x0004,0x1220)");
+ /// \todo FIXME : what do we do when the parsed file IS NOT a
+ /// DICOMDIR file ?
+ }
CreateDicomDir();
- CheckBoundaries(); // to maintain consistency between
- // home-made gdcmDicomDir
- // and the ones comming from a DICOMDIR file
- }
-}
-
-/**
- * \ingroup gdcmDicomDir
- * \brief Constructor : creates an empty gdcmDicomDir
- * @param exception_on_error whether we want to throw an exception or not
- */
-gdcmDicomDir::gdcmDicomDir(bool exception_on_error):
- gdcmParser(exception_on_error)
-{
- startMethod= NULL;
- progressMethod= NULL;
- endMethod= NULL;
- startMethodArgDelete= NULL;
- progressMethodArgDelete=NULL;
- endMethodArgDelete= NULL;
- startArg= NULL;
- progressArg= NULL;
- endArg= NULL;
-
- progress=0.0;
- abort=false;
- std::string pathBidon = ""; // Sorry, NULL not allowed ...
- SetElement(pathBidon, GDCM_DICOMDIR_META, NULL); // Set the META elements
-
- AddDicomDirMetaToEnd(listEntries.begin(),--listEntries.end());
+ }
}
-
/**
- * \ingroup gdcmDicomDir
* \brief Canonical destructor
*/
-gdcmDicomDir::~gdcmDicomDir()
+DicomDir::~DicomDir()
{
SetStartMethod(NULL);
SetProgressMethod(NULL);
SetEndMethod(NULL);
-
- if(metaElems)
- delete metaElems;
-
- for(ListDicomDirPatient::iterator cc=patients.begin();cc!=patients.end();++cc)
+ for(ListDicomDirPatient::iterator cc = Patients.begin();
+ cc!= Patients.end();
+ ++cc)
{
delete *cc;
}
+ if ( MetaElems )
+ {
+ delete MetaElems;
+ }
}
//-----------------------------------------------------------------------------
// Print
/**
- * \ingroup gdcmDicomDir
* \brief Canonical Printer
*/
-void gdcmDicomDir::Print(std::ostream &os)
+void DicomDir::Print(std::ostream &os)
{
- if(metaElems)
+ if( MetaElems )
{
- metaElems->SetPrintLevel(printLevel);
- metaElems->Print(os);
+ MetaElems->SetPrintLevel(PrintLevel);
+ MetaElems->Print(os);
}
- for(ListDicomDirPatient::iterator cc=patients.begin();cc!=patients.end();++cc)
+ for(ListDicomDirPatient::iterator cc = Patients.begin();
+ cc != Patients.end();
+ ++cc)
{
- (*cc)->SetPrintLevel(printLevel);
- (*cc)->Print(os);
+ (*cc)->SetPrintLevel( PrintLevel );
+ (*cc)->Print( os );
}
}
//-----------------------------------------------------------------------------
// Public
/**
- * \ingroup gdcmDicomDir
* \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 gdcmParser is the one of a reasonable DicomDir,
+ * @return true when Document is the one of a reasonable DicomDir,
* false otherwise.
*/
-bool gdcmDicomDir::IsReadable(void)
+bool DicomDir::IsReadable()
+{
+ if( !Document::IsReadable() )
+ {
+ return false;
+ }
+ if( !MetaElems )
+ {
+ return false;
+ }
+ if( Patients.size() <= 0 )
+ {
+ return false;
+ }
+
+ return true;
+}
+
+/**
+ * \brief Sets all fields to NULL
+ */
+
+void DicomDir::Initialize()
{
- if(!gdcmParser::IsReadable())
- return(false);
- if(!metaElems)
- return(false);
- if(patients.size()<=0)
- return(false);
-
- return(true);
+ StartMethod = NULL;
+ ProgressMethod = NULL;
+ EndMethod = NULL;
+ StartMethodArgDelete = NULL;
+ ProgressMethodArgDelete = NULL;
+ EndMethodArgDelete = NULL;
+ StartArg = NULL;
+ ProgressArg = NULL;
+ EndArg = NULL;
+
+ Progress = 0.0;
+ Abort = false;
+
+ MetaElems = 0;
}
+
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \brief fills the whole structure, starting from a root Directory
*/
-void gdcmDicomDir::ParseDirectory(void)
+void DicomDir::ParseDirectory()
{
- CreateDicomDirChainedList(GetFileName());
+ CreateDicomDirChainedList( GetFileName() );
CreateDicomDir();
}
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \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(Method* method, void* arg,
+ 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
+ * \ingroup DicomDir
* \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::SetStartMethodArgDelete(gdcmMethod *method)
+void DicomDir::SetStartMethodArgDelete(Method* method)
{
- startMethodArgDelete=method;
+ StartMethodArgDelete = method;
}
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \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::SetProgressMethod(gdcmMethod *method,void *arg,gdcmMethod *argDelete)
+void DicomDir::SetProgressMethod(Method* method, void* arg,
+ Method* argDelete )
{
- if((progressArg)&&(progressMethodArgDelete))
- progressMethodArgDelete(progressArg);
+ if( ProgressArg && ProgressMethodArgDelete )
+ {
+ ProgressMethodArgDelete( ProgressArg );
+ }
- progressMethod=method;
- progressArg=arg;
- progressMethodArgDelete=argDelete;
+ ProgressMethod = method;
+ ProgressArg = arg;
+ ProgressMethodArgDelete = argDelete;
}
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \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::SetProgressMethodArgDelete(gdcmMethod *method)
+void DicomDir::SetProgressMethodArgDelete(Method* method)
{
- progressMethodArgDelete=method;
+ ProgressMethodArgDelete = method;
}
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \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
*/
-void gdcmDicomDir::SetEndMethod(gdcmMethod *method, void *arg, gdcmMethod *argDelete)
+void DicomDir::SetEndMethod(Method* method, void* arg,
+ Method* argDelete )
{
- if((endArg)&&(endMethodArgDelete))
- endMethodArgDelete(endArg);
+ if( EndArg && EndMethodArgDelete )
+ {
+ EndMethodArgDelete( EndArg );
+ }
- endMethod=method;
- endArg=arg;
- endMethodArgDelete=argDelete;
+ EndMethod = method;
+ EndArg = arg;
+ EndMethodArgDelete = argDelete;
}
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \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::SetEndMethodArgDelete(gdcmMethod *method)
+void DicomDir::SetEndMethodArgDelete(Method* method)
{
- endMethodArgDelete=method;
+ EndMethodArgDelete = method;
}
/**
- * \ingroup gdcmDicomDir
+ * \ingroup 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 !
* @return false only when fail to open
*/
-bool gdcmDicomDir::Write(std::string fileName)
-{
- FILE * fp1;
-
- fp1=fopen(fileName.c_str(),"wb");
- if(fp1==NULL)
+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 )
{
- printf("Failed to open(write) File [%s] \n",fileName.c_str());
- return(false);
+ dbg.Verbose(2, "Failed to open(write) File: ", fileName.c_str());
+ return false;
}
- char * filePreamble;
- filePreamble=(char*)calloc(128,1);
- fwrite(filePreamble,128,1,fp1);
- fwrite("DICM",4,1,fp1);
- free(filePreamble);
- UpdateDirectoryRecordSequenceLength();
- WriteDicomDirEntries(fp1);
+ char filePreamble[128];
+ memset(filePreamble, 0, 128);
+ fp->write(filePreamble, 128); //FIXME
+ binary_write( *fp, "DICM");
+
+ DicomDirMeta *ptrMeta = GetDicomDirMeta();
+ ptrMeta->Write(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)->Write( fp, ExplicitVR );
+ }
+
+ // force writing Sequence Delimitation Item
+ for(i=0;i<4;++i)
+ {
+ binary_write(*fp, sqt[i]); // fffe e0dd ffff ffff
+ }
- fclose(fp1);
+ fp->close();
return true;
}
-/**
- * \ingroup gdcmParser
- * \brief writes on disc according to the DICOMDIR format
- * using the tree-like structure
- * @param _fp already open file pointer
- */
-
-void gdcmDicomDir::WriteDicomDirEntries(FILE *_fp)
-{
- // TODO (?) tester les echecs en ecriture
- // (apres chaque fwrite, dans le WriteEntry)
-
- 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,DICOMDIR);
- }
-
- itPatient = GetDicomDirPatients().begin();
- while ( itPatient != GetDicomDirPatients().end() ) {
- for(i=(*itPatient)->debut();i!=(*itPatient)->fin();++i) {
- WriteEntry(*i,_fp,DICOMDIR);
- }
- itStudy = ((*itPatient)->GetDicomDirStudies()).begin();
- while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) {
- for(i=(*itStudy)->debut();i!=(*itStudy)->fin();++i) {
- WriteEntry(*i,_fp,DICOMDIR);
- }
- itSerie = ((*itStudy)->GetDicomDirSeries()).begin();
- while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) {
- for(i=(*itSerie)->debut();i!=(*itSerie)->fin();++i) {
- WriteEntry(*i,_fp,DICOMDIR);
- }
- itImage = ((*itSerie)->GetDicomDirImages()).begin();
- while (itImage != (*itSerie)->GetDicomDirImages().end() ) {
- for(i=(*itImage)->debut();i!=(*itImage)->fin();++i) {
- WriteEntry(*i,_fp,DICOMDIR);
- }
- ++itImage;
- }
- ++itSerie;
- }
- ++itStudy;
- }
- ++itPatient;
- }
-}
-
//-----------------------------------------------------------------------------
// Protected
/**
- * \ingroup gdcmDicomDir
- * \brief create a gdcmHeader-like chained list from a root Directory
+ * \ingroup DicomDir
+ * \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();
+ DirList fileList(path,1); // gets recursively the file list
+ unsigned int count = 0;
+ VectDocument list;
+ Header *header;
- gdcmDirList fileList(path,1); // gets recursively the file list
- unsigned int count=0;
- ListHeader list;
- gdcmHeader *header;
+ TagHT.clear();
+ Patients.clear();
- listEntries.clear();
- patients.clear();
-
- for(gdcmDirList::iterator it=fileList.begin();
- it!=fileList.end();
- ++it)
+ for( DirList::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;
-
- count++;
+ header = new Header( it->c_str() );
+ if( !header )
+ {
+ dbg.Verbose( 1,
+ "DicomDir::CreateDicomDirChainedList: "
+ "failure in new Header ",
+ it->c_str() );
+ }
+
+ if( header->IsReadable() )
+ {
+ // Add the file header to the chained list:
+ list.push_back(header);
+ dbg.Verbose( 1,
+ "DicomDir::CreateDicomDirChainedList: readable ",
+ it->c_str() );
+
+ }
+ else
+ {
+ delete header;
+ }
+ count++;
}
// sorts Patient/Study/Serie/
- std::sort(list.begin(),list.end(),gdcmDicomDir::HeaderLessThan);
-
- std::string tmp=fileList.GetDirName();
-
+ std::sort(list.begin(), list.end(), DicomDir::HeaderLessThan );
+
+ std::string tmp = fileList.GetDirName();
//for each Header of the chained list, add/update the Patient/Study/Serie/Image info
- SetElements(tmp,list);
-
+ SetElements(tmp, list);
CallEndMethod();
}
/**
- * \ingroup gdcmDicomDir
- * \brief modifies the limits of a gdcmObject, created from a DICOMDIR file
+ * \ingroup DicomDir
+ * \brief adds *the* Meta to a partially created DICOMDIR
+ */
+
+DicomDirMeta * DicomDir::NewMeta()
+{
+ DicomDirMeta *m = new DicomDirMeta( &TagHT );
+
+ if ( TagHT.begin() != TagHT.end() ) // after Document Parsing
+ {
+ TagDocEntryHT::iterator lastOneButSequence = TagHT.end();
+ lastOneButSequence --;
+ // ALL the 'out of Sequence' Tags belong to Meta Elems
+ // (we skip 0004|1220 [Directory record sequence] )
+ for ( TagDocEntryHT::iterator cc = TagHT.begin();
+ cc != lastOneButSequence;
+ ++cc)
+ {
+ m->AddDocEntry( cc->second );
+ }
+ }
+ else // after root directory parsing
+ {
+ ListDicomDirMetaElem const & elemList =
+ Global::GetDicomDirElements()->GetDicomDirMetaElements();
+ m->FillObject(elemList);
+ }
+ m->SetSQItemNumber(0); // To avoid further missprinting
+ return m;
+}
+
+/**
+ * \brief adds a new Patient (with the basic elements) to a partially created DICOMDIR
*/
+DicomDirPatient * DicomDir::NewPatient()
+{
+ ListDicomDirPatientElem::const_iterator it;
+ uint16_t tmpGr,tmpEl;
+ DictEntry *dictEntry;
+ ValEntry *entry;
-void gdcmDicomDir::CheckBoundaries()
-{
- ListDicomDirPatient::iterator itPatient;
- ListDicomDirStudy::iterator itStudy;
- ListDicomDirSerie::iterator itSerie;
- ListDicomDirImage::iterator itImage;
- ListTag::iterator i,j;
-
- GetDicomDirMeta()->ResetBoundaries(0);
-
- itPatient = GetDicomDirPatients().begin();
- while ( itPatient != GetDicomDirPatients().end() ) {
- (*itPatient)->ResetBoundaries(1);
- itStudy = ((*itPatient)->GetDicomDirStudies()).begin();
- while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) {
- (*itStudy)->ResetBoundaries(1);
- itSerie = ((*itStudy)->GetDicomDirSeries()).begin();
- while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) {
- (*itSerie)->ResetBoundaries(1);
- itImage = ((*itSerie)->GetDicomDirImages()).begin();
- while (itImage != (*itSerie)->GetDicomDirImages().end() ) {
- (*itImage)->ResetBoundaries(1);
- ++itImage;
- }
- ++itSerie;
- }
- ++itStudy;
+ ListDicomDirPatientElem const & elemList =
+ Global::GetDicomDirElements()->GetDicomDirPatientElements();
+ SQItem *s = new SQItem(0);
+
+ // for all the DicomDirPatient Elements
+ for( it = elemList.begin(); it != elemList.end(); ++it )
+ {
+ tmpGr = it->Group;
+ tmpEl = it->Elem;
+ dictEntry = GetPubDict()->GetDictEntryByNumber(tmpGr, tmpEl);
+ entry = new ValEntry( 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 );
}
- ++itPatient;
+ 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 );
}
-}
+ DicomDirPatient *p = new DicomDirPatient(s, &TagHT);
+ Patients.push_front( p );
+
+ return p;
+}
/**
- * \ingroup gdcmDicomDir
- * \brief adds a new Patient to a partially created DICOMDIR
+ * \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
*/
-gdcmDicomDirPatient * gdcmDicomDir::NewPatient(void) {
- std::list<gdcmElement> elemList;
- std::list<gdcmElement>::iterator it;
- guint16 tmpGr,tmpEl;
- gdcmDictEntry *dictEntry;
- gdcmHeaderEntry *entry;
-
- elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements();
- std::list<gdcmHeaderEntry *>::iterator debInsertion, finInsertion, i,j;
-
- debInsertion = metaElems->fin();
- ++debInsertion;
- finInsertion=debInsertion;
-
- // for all the DicomDirPatient Elements
- for(it=elemList.begin();it!=elemList.end();++it)
- {
- tmpGr=it->group;
- tmpEl=it->elem;
- dictEntry=GetPubDict()->GetDictEntryByNumber(tmpGr,tmpEl);
- entry=new gdcmHeaderEntry(dictEntry);
- entry->SetOffset(0); // just to avoid missprinting
- entry->SetValue(it->value);
-
- if(dictEntry->GetGroup()==0xfffe)
- {
- entry->SetLength(entry->GetValue().length());
- }
- else if( (dictEntry->GetVR()=="UL") || (dictEntry->GetVR()=="SL") )
+void DicomDir::SetElement(std::string const & path, DicomDirType type,
+ Document *header)
+{
+ ListDicomDirElem elemList; //FIXME this is going to be a by copy operation
+ ListDicomDirElem::const_iterator it;
+ uint16_t tmpGr, tmpEl;
+ DictEntry *dictEntry;
+ ValEntry *entry;
+ std::string val;
+ SQItem *si = new SQItem(0); // all the items will be at level 1
+ switch( type )
+ {
+ case GDCM_DICOMDIR_IMAGE:
+ elemList = Global::GetDicomDirElements()->GetDicomDirImageElements();
+ break;
+
+ case GDCM_DICOMDIR_SERIE:
+ elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements();
+ break;
+
+ case GDCM_DICOMDIR_STUDY:
+ elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements();
+ break;
+
+ case GDCM_DICOMDIR_PATIENT:
+ elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements();
+ break;
+
+ case GDCM_DICOMDIR_META:
+ elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements();
+ 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
+ // for all the relevant elements found in their own spot of the DicomDir.dic
+ // FIXME : troubles found when it's a SeqEntry
+
+ for( it = elemList.begin(); it != elemList.end(); ++it)
+ {
+ tmpGr = it->Group;
+ tmpEl = it->Elem;
+ dictEntry = GetPubDict()->GetDictEntryByNumber(tmpGr, tmpEl);
+
+ entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry !
+
+ entry->SetOffset(0); // just to avoid further missprinting
+ entry->SetLength(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->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 = Util::GetName( path );
+ }
+ else if( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image
+ {
+ if( header->GetFileName().substr(0, path.length()) != path )
+ {
+ dbg.Verbose(0, "DicomDir::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;
+ }
+
+ // GDCM_UNFOUND or not !
+
+ entry->SetValue( val ); // troubles expected when vr=SQ ...
+
+ if( dictEntry )
+ {
+ if( dictEntry->GetGroup() == 0xfffe )
+ {
+ entry->SetLength( entry->GetValue().length() ); // FIXME
+ }
+ else if( dictEntry->GetVR() == "UL" || dictEntry->GetVR() == "SL" )
{
entry->SetLength(4);
- }
- else if( (dictEntry->GetVR()=="US") || (dictEntry->GetVR()=="SS") )
+ }
+ else if( dictEntry->GetVR() == "US" || dictEntry->GetVR() == "SS" )
{
entry->SetLength(2);
- }
- else if(dictEntry->GetVR()=="SQ")
+ }
+ else if( dictEntry->GetVR() == "SQ" )
{
- entry->SetLength(0xffffffff);
+ entry->SetLength( 0xffffffff );
}
- else
+ else
{
- entry->SetLength(entry->GetValue().length());
- }
-
- tagHT.insert( PairHT(entry->GetKey(),entry) ); // add in the (multimap) H Table
- listEntries.insert(debInsertion ,entry); // en tete de liste des Patients
- ++finInsertion;
+ entry->SetLength( entry->GetValue().length() );
+ }
+ }
+
+ if ( type == GDCM_DICOMDIR_META ) // fusible : should never print !
+ {
+ std::cout << "GDCM_DICOMDIR_META ?!? should never print that"
+ << std::endl;
+ }
+ si->AddEntry(entry);
}
+ switch( type )
+ {
+ case GDCM_DICOMDIR_IMAGE:
+ AddDicomDirImageToEnd(si);
+ break;
- i=metaElems->fin();
- i++;
+ case GDCM_DICOMDIR_SERIE:
+ AddDicomDirSerieToEnd(si);
+ break;
+
+ case GDCM_DICOMDIR_STUDY:
+ AddDicomDirStudyToEnd(si);
+ break;
+
+ case GDCM_DICOMDIR_PATIENT:
+ AddDicomDirPatientToEnd(si);
+ break;
+
+ default:
+ return;
+ }
+ //int count=1; // find a trick to increment
+ //s->AddEntry(si, count); // Seg Faults
- gdcmDicomDirPatient *p = new gdcmDicomDirPatient(i, --debInsertion,
- &tagHT, &listEntries);
- patients.push_front(p);
- return p;
}
+//-----------------------------------------------------------------------------
/**
- * \ingroup gdcmDicomDir
* \brief CallStartMethod
*/
-void gdcmDicomDir::CallStartMethod(void)
+void DicomDir::CallStartMethod()
{
- progress=0.0f;
- abort=false;
- if(startMethod)
- startMethod(startArg);
+ Progress = 0.0f;
+ Abort = false;
+ if( StartMethod )
+ {
+ StartMethod( StartArg );
+ }
}
+
+//-----------------------------------------------------------------------------
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \brief CallProgressMethod
*/
-void gdcmDicomDir::CallProgressMethod(void)
+void DicomDir::CallProgressMethod()
{
- if(progressMethod)
- progressMethod(progressArg);
+ if( ProgressMethod )
+ {
+ ProgressMethod( ProgressArg );
+ }
}
+
+//-----------------------------------------------------------------------------
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \brief CallEndMethod
*/
-void gdcmDicomDir::CallEndMethod(void)
+void DicomDir::CallEndMethod()
{
- progress=1.0f;
- if(endMethod)
- endMethod(endArg);
+ Progress = 1.0f;
+ if( EndMethod )
+ {
+ EndMethod( EndArg );
+ }
}
//-----------------------------------------------------------------------------
// Private
/**
- * \ingroup gdcmDicomDir
- * \brief create a 'gdcmDicomDir' from a DICOMDIR gdcmHeader
+ * \ingroup DicomDir
+ * \brief create a 'DicomDir' from a DICOMDIR Header
*/
-void gdcmDicomDir::CreateDicomDir()
+void DicomDir::CreateDicomDir()
{
// The list is parsed.
// When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found :
// + we create the object for the precedent tag
// + loop to 1 -
- gdcmDicomDirType type=gdcmDicomDir::GDCM_DICOMDIR_META;
- ListTag::iterator begin;
- ListTag::iterator end, end2;
+ // Directory record sequence
+ DocEntry *e = GetDocEntryByNumber(0x0004, 0x1220);
+ if ( !e )
+ {
+ dbg.Verbose(0, "DicomDir::DicomDir : NO Directory record"
+ " sequence (0x0004,0x1220)");
+ /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ?
+ return;
+ }
+
+ SeqEntry* s = dynamic_cast<SeqEntry*>(e);
+ if ( !s )
+ {
+ dbg.Verbose(0, "DicomDir::CreateDicomDir: no SeqEntry present");
+ // useless : (0x0004,0x1220) IS a Sequence !
+ return;
+ }
+
+ DicomDirType type = DicomDir::GDCM_DICOMDIR_META;
+ MetaElems = NewMeta();
- begin=listEntries.begin();
- end=begin;
- for(ListTag::iterator i=end;i !=listEntries.end();++i)
+ ListSQItem listItems = s->GetSQItems();
+
+ DocEntry * d;
+ std::string v;
+ for( ListSQItem::iterator i = listItems.begin();
+ i !=listItems.end(); ++i )
{
- std::string v=(*i)->GetValue();
- if(v=="PATIENT ")
+ d = (*i)->GetDocEntryByNumber(0x0004, 0x1430); // Directory Record Type
+ if ( ValEntry* valEntry = dynamic_cast< ValEntry* >(d) )
{
- end=end2=i;
- AddObjectToEnd(type,begin,--end2);
- type=gdcmDicomDir::GDCM_DICOMDIR_PATIENT;
- begin=end;
- }
-
- if(v=="STUDY ")
+ v = valEntry->GetValue();
+ }
+ else
{
- end=end2=i;
- AddObjectToEnd(type,begin,--end2);
- type=gdcmDicomDir::GDCM_DICOMDIR_STUDY;
- begin=end;
+ dbg.Verbose(0, "DicomDir::CreateDicomDir: not a ValEntry.");
+ continue;
}
- if(v=="SERIES")
+ if( v == "PATIENT " )
{
- end=end2=i;
- AddObjectToEnd(type,begin,--end2);
- type=gdcmDicomDir::GDCM_DICOMDIR_SERIE;
- begin=end;
+ AddDicomDirPatientToEnd( *i );
+ type = DicomDir::GDCM_DICOMDIR_PATIENT;
}
-
- if(v=="IMAGE ")
+ else if( v == "STUDY " )
+ {
+ AddDicomDirStudyToEnd( *i );
+ type = DicomDir::GDCM_DICOMDIR_STUDY;
+ }
+ else if( v == "SERIES" )
+ {
+ AddDicomDirSerieToEnd( *i );
+ type = DicomDir::GDCM_DICOMDIR_SERIE;
+ }
+ else if( v == "IMAGE " )
+ {
+ AddDicomDirImageToEnd( *i );
+ type = DicomDir::GDCM_DICOMDIR_IMAGE;
+ }
+ else
{
- end=end2=i;
- AddObjectToEnd(type,begin,--end2);
- type=gdcmDicomDir::GDCM_DICOMDIR_IMAGE;
- begin=end;
+ // It was not a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
+ // neither an 'IMAGE' SQItem. Skip to next item.
+ continue;
}
}
-
- end=end2=listEntries.end();
- if(begin!=end)
- AddObjectToEnd(type,begin,--end2);
}
+
/**
- * \ingroup gdcmDicomDir
- * \brief AddObjectToEnd
- * @param type
- * @param begin iterator on the first HeaderEntry within the chained List
- * @param end iterator on the last HeaderEntry within the chained List
+ * \ingroup DicomDir
+ * \brief Well ... there is only one occurence
*/
-void gdcmDicomDir::AddObjectToEnd(gdcmDicomDirType type,ListTag::iterator begin,ListTag::iterator end)
+void DicomDir::AddDicomDirMeta()
{
- if(begin==end)
- return;
-
- switch(type)
+ if( MetaElems )
{
- case gdcmDicomDir::GDCM_DICOMDIR_META:
- AddDicomDirMetaToEnd(begin,end);
- break;
- case gdcmDicomDir::GDCM_DICOMDIR_PATIENT:
- AddDicomDirPatientToEnd(begin,end);
- break;
- case gdcmDicomDir::GDCM_DICOMDIR_STUDY:
- AddDicomDirStudyToEnd(begin,end);
- break;
- case gdcmDicomDir::GDCM_DICOMDIR_SERIE:
- AddDicomDirSerieToEnd(begin,end);
- break;
- case gdcmDicomDir::GDCM_DICOMDIR_IMAGE:
- AddDicomDirImageToEnd(begin,end);
- break;
+ delete MetaElems;
}
+ MetaElems = new DicomDirMeta( &TagHT );
}
/**
- * \ingroup gdcmDicomDir
- * \brief Well ... Not realy to end, there is only one occurence
- * @param begin iterator on the first HeaderEntry within the chained List
- * @param end iterator on the last HeaderEntry within the chained List
-*/
-void gdcmDicomDir::AddDicomDirMetaToEnd(ListTag::iterator begin,ListTag::iterator end)
-{
- if(metaElems)
- delete metaElems;
- metaElems = new gdcmDicomDirMeta(begin,end,&tagHT,&listEntries);
-}
-
-/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \brief AddDicomDirPatientToEnd
- * @param begin iterator on the first HeaderEntry within the chained List
- * @param end iterator on the last HeaderEntry within the chained List
-*/
-void gdcmDicomDir::AddDicomDirPatientToEnd(ListTag::iterator begin,ListTag::iterator end)
+ * @param s SQ Item to enqueue to the DicomPatient chained List
+ */
+void DicomDir::AddDicomDirPatientToEnd(SQItem *s)
{
- patients.push_back(new gdcmDicomDirPatient(begin,end,&tagHT, &listEntries));
+ Patients.push_back(new DicomDirPatient(s, &TagHT));
}
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \brief AddDicomDirStudyToEnd
- * @param begin iterator on the first HeaderEntry within the chained List
- * @param end iterator on the last HeaderEntry within the chained List
+ * @param s SQ Item to enqueue to the DicomDirStudy chained List
*/
- void gdcmDicomDir::AddDicomDirStudyToEnd(ListTag::iterator begin,ListTag::iterator end)
+ void DicomDir::AddDicomDirStudyToEnd(SQItem *s)
{
- if(patients.size()>0)
+ if( Patients.size() > 0 )
{
- ListDicomDirPatient::iterator itp=patients.end();
+ ListDicomDirPatient::iterator itp = Patients.end();
itp--;
- (*itp)->AddDicomDirStudy(new gdcmDicomDirStudy(begin,end,&tagHT, &listEntries));
+ (*itp)->AddDicomDirStudy(new DicomDirStudy(s, &TagHT));
}
}
+
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \brief AddDicomDirSerieToEnd
- * @param begin iterator on the first HeaderEntry within the chained List
- * @param end iterator on the last HeaderEntry within the chained List
+ * @param s SQ Item to enqueue to the DicomDirSerie chained List
*/
-void gdcmDicomDir::AddDicomDirSerieToEnd(ListTag::iterator begin,ListTag::iterator end)
+void DicomDir::AddDicomDirSerieToEnd(SQItem *s)
{
- if(patients.size()>0)
+ if( Patients.size() > 0 )
{
- ListDicomDirPatient::iterator itp=patients.end();
+ ListDicomDirPatient::iterator itp = Patients.end();
itp--;
- if((*itp)->GetDicomDirStudies().size()>0)
+ if( (*itp)->GetDicomDirStudies().size() > 0 )
{
- ListDicomDirStudy::iterator itst=(*itp)->GetDicomDirStudies().end();
+ ListDicomDirStudy::const_iterator itst =
+ (*itp)->GetDicomDirStudies().end();
itst--;
- (*itst)->AddDicomDirSerie(new gdcmDicomDirSerie(begin,end,&tagHT, &listEntries));
+ (*itst)->AddDicomDirSerie(new DicomDirSerie(s, &TagHT));
}
}
}
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \brief AddDicomDirImageToEnd
- * @param begin iterator on the first HeaderEntry within the chained List
- * @param end iterator on the last HeaderEntry within the chained List
+ * @param s SQ Item to enqueue to the DicomDirImage chained List
*/
- void gdcmDicomDir::AddDicomDirImageToEnd(ListTag::iterator begin,ListTag::iterator end)
+ void DicomDir::AddDicomDirImageToEnd(SQItem *s)
{
- if(patients.size()>0)
+ if( Patients.size() > 0 )
{
- ListDicomDirPatient::iterator itp=patients.end();
+ ListDicomDirPatient::iterator itp = Patients.end();
itp--;
- if((*itp)->GetDicomDirStudies().size()>0)
+ if( (*itp)->GetDicomDirStudies().size() > 0 )
{
- ListDicomDirStudy::iterator itst=(*itp)->GetDicomDirStudies().end();
+ ListDicomDirStudy::const_iterator itst =
+ (*itp)->GetDicomDirStudies().end();
itst--;
- if((*itst)->GetDicomDirSeries().size()>0)
+ if( (*itst)->GetDicomDirSeries().size() > 0 )
{
- ListDicomDirSerie::iterator its=(*itst)->GetDicomDirSeries().end();
+ ListDicomDirSerie::const_iterator its = (*itst)->GetDicomDirSeries().end();
its--;
- (*its)->AddDicomDirImage(new gdcmDicomDirImage(begin,end,&tagHT, &listEntries));
+ (*its)->AddDicomDirImage(new DicomDirImage(s, &TagHT));
}
}
}
}
/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \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, ListHeader &list)
+void DicomDir::SetElements(std::string const & path, VectDocument const &list)
{
- std::string patPrevName="", patPrevID="";
- std::string studPrevInstanceUID="", studPrevID="";
- std::string serPrevInstanceUID="", serPrevID="";
+ 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);
-
- ListTag::iterator debPat=listEntries.begin();
- for(ListHeader::iterator it=list.begin();it!=list.end();++it)
+ 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);
+ 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( 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);
+ if( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID )
+ {
+ 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;
}
}
/**
- * \ingroup gdcmDicomDir
- * \brief adds to the HTable and at the end of the Chained List
- * 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
- */
-void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type,gdcmHeader *header)
-{
- std::list<gdcmElement> elemList;
- std::list<gdcmElement>::iterator it;
- guint16 tmpGr, tmpEl;
- gdcmDictEntry *dictEntry;
- gdcmHeaderEntry *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;
- }
-
- for(it=elemList.begin();it!=elemList.end();++it)
- {
- tmpGr=it->group;
- tmpEl=it->elem;
- dictEntry=GetPubDict()->GetDictEntryByNumber(tmpGr,tmpEl);
- entry=new gdcmHeaderEntry(dictEntry);
- entry->SetOffset(0); // just to avoid 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());
- }
- }
- //AddHeaderEntry(entry); // both in H Table and in chained list
- tagHT.insert( PairHT( entry->GetKey(),entry) );
- listEntries.push_back(entry);
- //wasUpdated = 1; // is private
- }
-}
-/**
- * \ingroup gdcmDicomDir
+ * \ingroup DicomDir
* \brief compares two dgcmHeaders
*/
-bool gdcmDicomDir::HeaderLessThan(gdcmHeader *header1,gdcmHeader *header2)
+bool DicomDir::HeaderLessThan(Document *header1, Document *header2)
{
- return(*header1<*header2);
-}
-
-/**
- * \ingroup gdcmDicomDir
- * \brief Sets the accurate value for the (0x0004,0x1220) element of a DICOMDIR
- */
-
-void gdcmDicomDir::UpdateDirectoryRecordSequenceLength() {
- 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.
- }
- }
- bool res=SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps.
- return;
+ return *header1 < *header2;
}
+} // end namespace gdcm
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff