Mercurial > hg > orthanc

comparison OrthancServer/UnitTestsSources/UnitTestsMain.cpp @ 4514:5b929e6b3c36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removal of "dicom-as-json" attachments
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 16 Feb 2021 12:18:41 +0100
parents 8f9090b137f1
children f0038043fb97 7053502fbf97
comparison
equal deleted inserted replaced
4513:1f455b86b054 4514:5b929e6b3c36
330 Json::Value b; 330 Json::Value b;
331 std::set<DicomTag> ignoreTagLength; 331 std::set<DicomTag> ignoreTagLength;
332 ignoreTagLength.insert(DICOM_TAG_PATIENT_ID); 332 ignoreTagLength.insert(DICOM_TAG_PATIENT_ID);
333 333
334 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short, 334 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
335 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength); 335 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength, 0);
336 ASSERT_TRUE(b.isMember("0010,0010")); 336 ASSERT_TRUE(b.isMember("0010,0010"));
337 ASSERT_EQ("Hello", b["0010,0010"].asString()); 337 ASSERT_EQ("Hello", b["0010,0010"].asString());
338 338
339 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short, 339 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
340 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength); 340 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength, 0);
341 ASSERT_TRUE(b["0010,0010"].isNull()); // "Hello" has more than 3 characters 341 ASSERT_TRUE(b["0010,0010"].isNull()); // "Hello" has more than 3 characters
342 342
343 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full, 343 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full,
344 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength); 344 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength, 0);
345 ASSERT_TRUE(b["0010,0010"].isObject()); 345 ASSERT_TRUE(b["0010,0010"].isObject());
346 ASSERT_EQ("PatientName", b["0010,0010"]["Name"].asString()); 346 ASSERT_EQ("PatientName", b["0010,0010"]["Name"].asString());
347 ASSERT_EQ("TooLong", b["0010,0010"]["Type"].asString()); 347 ASSERT_EQ("TooLong", b["0010,0010"]["Type"].asString());
348 ASSERT_TRUE(b["0010,0010"]["Value"].isNull()); 348 ASSERT_TRUE(b["0010,0010"]["Value"].isNull());
349 349
350 ignoreTagLength.insert(DICOM_TAG_PATIENT_NAME); 350 ignoreTagLength.insert(DICOM_TAG_PATIENT_NAME);
351 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short, 351 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
352 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength); 352 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength, 0);
353 ASSERT_EQ("Hello", b["0010,0010"].asString()); 353 ASSERT_EQ("Hello", b["0010,0010"].asString());
354 } 354 }
355 355
356 { 356 {
357 Json::Value a; 357 Json::Value a;
373 element.reset(FromDcmtkBridge::FromJson(DICOM_TAG_PATIENT_NAME, a, true, Encoding_Utf8, "")); 373 element.reset(FromDcmtkBridge::FromJson(DICOM_TAG_PATIENT_NAME, a, true, Encoding_Utf8, ""));
374 374
375 Json::Value b; 375 Json::Value b;
376 std::set<DicomTag> ignoreTagLength; 376 std::set<DicomTag> ignoreTagLength;
377 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short, 377 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
378 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength); 378 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength, 0);
379 ASSERT_EQ("Hello", b["0010,0010"].asString()); 379 ASSERT_EQ("Hello", b["0010,0010"].asString());
380 } 380 }
381 381
382 { 382 {
383 Json::Value a = Json::arrayValue; 383 Json::Value a = Json::arrayValue;
386 386
387 { 387 {
388 Json::Value b; 388 Json::Value b;
389 std::set<DicomTag> ignoreTagLength; 389 std::set<DicomTag> ignoreTagLength;
390 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short, 390 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
391 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength); 391 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength, 0);
392 ASSERT_EQ(Json::arrayValue, b["0008,1110"].type()); 392 ASSERT_EQ(Json::arrayValue, b["0008,1110"].type());
393 ASSERT_EQ(2u, b["0008,1110"].size()); 393 ASSERT_EQ(2u, b["0008,1110"].size());
394 394
395 Json::Value::ArrayIndex i = (b["0008,1110"][0]["0010,0010"].asString() == "Hello") ? 0 : 1; 395 Json::Value::ArrayIndex i = (b["0008,1110"][0]["0010,0010"].asString() == "Hello") ? 0 : 1;
396 396
405 405
406 { 406 {
407 Json::Value b; 407 Json::Value b;
408 std::set<DicomTag> ignoreTagLength; 408 std::set<DicomTag> ignoreTagLength;
409 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full, 409 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full,
410 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength); 410 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength, 0);
411 411
412 Json::Value c; 412 Json::Value c;
413 Toolbox::SimplifyDicomAsJson(c, b, DicomToJsonFormat_Human); 413 Toolbox::SimplifyDicomAsJson(c, b, DicomToJsonFormat_Human);
414 414
415 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding 415 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding