orthanc: UnitTestsSources/DicomMapTests.cpp comparison

comparison UnitTestsSources/DicomMapTests.cpp @ 3194:47ef29168698

support of value multiplicity in ITagVisitor

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 05 Feb 2019 18:34:27 +0100
parents	c6cfd502bf79
children	880e4161c312

comparison

equal deleted inserted replaced

-:c6cfd502bf79
+:47ef29168698
 #if 0
+#include <boost/math/special_functions/round.hpp>
 namespace Orthanc
 {
 class DicomJsonVisitor : public ITagVisitor
 {
 private:
 else
 {
 (*node) [t] = Json::objectValue;
 return (*node) [t];
 }
 }
+static Json::Value FormatInteger(int64_t value)
+{
+if (value < 0)
+{
+return Json::Value(static_cast<int32_t>(value));
+}
+else
+{
+return Json::Value(static_cast<uint32_t>(value));
+}
+}
+static Json::Value FormatDouble(double value)
+{
+long long a = boost::math::llround<double>(value);
+double d = fabs(value - static_cast<double>(a));
+if (d <= std::numeric_limits<double>::epsilon() * 100.0)
+{
+return FormatInteger(a);
+}
+else
+{
+return Json::Value(value);
+}
+}
 public:
 DicomJsonVisitor()
 {
 Clear();
 virtual void VisitUnknown(const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
 const DicomTag& tag,
 ValueRepresentation vr) ORTHANC_OVERRIDE
 {
+Json::Value& node = CreateNode(parentTags, parentIndexes, tag);
+node["vr"] = EnumerationToString(vr);
 }
 virtual void VisitBinary(const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
 const DicomTag& tag,
 Json::Value& node = CreateNode(parentTags, parentIndexes, tag);
 node["vr"] = EnumerationToString(vr);
 }
 }
-virtual void VisitInteger(const std::vector<DicomTag>& parentTags,
+virtual void VisitIntegers(const std::vector<DicomTag>& parentTags,
+const std::vector<size_t>& parentIndexes,
+const DicomTag& tag,
+ValueRepresentation vr,
+const std::vector<int64_t>& values) ORTHANC_OVERRIDE
+{
+if (vr != ValueRepresentation_NotSupported)
+{
+Json::Value& node = CreateNode(parentTags, parentIndexes, tag);
+node["vr"] = EnumerationToString(vr);
+Json::Value content = Json::arrayValue;
+for (size_t i = 0; i < values.size(); i++)
+{
+content.append(FormatInteger(values[i]));
+}
+node["Value"] = content;
+}
+}
+virtual void VisitDoubles(const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
 const DicomTag& tag,
 ValueRepresentation vr,
-int64_t value) ORTHANC_OVERRIDE
+const std::vector<double>& values) ORTHANC_OVERRIDE
 {
 if (vr != ValueRepresentation_NotSupported)
 {
 Json::Value& node = CreateNode(parentTags, parentIndexes, tag);
 node["vr"] = EnumerationToString(vr);
 Json::Value content = Json::arrayValue;
-if (value < 0)
+for (size_t i = 0; i < values.size(); i++)
 {
-content.append(static_cast<int32_t>(value));
+content.append(FormatDouble(values[i]));
-}
-else
-{
-content.append(static_cast<uint32_t>(value));
 }
 node["Value"] = content;
 }
 }
-virtual void VisitDouble(const std::vector<DicomTag>& parentTags,
+virtual void VisitAttributes(const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
 const DicomTag& tag,
 ValueRepresentation vr,
-double value) ORTHANC_OVERRIDE
+const std::vector<DicomTag>& values) ORTHANC_OVERRIDE
 {
 if (vr != ValueRepresentation_NotSupported)
 {
 Json::Value& node = CreateNode(parentTags, parentIndexes, tag);
 node["vr"] = EnumerationToString(vr);
-Json::Value content = Json::arrayValue;
-content.append(value);
-node["Value"] = content;
-}
-}
-virtual void VisitAttribute(const std::vector<DicomTag>& parentTags,
-const std::vector<size_t>& parentIndexes,
-const DicomTag& tag,
-ValueRepresentation vr,
-const DicomTag& value) ORTHANC_OVERRIDE
-{
-if (vr != ValueRepresentation_NotSupported)
-{
-Json::Value& node = CreateNode(parentTags, parentIndexes, tag);
-node["vr"] = EnumerationToString(vr);
 }
 }
 virtual Action VisitString(std::string& newValue,
 const std::vector<DicomTag>& parentTags,
 }
 case ValueRepresentation_IntegerString:
 {
 int64_t value = boost::lexical_cast<int64_t>(tokens[i]);
-if (value < 0)
+node["Value"].append(FormatInteger(value));
-{
-node["Value"].append(static_cast<int32_t>(value));
-}
-else
-{
-node["Value"].append(static_cast<uint32_t>(value));
-}
 break;
 }
 case ValueRepresentation_DecimalString:
 {
 double value = boost::lexical_cast<double>(tokens[i]);
-node["Value"].append(value);
+node["Value"].append(FormatDouble(value));
 break;
 }
 default:
+{
+size_t l = tokens[i].size();
+if (l > 0 &&
+tokens[i][l - 1] == '\0')
+{
+tokens[i] = tokens[i].substr(0, l - 1);
+}
 node["Value"].append(tokens[i]);
 break;
+}
 }
 }
 catch (boost::bad_lexical_cast&)
 {
 throw OrthancException(ErrorCode_BadFileFormat);
 #include "../Core/SystemToolbox.h"
 /*
-cd /home/jodogne/Subversion/orthanc/s/dcmtk-3.6.2/i/bin
+cat << EOF > /tmp/tutu.py
-DCMDICTPATH=/home/jodogne/Downloads/dcmtk-3.6.2/dcmdata/data/dicom.dic ./dcm2json ~/Subversion/orthanc-tests/Database/DummyCT.dcm  | python -mjson.tool > /tmp/a.json
+import json
+import sys
-make -j4 && ./UnitTests --gtest_filter=DicomWeb* && python -mjson.tool /tmp/tutu.json > /tmp/b.json
+j = json.loads(sys.stdin.read().decode("utf-8-sig"))
-diff /tmp/a.json /tmp/b.json
+print(json.dumps(j, indent=4, sort_keys=True, ensure_ascii=False).encode('utf-8'))
+EOF
+DCMDICTPATH=/home/jodogne/Downloads/dcmtk-3.6.2/dcmdata/data/dicom.dic /home/jodogne/Downloads/dcmtk-3.6.2/i/bin/dcm2json ~/Subversion/orthanc-tests/Database/DummyCT.dcm | tr -d '\0' | sed 's/\\u0000//g' | sed 's/\.0$//' | python /tmp/tutu.py | grep -v 'InlineBinary' > /tmp/a.json
+make -j4 && ./UnitTests --gtest_filter=DicomWeb* && python /tmp/tutu.py < /tmp/tutu.json > /tmp/b.json && diff -i /tmp/a.json /tmp/b.json
 */
 TEST(DicomWebJson, Basic)
 {

Mercurial > hg > orthanc

comparison UnitTestsSources/DicomMapTests.cpp @ 3194:47ef29168698