Mercurial > hg > orthanc

comparison OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp @ 4516:671ee7c1fd46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added DicomToJsonFlags_SkipGroupLengths
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 16 Feb 2021 15:01:13 +0100
parents 8734caa12448
children a3c6678aa7b1
comparison
equal deleted inserted replaced
4515:8734caa12448 4516:671ee7c1fd46
633 ParsedDicomFile f(false); 633 ParsedDicomFile f(false);
634 634
635 { 635 {
636 Uint8 v[2] = { 0, 0 }; 636 Uint8 v[2] = { 0, 0 };
637 ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertString(DCM_PatientName, "HELLO^").good()); 637 ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertString(DCM_PatientName, "HELLO^").good());
638 ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertUint32(DcmTag(0x4000, 0x0000), 42).good());
638 ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertUint8Array(DCM_PixelData, v, 2).good()); 639 ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertUint8Array(DCM_PixelData, v, 2).good());
639 ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertString(DcmTag(0x07fe1, 0x0010), "WORLD^").good()); 640 ASSERT_TRUE(f.GetDcmtkObject().getDataset()->putAndInsertString(DcmTag(0x07fe1, 0x0010), "WORLD^").good());
640 } 641 }
641 642
642 std::string s; 643 std::string s;
644 645
645 { 646 {
646 Json::Value v; 647 Json::Value v;
647 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePrivateTags | DicomToJsonFlags_IncludePixelData | DicomToJsonFlags_StopAfterPixelData), 0); 648 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePrivateTags | DicomToJsonFlags_IncludePixelData | DicomToJsonFlags_StopAfterPixelData), 0);
648 ASSERT_EQ(Json::objectValue, v.type()); 649 ASSERT_EQ(Json::objectValue, v.type());
649 ASSERT_EQ(2u, v.size()); 650 ASSERT_EQ(3u, v.size());
650 ASSERT_EQ("HELLO^", v["0010,0010"].asString()); 651 ASSERT_EQ("HELLO^", v["0010,0010"].asString());
652 ASSERT_EQ("42", v["4000,0000"].asString());
651 ASSERT_EQ(s, v["7fe0,0010"].asString()); 653 ASSERT_EQ(s, v["7fe0,0010"].asString());
652 } 654 }
653 655
654 { 656 {
655 Json::Value v; 657 Json::Value v;
656 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePrivateTags, 0); 658 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePrivateTags | DicomToJsonFlags_SkipGroupLengths), 0);
657 ASSERT_EQ(Json::objectValue, v.type()); 659 ASSERT_EQ(Json::objectValue, v.type());
658 ASSERT_EQ(2u, v.size()); 660 ASSERT_EQ(2u, v.size());
659 ASSERT_EQ("HELLO^", v["0010,0010"].asString()); 661 ASSERT_EQ("HELLO^", v["0010,0010"].asString());
660 ASSERT_EQ("WORLD^", v["7fe1,0010"].asString()); 662 ASSERT_EQ("WORLD^", v["7fe1,0010"].asString());
661 } 663 }