Mercurial > hg > orthanc

comparison UnitTestsSources/DicomMapTests.cpp @ 3210:4a1c47e20685

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for dcmtk 3.6.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 08 Feb 2019 13:10:14 +0100
parents f6374c36a671
children e1f6c089fe30
comparison
equal deleted inserted replaced
3209:f6374c36a671 3210:4a1c47e20685
661 dicom.ReplacePlainString(DicomTag(0x0008, 0x0070), "LO"); 661 dicom.ReplacePlainString(DicomTag(0x0008, 0x0070), "LO");
662 dicom.ReplacePlainString(DicomTag(0x0010, 0x4000), "LT"); 662 dicom.ReplacePlainString(DicomTag(0x0010, 0x4000), "LT");
663 dicom.ReplacePlainString(DicomTag(0x0028, 0x2000), "OB"); 663 dicom.ReplacePlainString(DicomTag(0x0028, 0x2000), "OB");
664 dicom.ReplacePlainString(DicomTag(0x7fe0, 0x0009), "OD"); 664 dicom.ReplacePlainString(DicomTag(0x7fe0, 0x0009), "OD");
665 dicom.ReplacePlainString(DicomTag(0x0064, 0x0009), "OF"); 665 dicom.ReplacePlainString(DicomTag(0x0064, 0x0009), "OF");
666 dicom.ReplacePlainString(DicomTag(0x0066, 0x0040), "OLOL"); 666 dicom.ReplacePlainString(DicomTag(0x0066, 0x0040), "46");
667 ASSERT_THROW(dicom.ReplacePlainString(DicomTag(0x0028, 0x1201), "O"), OrthancException); 667 ASSERT_THROW(dicom.ReplacePlainString(DicomTag(0x0028, 0x1201), "O"), OrthancException);
668 dicom.ReplacePlainString(DicomTag(0x0028, 0x1201), "OWOW"); 668 dicom.ReplacePlainString(DicomTag(0x0028, 0x1201), "OWOW");
669 dicom.ReplacePlainString(DicomTag(0x0010, 0x0010), "PN"); 669 dicom.ReplacePlainString(DicomTag(0x0010, 0x0010), "PN");
670 dicom.ReplacePlainString(DicomTag(0x0008, 0x0050), "SH"); 670 dicom.ReplacePlainString(DicomTag(0x0008, 0x0050), "SH");
671 dicom.ReplacePlainString(DicomTag(0x0018, 0x6020), "-15"); // SL 671 dicom.ReplacePlainString(DicomTag(0x0018, 0x6020), "-15"); // SL
712 712
713 ASSERT_EQ("OB", visitor.GetResult() ["00282000"]["vr"].asString()); 713 ASSERT_EQ("OB", visitor.GetResult() ["00282000"]["vr"].asString());
714 Toolbox::DecodeBase64(s, visitor.GetResult() ["00282000"]["InlineBinary"].asString()); 714 Toolbox::DecodeBase64(s, visitor.GetResult() ["00282000"]["InlineBinary"].asString());
715 ASSERT_EQ("OB", s); 715 ASSERT_EQ("OB", s);
716 716
717 #if DCMTK_VERSION_NUMBER >= 362 717 #if DCMTK_VERSION_NUMBER >= 361
718 ASSERT_EQ("OD", visitor.GetResult() ["7FE00009"]["vr"].asString()); 718 ASSERT_EQ("OD", visitor.GetResult() ["7FE00009"]["vr"].asString());
719 #else 719 #else
720 ASSERT_EQ("UN", visitor.GetResult() ["7FE00009"]["vr"].asString()); 720 ASSERT_EQ("UN", visitor.GetResult() ["7FE00009"]["vr"].asString());
721 #endif 721 #endif
722 722
725 725
726 ASSERT_EQ("OF", visitor.GetResult() ["00640009"]["vr"].asString()); 726 ASSERT_EQ("OF", visitor.GetResult() ["00640009"]["vr"].asString());
727 Toolbox::DecodeBase64(s, visitor.GetResult() ["00640009"]["InlineBinary"].asString()); 727 Toolbox::DecodeBase64(s, visitor.GetResult() ["00640009"]["InlineBinary"].asString());
728 ASSERT_EQ("OF", s); 728 ASSERT_EQ("OF", s);
729 729
730 #if DCMTK_VERSION_NUMBER >= 362 730 #if DCMTK_VERSION_NUMBER < 361
731 ASSERT_EQ("UN", visitor.GetResult() ["00660040"]["vr"].asString());
732 Toolbox::DecodeBase64(s, visitor.GetResult() ["00660040"]["InlineBinary"].asString());
733 ASSERT_EQ("16", s);
734 #elif DCMTK_VERSION_NUMBER == 361
735 ASSERT_EQ("UL", visitor.GetResult() ["00660040"]["vr"].asString());
736 ASSERT_EQ(46, visitor.GetResult() ["00660040"]["Value"][0].asInt());
737 #elif DCMTK_VERSION_NUMBER > 361
731 ASSERT_EQ("OL", visitor.GetResult() ["00660040"]["vr"].asString()); 738 ASSERT_EQ("OL", visitor.GetResult() ["00660040"]["vr"].asString());
732 #else 739 Toolbox::DecodeBase64(s, visitor.GetResult() ["00660040"]["InlineBinary"].asString());
733 ASSERT_EQ("UN", visitor.GetResult() ["00660040"]["vr"].asString()); 740 ASSERT_EQ("46", s);
734 #endif 741 #endif
735
736 Toolbox::DecodeBase64(s, visitor.GetResult() ["00660040"]["InlineBinary"].asString());
737 ASSERT_EQ("OLOL", s);
738 742
739 ASSERT_EQ("OW", visitor.GetResult() ["00281201"]["vr"].asString()); 743 ASSERT_EQ("OW", visitor.GetResult() ["00281201"]["vr"].asString());
740 Toolbox::DecodeBase64(s, visitor.GetResult() ["00281201"]["InlineBinary"].asString()); 744 Toolbox::DecodeBase64(s, visitor.GetResult() ["00281201"]["InlineBinary"].asString());
741 ASSERT_EQ("OWOW", s); 745 ASSERT_EQ("OWOW", s);
742 746
745 749
746 ASSERT_EQ("SH", visitor.GetResult() ["00080050"]["vr"].asString()); 750 ASSERT_EQ("SH", visitor.GetResult() ["00080050"]["vr"].asString());
747 ASSERT_EQ("SH", visitor.GetResult() ["00080050"]["Value"][0].asString()); 751 ASSERT_EQ("SH", visitor.GetResult() ["00080050"]["Value"][0].asString());
748 752
749 ASSERT_EQ("SL", visitor.GetResult() ["00186020"]["vr"].asString()); 753 ASSERT_EQ("SL", visitor.GetResult() ["00186020"]["vr"].asString());
750 ASSERT_FLOAT_EQ(-15, visitor.GetResult() ["00186020"]["Value"][0].asInt()); 754 ASSERT_EQ(-15, visitor.GetResult() ["00186020"]["Value"][0].asInt());
751 755
752 ASSERT_EQ("SS", visitor.GetResult() ["00189219"]["vr"].asString()); 756 ASSERT_EQ("SS", visitor.GetResult() ["00189219"]["vr"].asString());
753 ASSERT_FLOAT_EQ(-16, visitor.GetResult() ["00189219"]["Value"][0].asInt()); 757 ASSERT_EQ(-16, visitor.GetResult() ["00189219"]["Value"][0].asInt());
754 758
755 ASSERT_EQ("ST", visitor.GetResult() ["00080081"]["vr"].asString()); 759 ASSERT_EQ("ST", visitor.GetResult() ["00080081"]["vr"].asString());
756 ASSERT_EQ("ST", visitor.GetResult() ["00080081"]["Value"][0].asString()); 760 ASSERT_EQ("ST", visitor.GetResult() ["00080081"]["Value"][0].asString());
757 761
758 ASSERT_EQ("TM", visitor.GetResult() ["00080013"]["vr"].asString()); 762 ASSERT_EQ("TM", visitor.GetResult() ["00080013"]["vr"].asString());