comparison OrthancServer/DicomDirWriter.cpp @ 2140:aa4b8895cd23

reorganization
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 16:12:47 +0100
parents b1291df2f780
children 5a8840920121
comparison
equal deleted inserted replaced
2139:764c9157301b 2140:aa4b8895cd23
124 { 124 {
125 class DicomDirWriter::PImpl 125 class DicomDirWriter::PImpl
126 { 126 {
127 private: 127 private:
128 std::string fileSetId_; 128 std::string fileSetId_;
129 Toolbox::TemporaryFile file_; 129 TemporaryFile file_;
130 std::auto_ptr<DcmDicomDir> dir_; 130 std::auto_ptr<DcmDicomDir> dir_;
131 131
132 typedef std::pair<ResourceType, std::string> IndexKey; 132 typedef std::pair<ResourceType, std::string> IndexKey;
133 typedef std::map<IndexKey, DcmDirectoryRecord* > Index; 133 typedef std::map<IndexKey, DcmDirectoryRecord* > Index;
134 Index index_; 134 Index index_;
258 Encoding encoding) 258 Encoding encoding)
259 { 259 {
260 // cf. "DicomDirInterface::buildStudyRecord()" 260 // cf. "DicomDirInterface::buildStudyRecord()"
261 261
262 std::string nowDate, nowTime; 262 std::string nowDate, nowTime;
263 Toolbox::GetNowDicom(nowDate, nowTime); 263 SystemToolbox::GetNowDicom(nowDate, nowTime);
264 264
265 std::string studyDate; 265 std::string studyDate;
266 if (!GetUtf8TagValue(studyDate, dicom, encoding, DCM_StudyDate) && 266 if (!GetUtf8TagValue(studyDate, dicom, encoding, DCM_StudyDate) &&
267 !GetUtf8TagValue(studyDate, dicom, encoding, DCM_SeriesDate) && 267 !GetUtf8TagValue(studyDate, dicom, encoding, DCM_SeriesDate) &&
268 !GetUtf8TagValue(studyDate, dicom, encoding, DCM_AcquisitionDate) && 268 !GetUtf8TagValue(studyDate, dicom, encoding, DCM_AcquisitionDate) &&