Mercurial > hg > orthanc

comparison UnitTestsSources/DicomMapTests.cpp @ 3520:77bede920d22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author amazy
date Thu, 19 Sep 2019 13:11:11 +0200
parents fc26659493b6 a57c8163d9ae
children 4beabcea3a5c
comparison
equal deleted inserted replaced
3519:fc26659493b6 3520:77bede920d22
256 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i)); 256 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i));
257 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j)); 257 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j));
258 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k)); 258 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k));
259 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l)); 259 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l));
260 260
261 ASSERT_FALSE(m.CopyToString(s, DICOM_TAG_PATIENT_NAME, false)); 261 ASSERT_FALSE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
262 ASSERT_TRUE(m.CopyToString(s, DICOM_TAG_PATIENT_NAME, true)); 262 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, true));
263 ASSERT_EQ("0", s); 263 ASSERT_EQ("0", s);
264 264
265 265
266 // 2**31-1 266 // 2**31-1
267 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483647", false); 267 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483647", false);
291 ASSERT_EQ(42, i); 291 ASSERT_EQ(42, i);
292 ASSERT_EQ(42ll, j); 292 ASSERT_EQ(42ll, j);
293 ASSERT_EQ(42u, k); 293 ASSERT_EQ(42u, k);
294 ASSERT_EQ(42ull, l); 294 ASSERT_EQ(42ull, l);
295 295
296 ASSERT_TRUE(m.CopyToString(s, DICOM_TAG_PATIENT_NAME, false)); 296 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
297 ASSERT_EQ("42", s); 297 ASSERT_EQ("42", s);
298 ASSERT_TRUE(m.CopyToString(s, DICOM_TAG_PATIENT_NAME, true)); 298 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, true));
299 ASSERT_EQ("42", s); 299 ASSERT_EQ("42", s);
300 300
301 301
302 // 2**31 302 // 2**31
303 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483648", false); 303 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483648", false);
605 DicomMap m; 605 DicomMap m;
606 m.FromDicomWeb(visitor.GetResult()); 606 m.FromDicomWeb(visitor.GetResult());
607 ASSERT_EQ(3u, m.GetSize()); 607 ASSERT_EQ(3u, m.GetSize());
608 608
609 std::string s; 609 std::string s;
610 ASSERT_TRUE(m.CopyToString(s, DICOM_TAG_PATIENT_NAME, false)); 610 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
611 ASSERT_EQ("SB1^SB2^SB3^SB4^SB5", s); 611 ASSERT_EQ("SB1^SB2^SB3^SB4^SB5", s);
612 ASSERT_TRUE(m.CopyToString(s, DICOM_TAG_IMAGE_POSITION_PATIENT, false)); 612 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_IMAGE_POSITION_PATIENT, false));
613 ASSERT_TRUE(s.empty()); 613 ASSERT_TRUE(s.empty());
614 614
615 ASSERT_TRUE(m.CopyToString(s, DICOM_TAG_IMAGE_ORIENTATION_PATIENT, false)); 615 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_IMAGE_ORIENTATION_PATIENT, false));
616 616
617 std::vector<std::string> v; 617 std::vector<std::string> v;
618 Orthanc::Toolbox::TokenizeString(v, s, '\\'); 618 Orthanc::Toolbox::TokenizeString(v, s, '\\');
619 ASSERT_FLOAT_EQ(1.0f, boost::lexical_cast<float>(v[0])); 619 ASSERT_FLOAT_EQ(1.0f, boost::lexical_cast<float>(v[0]));
620 ASSERT_FLOAT_EQ(2.3f, boost::lexical_cast<float>(v[1])); 620 ASSERT_FLOAT_EQ(2.3f, boost::lexical_cast<float>(v[1]));
655 DicomMap m; 655 DicomMap m;
656 m.FromDicomWeb(visitor.GetResult()); 656 m.FromDicomWeb(visitor.GetResult());
657 ASSERT_EQ(1u, m.GetSize()); 657 ASSERT_EQ(1u, m.GetSize());
658 658
659 std::string s; 659 std::string s;
660 ASSERT_TRUE(m.CopyToString(s, DICOM_TAG_IMAGE_ORIENTATION_PATIENT, false)); 660 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_IMAGE_ORIENTATION_PATIENT, false));
661 661
662 std::vector<std::string> v; 662 std::vector<std::string> v;
663 Orthanc::Toolbox::TokenizeString(v, s, '\\'); 663 Orthanc::Toolbox::TokenizeString(v, s, '\\');
664 ASSERT_FLOAT_EQ(1.5f, boost::lexical_cast<float>(v[0])); 664 ASSERT_FLOAT_EQ(1.5f, boost::lexical_cast<float>(v[0]));
665 ASSERT_TRUE(v[1].empty()); 665 ASSERT_TRUE(v[1].empty());
859 DicomMap m; 859 DicomMap m;
860 m.FromDicomWeb(visitor.GetResult()); 860 m.FromDicomWeb(visitor.GetResult());
861 ASSERT_EQ(31u, m.GetSize()); 861 ASSERT_EQ(31u, m.GetSize());
862 862
863 std::string s; 863 std::string s;
864 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0002, 0x0002), false)); ASSERT_EQ("UI", s); 864 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0002, 0x0002), false)); ASSERT_EQ("UI", s);
865 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0040, 0x0241), false)); ASSERT_EQ("AE", s); 865 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0040, 0x0241), false)); ASSERT_EQ("AE", s);
866 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0010, 0x1010), false)); ASSERT_EQ("AS", s); 866 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0010, 0x1010), false)); ASSERT_EQ("AS", s);
867 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0020, 0x9165), false)); ASSERT_EQ("00100020", s); 867 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0020, 0x9165), false)); ASSERT_EQ("00100020", s);
868 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x0052), false)); ASSERT_EQ("CS", s); 868 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x0052), false)); ASSERT_EQ("CS", s);
869 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x0012), false)); ASSERT_EQ("DA", s); 869 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x0012), false)); ASSERT_EQ("DA", s);
870 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0010, 0x1020), false)); ASSERT_EQ("42", s); 870 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0010, 0x1020), false)); ASSERT_EQ("42", s);
871 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x002a), false)); ASSERT_EQ("DT", s); 871 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x002a), false)); ASSERT_EQ("DT", s);
872 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0010, 0x9431), false)); ASSERT_EQ("43", s); 872 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0010, 0x9431), false)); ASSERT_EQ("43", s);
873 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x1163), false)); ASSERT_EQ("44", s); 873 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x1163), false)); ASSERT_EQ("44", s);
874 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x1160), false)); ASSERT_EQ("45", s); 874 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x1160), false)); ASSERT_EQ("45", s);
875 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x0070), false)); ASSERT_EQ("LO", s); 875 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x0070), false)); ASSERT_EQ("LO", s);
876 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0010, 0x4000), false)); ASSERT_EQ("LT", s); 876 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0010, 0x4000), false)); ASSERT_EQ("LT", s);
877 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0028, 0x2000), true)); ASSERT_EQ("OB", s); 877 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0028, 0x2000), true)); ASSERT_EQ("OB", s);
878 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x7fe0, 0x0009), true)); ASSERT_EQ("OD", s); 878 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x7fe0, 0x0009), true)); ASSERT_EQ("OD", s);
879 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0064, 0x0009), true)); ASSERT_EQ("OF", s); 879 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0064, 0x0009), true)); ASSERT_EQ("OF", s);
880 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0028, 0x1201), true)); ASSERT_EQ("OWOW", s); 880 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0028, 0x1201), true)); ASSERT_EQ("OWOW", s);
881 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0010, 0x0010), false)); ASSERT_EQ("PN", s); 881 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0010, 0x0010), false)); ASSERT_EQ("PN", s);
882 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x0050), false)); ASSERT_EQ("SH", s); 882 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x0050), false)); ASSERT_EQ("SH", s);
883 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0018, 0x6020), false)); ASSERT_EQ("-15", s); 883 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0018, 0x6020), false)); ASSERT_EQ("-15", s);
884 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0018, 0x9219), false)); ASSERT_EQ("-16", s); 884 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0018, 0x9219), false)); ASSERT_EQ("-16", s);
885 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x0081), false)); ASSERT_EQ("ST", s); 885 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x0081), false)); ASSERT_EQ("ST", s);
886 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x0013), false)); ASSERT_EQ("TM", s); 886 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x0013), false)); ASSERT_EQ("TM", s);
887 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x0119), false)); ASSERT_EQ("UC", s); 887 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x0119), false)); ASSERT_EQ("UC", s);
888 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x0016), false)); ASSERT_EQ("UI", s); 888 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x0016), false)); ASSERT_EQ("UI", s);
889 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x1161), false)); ASSERT_EQ("128", s); 889 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x1161), false)); ASSERT_EQ("128", s);
890 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x4342, 0x1234), true)); ASSERT_EQ("UN", s); 890 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x4342, 0x1234), true)); ASSERT_EQ("UN", s);
891 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x0120), false)); ASSERT_EQ("UR", s); 891 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x0120), false)); ASSERT_EQ("UR", s);
892 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0008, 0x0301), false)); ASSERT_EQ("17", s); 892 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0008, 0x0301), false)); ASSERT_EQ("17", s);
893 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0040, 0x0031), false)); ASSERT_EQ("UT", s); 893 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0040, 0x0031), false)); ASSERT_EQ("UT", s);
894 894
895 #if DCMTK_VERSION_NUMBER == 361 895 #if DCMTK_VERSION_NUMBER == 361
896 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0066, 0x0040), false)); 896 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0066, 0x0040), false));
897 #else 897 #else
898 ASSERT_TRUE(m.CopyToString(s, DicomTag(0x0066, 0x0040), true)); 898 ASSERT_TRUE(m.LookupStringValue(s, DicomTag(0x0066, 0x0040), true));
899 #endif 899 #endif
900 ASSERT_EQ("46", s); 900 ASSERT_EQ("46", s);
901 } 901 }
902 } 902 }
903 903