Mercurial > hg > orthanc
comparison OrthancServer/FromDcmtkBridge.cpp @ 2126:03b065778fc3
cleaning up
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 07 Nov 2016 13:47:21 +0100 |
parents | b9bd52c72ba2 |
children | 0c09d1af22f3 |
comparison
equal
deleted
inserted
replaced
2125:b9bd52c72ba2 | 2126:03b065778fc3 |
---|---|
739 } | 739 } |
740 } | 740 } |
741 } | 741 } |
742 | 742 |
743 | 743 |
744 static void DatasetToJson(Json::Value& parent, | 744 void FromDcmtkBridge::ElementToJson(Json::Value& parent, |
745 DcmItem& item, | 745 DcmElement& element, |
746 DicomToJsonFormat format, | 746 DicomToJsonFormat format, |
747 DicomToJsonFlags flags, | 747 DicomToJsonFlags flags, |
748 unsigned int maxStringLength, | 748 unsigned int maxStringLength, |
749 Encoding encoding); | 749 Encoding encoding) |
750 | |
751 | |
752 void FromDcmtkBridge::ToJson(Json::Value& parent, | |
753 DcmElement& element, | |
754 DicomToJsonFormat format, | |
755 DicomToJsonFlags flags, | |
756 unsigned int maxStringLength, | |
757 Encoding encoding) | |
758 { | 750 { |
759 if (parent.type() == Json::nullValue) | 751 if (parent.type() == Json::nullValue) |
760 { | 752 { |
761 parent = Json::objectValue; | 753 parent = Json::objectValue; |
762 } | 754 } |
787 } | 779 } |
788 } | 780 } |
789 } | 781 } |
790 | 782 |
791 | 783 |
792 static void DatasetToJson(Json::Value& parent, | 784 void FromDcmtkBridge::DatasetToJson(Json::Value& parent, |
793 DcmItem& item, | 785 DcmItem& item, |
794 DicomToJsonFormat format, | 786 DicomToJsonFormat format, |
795 DicomToJsonFlags flags, | 787 DicomToJsonFlags flags, |
796 unsigned int maxStringLength, | 788 unsigned int maxStringLength, |
797 Encoding encoding) | 789 Encoding encoding) |
798 { | 790 { |
799 assert(parent.type() == Json::objectValue); | 791 assert(parent.type() == Json::objectValue); |
800 | 792 |
801 for (unsigned long i = 0; i < item.card(); i++) | 793 for (unsigned long i = 0; i < item.card(); i++) |
802 { | 794 { |
837 { | 829 { |
838 continue; | 830 continue; |
839 } | 831 } |
840 } | 832 } |
841 | 833 |
842 FromDcmtkBridge::ToJson(parent, *element, format, flags, maxStringLength, encoding); | 834 FromDcmtkBridge::ElementToJson(parent, *element, format, flags, maxStringLength, encoding); |
843 } | 835 } |
844 } | 836 } |
845 | 837 |
846 | 838 |
847 void FromDcmtkBridge::ToJson(Json::Value& target, | 839 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target, |
848 DcmDataset& dataset, | 840 DcmDataset& dataset, |
849 DicomToJsonFormat format, | 841 DicomToJsonFormat format, |
850 DicomToJsonFlags flags, | 842 DicomToJsonFlags flags, |
851 unsigned int maxStringLength, | 843 unsigned int maxStringLength) |
852 Encoding defaultEncoding) | 844 { |
853 { | 845 Encoding encoding = DetectEncoding(dataset, Configuration::GetDefaultEncoding()); |
846 | |
854 target = Json::objectValue; | 847 target = Json::objectValue; |
855 DatasetToJson(target, dataset, format, flags, maxStringLength, DetectEncoding(dataset, defaultEncoding)); | 848 DatasetToJson(target, dataset, format, flags, maxStringLength, encoding); |
856 } | 849 } |
857 | 850 |
858 | 851 |
859 void FromDcmtkBridge::ToJson(Json::Value& target, | 852 void FromDcmtkBridge::ExtractHeaderAsJson(Json::Value& target, |
860 DcmMetaInfo& dataset, | 853 DcmMetaInfo& dataset, |
861 DicomToJsonFormat format, | 854 DicomToJsonFormat format, |
862 DicomToJsonFlags flags, | 855 DicomToJsonFlags flags, |
863 unsigned int maxStringLength) | 856 unsigned int maxStringLength) |
864 { | 857 { |
865 target = Json::objectValue; | 858 target = Json::objectValue; |
866 DatasetToJson(target, dataset, format, flags, maxStringLength, Encoding_Ascii); | 859 DatasetToJson(target, dataset, format, flags, maxStringLength, Encoding_Ascii); |
867 } | 860 } |
868 | 861 |