comparison OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp @ 4941:96a3e81eba90 more-tags

performance warning
author Alain Mazy <am@osimis.io>
date Wed, 16 Mar 2022 09:50:33 +0100
parents acd3f72e2a21
children e1495a34cd39
comparison
equal deleted inserted replaced
4940:304514ce84ee 4941:96a3e81eba90
367 367
368 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_NAME) != result.end()); 368 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_NAME) != result.end());
369 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_BIRTH_DATE) != result.end()); 369 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_BIRTH_DATE) != result.end());
370 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_ORIENTATION) != result.end()); 370 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_ORIENTATION) != result.end());
371 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_ID) == result.end()); 371 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_ID) == result.end());
372
373 // serialize to string
374 std::string serialized;
375 FromDcmtkBridge::FormatListOfTags(serialized, result);
376 ASSERT_EQ("0010,0010;0010,0030;0020,0020", serialized);
372 } 377 }
373 378
374 {// no tag 379 {// no tag
375 std::string source = ""; 380 std::string source = "";
376 std::set<DicomTag> result; 381 std::set<DicomTag> result;
392 397
393 FromDcmtkBridge::ParseListOfTags(result, source); 398 FromDcmtkBridge::ParseListOfTags(result, source);
394 399
395 ASSERT_EQ(1, result.size()); 400 ASSERT_EQ(1, result.size());
396 } 401 }
402
403 {// Json
404 Json::Value source = Json::arrayValue;
405 source.append("0010,0010");
406 source.append("PatientBirthDate");
407 source.append("0020,0020");
408 std::set<DicomTag> result;
409 FromDcmtkBridge::ParseListOfTags(result, source);
410
411 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_NAME) != result.end());
412 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_BIRTH_DATE) != result.end());
413 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_ORIENTATION) != result.end());
414 ASSERT_TRUE(result.find(DICOM_TAG_PATIENT_ID) == result.end());
415 }
416
397 417
398 } 418 }
399 419
400 static const DicomTag REFERENCED_STUDY_SEQUENCE(0x0008, 0x1110); 420 static const DicomTag REFERENCED_STUDY_SEQUENCE(0x0008, 0x1110);
401 static const DicomTag REFERENCED_PATIENT_SEQUENCE(0x0008, 0x1120); 421 static const DicomTag REFERENCED_PATIENT_SEQUENCE(0x0008, 0x1120);