Mercurial > hg > orthanc
comparison UnitTestsSources/FromDcmtkTests.cpp @ 1860:c7d70f659190
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 |
---|---|
393 { | 393 { |
394 Json::Value b; | 394 Json::Value b; |
395 FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0, Encoding_Ascii); | 395 FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0, Encoding_Ascii); |
396 | 396 |
397 Json::Value c; | 397 Json::Value c; |
398 Toolbox::SimplifyTags(c, b, DicomToJsonFormat_Simple); | 398 Toolbox::SimplifyTags(c, b, DicomToJsonFormat_Human); |
399 | 399 |
400 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding | 400 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding |
401 ASSERT_EQ(0, c["ReferencedStudySequence"].compare(a)); | 401 ASSERT_EQ(0, c["ReferencedStudySequence"].compare(a)); |
402 } | 402 } |
403 } | 403 } |
472 { | 472 { |
473 Json::Value b; | 473 Json::Value b; |
474 f.ToJson(b, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0); | 474 f.ToJson(b, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0); |
475 | 475 |
476 Json::Value c; | 476 Json::Value c; |
477 Toolbox::SimplifyTags(c, b, DicomToJsonFormat_Simple); | 477 Toolbox::SimplifyTags(c, b, DicomToJsonFormat_Human); |
478 | 478 |
479 ASSERT_EQ(0, c["ReferencedPatientSequence"].compare(a)); | 479 ASSERT_EQ(0, c["ReferencedPatientSequence"].compare(a)); |
480 ASSERT_NE(0, c["ReferencedStudySequence"].compare(a)); // Because Data URI Scheme decoding was enabled | 480 ASSERT_NE(0, c["ReferencedStudySequence"].compare(a)); // Because Data URI Scheme decoding was enabled |
481 } | 481 } |
482 | 482 |
514 | 514 |
515 Json::Value s = Toolbox::ConvertToUtf8(testEncodingsEncoded[i], testEncodings[i]); | 515 Json::Value s = Toolbox::ConvertToUtf8(testEncodingsEncoded[i], testEncodings[i]); |
516 f.Replace(DICOM_TAG_PATIENT_NAME, s, false); | 516 f.Replace(DICOM_TAG_PATIENT_NAME, s, false); |
517 | 517 |
518 Json::Value v; | 518 Json::Value v; |
519 f.ToJson(v, DicomToJsonFormat_Simple, DicomToJsonFlags_Default, 0); | 519 f.ToJson(v, DicomToJsonFormat_Human, DicomToJsonFlags_Default, 0); |
520 ASSERT_EQ(v["PatientName"].asString(), std::string(testEncodingsExpected[i])); | 520 ASSERT_EQ(v["PatientName"].asString(), std::string(testEncodingsExpected[i])); |
521 } | 521 } |
522 } | 522 } |
523 } | 523 } |
524 | 524 |
707 { | 707 { |
708 std::auto_ptr<ParsedDicomFile> dicom | 708 std::auto_ptr<ParsedDicomFile> dicom |
709 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers))); | 709 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers))); |
710 | 710 |
711 Json::Value vv; | 711 Json::Value vv; |
712 dicom->ToJson(vv, DicomToJsonFormat_Simple, toJsonFlags, 0); | 712 dicom->ToJson(vv, DicomToJsonFormat_Human, toJsonFlags, 0); |
713 | 713 |
714 ASSERT_EQ(vv["SOPClassUID"].asString(), sopClassUid); | 714 ASSERT_EQ(vv["SOPClassUID"].asString(), sopClassUid); |
715 ASSERT_EQ(vv["MediaStorageSOPClassUID"].asString(), sopClassUid); | 715 ASSERT_EQ(vv["MediaStorageSOPClassUID"].asString(), sopClassUid); |
716 ASSERT_TRUE(vv.isMember("SOPInstanceUID")); | 716 ASSERT_TRUE(vv.isMember("SOPInstanceUID")); |
717 ASSERT_TRUE(vv.isMember("SeriesInstanceUID")); | 717 ASSERT_TRUE(vv.isMember("SeriesInstanceUID")); |
723 { | 723 { |
724 std::auto_ptr<ParsedDicomFile> dicom | 724 std::auto_ptr<ParsedDicomFile> dicom |
725 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers))); | 725 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers))); |
726 | 726 |
727 Json::Value vv; | 727 Json::Value vv; |
728 dicom->ToJson(vv, DicomToJsonFormat_Simple, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePixelData), 0); | 728 dicom->ToJson(vv, DicomToJsonFormat_Human, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePixelData), 0); |
729 | 729 |
730 std::string mime, content; | 730 std::string mime, content; |
731 Toolbox::DecodeDataUriScheme(mime, content, vv["PixelData"].asString()); | 731 Toolbox::DecodeDataUriScheme(mime, content, vv["PixelData"].asString()); |
732 ASSERT_EQ("application/octet-stream", mime); | 732 ASSERT_EQ("application/octet-stream", mime); |
733 ASSERT_EQ(5u * 5u * 3u /* the red dot is 5x5 pixels in RGB24 */ + 1 /* for padding */, content.size()); | 733 ASSERT_EQ(5u * 5u * 3u /* the red dot is 5x5 pixels in RGB24 */ + 1 /* for padding */, content.size()); |