Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi/OrthancRestResources.cpp @ 1668:de1413733c97 db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reconstructing main dicom tags
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 30 Sep 2015 17:18:39 +0200
parents b8dc2f855a83
children 4aaaecae5803
comparison
equal deleted inserted replaced
1667:9e875db36aef 1668:de1413733c97
206 { 206 {
207 Json::Value full; 207 Json::Value full;
208 context.ReadJson(full, publicId); 208 context.ReadJson(full, publicId);
209 209
210 Json::Value simplified; 210 Json::Value simplified;
211 SimplifyTags(simplified, full); 211 Toolbox::SimplifyTags(simplified, full);
212 call.GetOutput().AnswerJson(simplified); 212 call.GetOutput().AnswerJson(simplified);
213 } 213 }
214 else 214 else
215 { 215 {
216 context.AnswerAttachment(call.GetOutput(), publicId, FileContentType_DicomAsJson); 216 context.AnswerAttachment(call.GetOutput(), publicId, FileContentType_DicomAsJson);
762 { 762 {
763 // Success: Send the value of the shared tags 763 // Success: Send the value of the shared tags
764 if (simplify) 764 if (simplify)
765 { 765 {
766 Json::Value simplified; 766 Json::Value simplified;
767 SimplifyTags(simplified, sharedTags); 767 Toolbox::SimplifyTags(simplified, sharedTags);
768 call.GetOutput().AnswerJson(simplified); 768 call.GetOutput().AnswerJson(simplified);
769 } 769 }
770 else 770 else
771 { 771 {
772 call.GetOutput().AnswerJson(sharedTags); 772 call.GetOutput().AnswerJson(sharedTags);
829 } 829 }
830 830
831 if (simplify) 831 if (simplify)
832 { 832 {
833 Json::Value simplified; 833 Json::Value simplified;
834 SimplifyTags(simplified, result); 834 Toolbox::SimplifyTags(simplified, result);
835 call.GetOutput().AnswerJson(simplified); 835 call.GetOutput().AnswerJson(simplified);
836 } 836 }
837 else 837 else
838 { 838 {
839 call.GetOutput().AnswerJson(result); 839 call.GetOutput().AnswerJson(result);
1000 context.ReadJson(full, *it); 1000 context.ReadJson(full, *it);
1001 1001
1002 if (simplify) 1002 if (simplify)
1003 { 1003 {
1004 Json::Value simplified; 1004 Json::Value simplified;
1005 SimplifyTags(simplified, full); 1005 Toolbox::SimplifyTags(simplified, full);
1006 result[*it] = simplified; 1006 result[*it] = simplified;
1007 } 1007 }
1008 else 1008 else
1009 { 1009 {
1010 result[*it] = full; 1010 result[*it] = full;