Mercurial > hg > orthanc
comparison OrthancServer/ParsedDicomFile.cpp @ 1161:82cbf1480aac db-changes
mainline->db-changes integration
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 17 Sep 2014 12:38:28 +0200 |
parents | 80671157d051 |
children | 6e7e5ed91c2d |
comparison
equal
deleted
inserted
replaced
1159:8f9d49192815 | 1161:82cbf1480aac |
---|---|
78 #define NOMINMAX | 78 #define NOMINMAX |
79 #endif | 79 #endif |
80 | 80 |
81 #include "ParsedDicomFile.h" | 81 #include "ParsedDicomFile.h" |
82 | 82 |
83 #include "ServerToolbox.h" | |
83 #include "FromDcmtkBridge.h" | 84 #include "FromDcmtkBridge.h" |
84 #include "ToDcmtkBridge.h" | 85 #include "ToDcmtkBridge.h" |
85 #include "Internals/DicomImageDecoder.h" | 86 #include "Internals/DicomImageDecoder.h" |
86 #include "../Core/Toolbox.h" | 87 #include "../Core/Toolbox.h" |
87 #include "../Core/OrthancException.h" | 88 #include "../Core/OrthancException.h" |
1283 } | 1284 } |
1284 | 1285 |
1285 Replace(DICOM_TAG_SPECIFIC_CHARACTER_SET, s, DicomReplaceMode_InsertIfAbsent); | 1286 Replace(DICOM_TAG_SPECIFIC_CHARACTER_SET, s, DicomReplaceMode_InsertIfAbsent); |
1286 } | 1287 } |
1287 | 1288 |
1289 void ParsedDicomFile::ToJson(Json::Value& target, bool simplify) | |
1290 { | |
1291 if (simplify) | |
1292 { | |
1293 Json::Value tmp; | |
1294 FromDcmtkBridge::ToJson(tmp, *pimpl_->file_->getDataset()); | |
1295 SimplifyTags(target, tmp); | |
1296 } | |
1297 else | |
1298 { | |
1299 FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset()); | |
1300 } | |
1301 } | |
1288 } | 1302 } |