Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi/OrthancRestResources.cpp @ 1860:c7d70f659190

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DicomToJsonFormat_Simple -> DicomToJsonFormat_Human
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 02 Dec 2015 11:26:52 +0100
parents 4e7c318a3f69
children b1291df2f780
comparison
equal deleted inserted replaced
1859:4e7c318a3f69 1860:c7d70f659190
207 { 207 {
208 Json::Value full; 208 Json::Value full;
209 context.ReadJson(full, publicId); 209 context.ReadJson(full, publicId);
210 210
211 Json::Value simplified; 211 Json::Value simplified;
212 Toolbox::SimplifyTags(simplified, full, DicomToJsonFormat_Simple); 212 Toolbox::SimplifyTags(simplified, full, DicomToJsonFormat_Human);
213 call.GetOutput().AnswerJson(simplified); 213 call.GetOutput().AnswerJson(simplified);
214 } 214 }
215 else 215 else
216 { 216 {
217 context.AnswerAttachment(call.GetOutput(), publicId, FileContentType_DicomAsJson); 217 context.AnswerAttachment(call.GetOutput(), publicId, FileContentType_DicomAsJson);
926 { 926 {
927 // Success: Send the value of the shared tags 927 // Success: Send the value of the shared tags
928 if (simplify) 928 if (simplify)
929 { 929 {
930 Json::Value simplified; 930 Json::Value simplified;
931 Toolbox::SimplifyTags(simplified, sharedTags, DicomToJsonFormat_Simple); 931 Toolbox::SimplifyTags(simplified, sharedTags, DicomToJsonFormat_Human);
932 call.GetOutput().AnswerJson(simplified); 932 call.GetOutput().AnswerJson(simplified);
933 } 933 }
934 else 934 else
935 { 935 {
936 call.GetOutput().AnswerJson(sharedTags); 936 call.GetOutput().AnswerJson(sharedTags);
993 } 993 }
994 994
995 if (simplify) 995 if (simplify)
996 { 996 {
997 Json::Value simplified; 997 Json::Value simplified;
998 Toolbox::SimplifyTags(simplified, result, DicomToJsonFormat_Simple); 998 Toolbox::SimplifyTags(simplified, result, DicomToJsonFormat_Human);
999 call.GetOutput().AnswerJson(simplified); 999 call.GetOutput().AnswerJson(simplified);
1000 } 1000 }
1001 else 1001 else
1002 { 1002 {
1003 call.GetOutput().AnswerJson(result); 1003 call.GetOutput().AnswerJson(result);
1199 context.ReadJson(full, *it); 1199 context.ReadJson(full, *it);
1200 1200
1201 if (simplify) 1201 if (simplify)
1202 { 1202 {
1203 Json::Value simplified; 1203 Json::Value simplified;
1204 Toolbox::SimplifyTags(simplified, full, DicomToJsonFormat_Simple); 1204 Toolbox::SimplifyTags(simplified, full, DicomToJsonFormat_Human);
1205 result[*it] = simplified; 1205 result[*it] = simplified;
1206 } 1206 }
1207 else 1207 else
1208 { 1208 {
1209 result[*it] = full; 1209 result[*it] = full;
1293 dicom.HeaderToJson(header, DicomToJsonFormat_Full); 1293 dicom.HeaderToJson(header, DicomToJsonFormat_Full);
1294 1294
1295 if (simplify) 1295 if (simplify)
1296 { 1296 {
1297 Json::Value simplified; 1297 Json::Value simplified;
1298 Toolbox::SimplifyTags(simplified, header, DicomToJsonFormat_Simple); 1298 Toolbox::SimplifyTags(simplified, header, DicomToJsonFormat_Human);
1299 call.GetOutput().AnswerJson(simplified); 1299 call.GetOutput().AnswerJson(simplified);
1300 } 1300 }
1301 else 1301 else
1302 { 1302 {
1303 call.GetOutput().AnswerJson(header); 1303 call.GetOutput().AnswerJson(header);