- if ( GetListEntry().begin() == GetListEntry().end() ) {
- cout << "ListEntry vide " << endl;
- }
-
- i = GetListEntry().begin();
- while ( i != GetListEntry().end() ) {
-
- // std::cout << std::hex << (*i)->GetGroup() <<
- // " " << (*i)->GetElement() << endl;
-
- std::string v = (*i)->GetValue();
- if (v == "PATIENT ") {
- patCur=new gdcmPatient();
- //cout << "PATIENT" << endl,
- patCur->beginObj =i;
- GetPatients().push_back(patCur);
- }
-
- if (v == "STUDY ") {
- //cout << "STUDY" << endl,
- studCur=new gdcmStudy();
- studCur->beginObj = patCur->endObj = i;
- lPatient::iterator aa = GetPatients().end();
- --aa;
- (*aa)->GetStudies().push_back(studCur);
- }
- studCur=new gdcmStudy();
-
- if (v == "SERIES") {
- //cout << "SERIES" << endl,
- serCur=new gdcmSerie();
-
- serCur->beginObj = studCur->endObj= i;
- lPatient::iterator aa = GetPatients().end();
- --aa;
- lStudy::iterator bb = (*aa)->GetStudies().end();
- --bb;
- (*bb)->GetSeries().push_back(serCur);
- }
-
- if (v == "IMAGE ") {
- //cout << "IMAGE" << endl;
- imaCur=new gdcmImage();
- imaCur->beginObj = serCur->endObj= i;
-
- lPatient::iterator aa = GetPatients().end();
- --aa;
- lStudy::iterator bb = (*aa)->GetStudies().end();
- --bb;
- lSerie::iterator cc = (*bb)->GetSeries().end();
- --cc;
- (*cc)->GetImages().push_back(imaCur);
-
-
- /* ---
- // ce n'est pas sur une nouvelle IMAGE, qu'il faut intervenir
- // mais lorsqu'on rencontre un 'non IMAGE' apres des 'IMAGE'
- lImage::iterator dd = (*cc)->GetImages().end();
-
- if ( (*cc)->GetImages().begin() != dd ) {
- --dd;
- (*dd)->endObj = i;
- }
- --- */
- }
- ++i;
- }
-}
-
-
-gdcmDicomDir::~gdcmDicomDir() {
- lPatient::iterator cc = GetPatients().begin();
- while (cc != GetPatients().end() ) {
- //cout << "delete PATIENT" << endl;
- delete *cc;
- ++cc;
+ // force writing Sequence Delimitation Item
+ for(i=0;i<4;++i)
+ {
+ binary_write(*fp, sqt[i]); // fffe e0dd ffff ffff
+ }
+
+ fp->close();
+ delete fp;
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+// Protected
+
+/**
+ * \brief create a Document-like chained list from a root Directory
+ * @param path entry point of the tree-like structure
+ */
+void DicomDir::CreateDicomDirChainedList(std::string const & path)
+{
+ CallStartMethod();
+ DirList dirList(path,1); // gets recursively the file list
+ unsigned int count = 0;
+ VectDocument list;
+ Header *header;
+
+ DirListType fileList = dirList.GetFilenames();
+
+ for( DirListType::iterator it = fileList.begin();
+ it != fileList.end();
+ ++it )
+ {
+ Progress = (float)(count+1)/(float)fileList.size();
+ CallProgressMethod();
+ if( Abort )
+ {
+ break;
+ }
+
+ header = new Header( it->c_str() );
+ if( !header )
+ {
+ gdcmVerboseMacro( "Failure in new Header " << it->c_str() );
+ continue;
+ }
+
+ if( header->IsReadable() )
+ {
+ // Add the file header to the chained list:
+ list.push_back(header);
+ gdcmVerboseMacro( "Readable " << it->c_str() );
+ }
+ else
+ {
+ delete header;
+ }
+ count++;
+ }
+ // sorts Patient/Study/Serie/
+ std::sort(list.begin(), list.end(), DicomDir::HeaderLessThan );
+
+ std::string tmp = dirList.GetDirName();
+ //for each Header of the chained list, add/update the Patient/Study/Serie/Image info
+ SetElements(tmp, list);
+ CallEndMethod();
+
+ for(VectDocument::iterator itDoc=list.begin();
+ itDoc!=list.end();
+ ++itDoc)
+ {
+ delete dynamic_cast<Header *>(*itDoc);
+ }
+}
+
+/**
+ * \brief adds *the* Meta to a partially created DICOMDIR
+ */
+
+DicomDirMeta * DicomDir::NewMeta()
+{
+ DicomDirMeta *m = new DicomDirMeta();
+
+ 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->AddEntry( 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;
+
+ ListDicomDirPatientElem const & elemList =
+ Global::GetDicomDirElements()->GetDicomDirPatientElements();
+ DicomDirPatient *p = new DicomDirPatient();
+
+ // for all the DicomDirPatient Elements
+ for( it = elemList.begin(); it != elemList.end(); ++it )
+ {
+ tmpGr = it->Group;
+ tmpEl = it->Elem;
+ dictEntry = GetPubDict()->GetDictEntry(tmpGr, tmpEl);
+ entry = new ValEntry( dictEntry );
+ entry->SetOffset(0); // just to avoid further missprinting
+ entry->SetValue( it->Value );
+
+ p->AddEntry( entry );
+ }
+
+ Patients.push_front( p );
+
+ return p;
+}
+
+/**
+ * \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
+ */
+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;
+
+ switch( type )
+ {
+ case GDCM_DICOMDIR_IMAGE:
+ elemList = Global::GetDicomDirElements()->GetDicomDirImageElements();
+ si = new DicomDirImage();
+ if( !AddDicomDirImageToEnd(static_cast<DicomDirImage *>(si)) )
+ {
+ gdcmVerboseMacro( "Add DicomDirImageToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_SERIE:
+ elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements();
+ si = new DicomDirSerie();
+ if( !AddDicomDirSerieToEnd(static_cast<DicomDirSerie *>(si)) )
+ {
+ gdcmVerboseMacro( "Add DicomDirSerieToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_STUDY:
+ elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements();
+ si = new DicomDirStudy();
+ if( !AddDicomDirStudyToEnd(static_cast<DicomDirStudy *>(si)) )
+ {
+ gdcmVerboseMacro( "Add DicomDirStudyToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_PATIENT:
+ elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements();
+ si = new DicomDirPatient();
+ if( !AddDicomDirPatientToEnd(static_cast<DicomDirPatient *>(si)) )
+ {
+ gdcmVerboseMacro( "Add DicomDirPatientToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_META:
+ elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements();
+ si = new DicomDirMeta();
+ if( MetaElems )
+ {
+ gdcmVerboseMacro( "MetaElements already exist, they will be destroyed");
+ delete MetaElems;
+ }
+ 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
+ // 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()->GetDictEntry(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->GetEntry(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 )
+ {
+ gdcmVerboseMacro( "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 !
+ {
+ std::cout << "GDCM_DICOMDIR_META ?!? should never print that"
+ << std::endl;
+ }
+ si->AddEntry(entry);
+ }
+}
+
+//-----------------------------------------------------------------------------
+/**
+ * \brief CallStartMethod
+ */
+void DicomDir::CallStartMethod()
+{
+ Progress = 0.0f;
+ Abort = false;
+ if( StartMethod )
+ {
+ StartMethod( StartArg );
+ }
+}
+
+//-----------------------------------------------------------------------------
+/**
+ * \brief CallProgressMethod
+ */
+void DicomDir::CallProgressMethod()
+{
+ if( ProgressMethod )
+ {
+ ProgressMethod( ProgressArg );
+ }
+}
+
+//-----------------------------------------------------------------------------
+/**
+ * \brief CallEndMethod
+ */
+void DicomDir::CallEndMethod()
+{
+ Progress = 1.0f;
+ if( EndMethod )
+ {
+ EndMethod( EndArg );
+ }
+}
+
+//-----------------------------------------------------------------------------
+// Private
+/**
+ * \brief create a 'DicomDir' from a DICOMDIR Header
+ */
+void DicomDir::CreateDicomDir()
+{
+ // The list is parsed.
+ // When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found :
+ // 1 - we save the beginning iterator
+ // 2 - we continue to parse
+ // 3 - we find an other tag
+ // + we create the object for the precedent tag
+ // + loop to 1 -
+
+ // Directory record sequence
+ DocEntry *e = GetDocEntry(0x0004, 0x1220);
+ if ( !e )
+ {
+ gdcmVerboseMacro( "NO Directory record sequence (0x0004,0x1220)");
+ /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ?
+ return;