Mercurial > hg > orthanc
comparison OrthancServer/ParsedDicomFile.cpp @ 1737:ec66a16aa398
removal of DicomStringValue and DicomNullValue
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 22 Oct 2015 07:52:24 +0200 |
parents | b953c6eef28d |
children | 5ad4e4d92ecb |
comparison
equal
deleted
inserted
replaced
1736:b953c6eef28d | 1737:ec66a16aa398 |
---|---|
88 #include "../Core/Toolbox.h" | 88 #include "../Core/Toolbox.h" |
89 #include "../Core/OrthancException.h" | 89 #include "../Core/OrthancException.h" |
90 #include "../Core/Images/ImageBuffer.h" | 90 #include "../Core/Images/ImageBuffer.h" |
91 #include "../Core/Images/PngWriter.h" | 91 #include "../Core/Images/PngWriter.h" |
92 #include "../Core/Uuid.h" | 92 #include "../Core/Uuid.h" |
93 #include "../Core/DicomFormat/DicomString.h" | |
94 #include "../Core/DicomFormat/DicomNullValue.h" | |
95 #include "../Core/DicomFormat/DicomIntegerPixelAccessor.h" | 93 #include "../Core/DicomFormat/DicomIntegerPixelAccessor.h" |
96 #include "../Core/Images/PngReader.h" | 94 #include "../Core/Images/PngReader.h" |
97 | 95 |
98 #include <list> | 96 #include <list> |
99 #include <limits> | 97 #include <limits> |
764 } | 762 } |
765 | 763 |
766 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement | 764 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement |
767 (*element, DicomToJsonFlags_Default, GetEncoding())); | 765 (*element, DicomToJsonFlags_Default, GetEncoding())); |
768 | 766 |
769 if (v.get() == NULL) | 767 if (v.get() == NULL || |
768 v->IsNull()) | |
770 { | 769 { |
771 value = ""; | 770 value = ""; |
772 } | 771 } |
773 else | 772 else |
774 { | 773 { |
775 value = v->AsString(); | 774 // TODO v->IsBinary() |
775 value = v->GetContent(); | |
776 } | 776 } |
777 | 777 |
778 return true; | 778 return true; |
779 } | 779 } |
780 } | 780 } |