orthanc: UnitTestsSources/FromDcmtkTests.cpp annotate

annotate UnitTestsSources/FromDcmtkTests.cpp @ 2382:7284093111b0

big reorganization to cleanly separate framework vs. server

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 29 Aug 2017 21:17:35 +0200
parents	b8969010b534
children	a051aba0037c

rev	line source
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	1 /**
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1091 diff changeset	4 * Department, University Hospital of Liege, Belgium
2244 a3a65de1840f shared copyright with osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	5 * Copyright (C) 2017 Osimis, Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	6 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	7 * This program is free software: you can redistribute it and/or
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	8 * modify it under the terms of the GNU General Public License as
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	10 * License, or (at your option) any later version.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	11 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	12 * In addition, as a special exception, the copyright holders of this
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	13 * program give permission to link the code of its release with the
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	16 * the linked executables. You must obey the GNU General Public License
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	20 * you do not wish to do so, delete this exception statement from your
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	21 * version. If you delete this exception statement from all source files
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	22 * in the program, then also delete it here.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	23 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	24 * This program is distributed in the hope that it will be useful, but
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	27 * General Public License for more details.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	28 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	29 * You should have received a copy of the GNU General Public License
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	31 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	32
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	33
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 827 diff changeset	34 #include "PrecompiledHeadersUnitTests.h"
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "gtest/gtest.h"
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	37 #include "../Core/DicomParsing/FromDcmtkBridge.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	38 #include "../Core/DicomParsing/ToDcmtkBridge.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	39 #include "../Core/DicomParsing/DicomModification.h"
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	40 #include "../OrthancServer/ServerToolbox.h"
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	41 #include "../Core/OrthancException.h"
1612 96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	42 #include "../Core/Images/ImageBuffer.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	43 #include "../Core/Images/PngReader.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	44 #include "../Core/Images/PngWriter.h"
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	45 #include "../Core/Images/Image.h"
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	46 #include "../Core/Images/ImageProcessing.h"
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	47 #include "../Core/Endianness.h"
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	48 #include "../Resources/EncodingTests.h"
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	49 #include "../Core/DicomNetworking/DicomFindAnswers.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	50 #include "../Core/DicomParsing/Internals/DicomImageDecoder.h"
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	51 #include "../Plugins/Engine/PluginsEnumerations.h"
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	53 #include <dcmtk/dcmdata/dcelem.h>
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	54 #include <dcmtk/dcmdata/dcdeftag.h>
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	55
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 using namespace Orthanc;
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 TEST(DicomFormat, Tag)
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	60 ASSERT_EQ("PatientName", FromDcmtkBridge::GetTagName(DicomTag(0x0010, 0x0010), ""));
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 DicomTag t = FromDcmtkBridge::ParseTag("SeriesDescription");
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 ASSERT_EQ(0x0008, t.GetGroup());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 ASSERT_EQ(0x103E, t.GetElement());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 t = FromDcmtkBridge::ParseTag("0020-e040");
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 ASSERT_EQ(0x0020, t.GetGroup());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 ASSERT_EQ(0xe040, t.GetElement());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 // Test ==() and !=() operators
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 ASSERT_TRUE(DICOM_TAG_PATIENT_ID == DicomTag(0x0010, 0x0020));
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 ASSERT_FALSE(DICOM_TAG_PATIENT_ID != DicomTag(0x0010, 0x0020));
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 }
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	76 TEST(DicomModification, Basic)
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	77 {
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	78 DicomModification m;
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	79 m.SetupAnonymization(DicomVersion_2008);
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	80 //m.SetLevel(DicomRootLevel_Study);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	81 //m.ReplacePlainString(DICOM_TAG_PATIENT_ID, "coucou");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	82 //m.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "coucou");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	83
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	84 ParsedDicomFile o(true);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	85 o.SaveToFile("UnitTestsResults/anon.dcm");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	86
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	87 for (int i = 0; i < 10; i++)
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	88 {
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	89 char b[1024];
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	90 sprintf(b, "UnitTestsResults/anon%06d.dcm", i);
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	91 std::auto_ptr<ParsedDicomFile> f(o.Clone());
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	92 if (i > 4)
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	93 o.ReplacePlainString(DICOM_TAG_SERIES_INSTANCE_UID, "coucou");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	94 m.Apply(*f);
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	95 f->SaveToFile(b);
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	96 }
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	97 }
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	98
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	99
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	100 TEST(DicomModification, Anonymization)
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	101 {
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	102 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, FromDcmtkBridge::ParseTag("PatientName"));
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	103
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	104 const DicomTag privateTag(0x0045, 0x0010);
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	105 const DicomTag privateTag2(FromDcmtkBridge::ParseTag("0031-1020"));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	106 ASSERT_TRUE(privateTag.IsPrivate());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	107 ASSERT_TRUE(privateTag2.IsPrivate());
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	108 ASSERT_EQ(0x0031, privateTag2.GetGroup());
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	109 ASSERT_EQ(0x1020, privateTag2.GetElement());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	110
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	111 std::string s;
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	112 ParsedDicomFile o(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	113 o.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "coucou");
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	114 ASSERT_FALSE(o.GetTagValue(s, privateTag));
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	115 o.Insert(privateTag, "private tag", false);
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	116 ASSERT_TRUE(o.GetTagValue(s, privateTag));
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	117 ASSERT_STREQ("private tag", s.c_str());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	118
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	119 ASSERT_FALSE(o.GetTagValue(s, privateTag2));
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	120 ASSERT_THROW(o.Replace(privateTag2, std::string("hello"), false, DicomReplaceMode_ThrowIfAbsent), OrthancException);
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	121 ASSERT_FALSE(o.GetTagValue(s, privateTag2));
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	122 o.Replace(privateTag2, std::string("hello"), false, DicomReplaceMode_IgnoreIfAbsent);
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	123 ASSERT_FALSE(o.GetTagValue(s, privateTag2));
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	124 o.Replace(privateTag2, std::string("hello"), false, DicomReplaceMode_InsertIfAbsent);
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	125 ASSERT_TRUE(o.GetTagValue(s, privateTag2));
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	126 ASSERT_STREQ("hello", s.c_str());
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	127 o.ReplacePlainString(privateTag2, "hello world");
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	128 ASSERT_TRUE(o.GetTagValue(s, privateTag2));
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	129 ASSERT_STREQ("hello world", s.c_str());
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	130
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	131 ASSERT_TRUE(o.GetTagValue(s, DICOM_TAG_PATIENT_NAME));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	132 ASSERT_FALSE(Toolbox::IsUuid(s));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	133
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	134 DicomModification m;
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	135 m.SetupAnonymization(DicomVersion_2008);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	136 m.Keep(privateTag);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	137
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	138 m.Apply(o);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	139
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	140 ASSERT_TRUE(o.GetTagValue(s, DICOM_TAG_PATIENT_NAME));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	141 ASSERT_TRUE(Toolbox::IsUuid(s));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	142 ASSERT_TRUE(o.GetTagValue(s, privateTag));
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	143 ASSERT_STREQ("private tag", s.c_str());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	144
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	145 m.SetupAnonymization(DicomVersion_2008);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	146 m.Apply(o);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	147 ASSERT_FALSE(o.GetTagValue(s, privateTag));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	148 }
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	149
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	150
802 82b07ab959f4 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 800 diff changeset	151 #include <dcmtk/dcmdata/dcuid.h>
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	152
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	153 TEST(DicomModification, Png)
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	154 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	155 // Red dot in http://en.wikipedia.org/wiki/Data_URI_scheme (RGBA image)
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	156 std::string s = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==";
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	157
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	158 std::string m, cc;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	159 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(m, cc, s));
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	160
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	161 ASSERT_EQ("image/png", m);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	162
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	163 PngReader reader;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	164 reader.ReadFromMemory(cc);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	165
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1417 diff changeset	166 ASSERT_EQ(5u, reader.GetHeight());
9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1417 diff changeset	167 ASSERT_EQ(5u, reader.GetWidth());
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	168 ASSERT_EQ(PixelFormat_RGBA32, reader.GetFormat());
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	169
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	170 ParsedDicomFile o(true);
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	171 o.EmbedContent(s);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	172 o.SaveToFile("UnitTestsResults/png1.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	173
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	174 // Red dot, without alpha channel
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	175 s = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAIAAAACDbGyAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gUGDTcIn2+8BgAAACJJREFUCNdj/P//PwMjIwME/P/P+J8BBTAxEOL/R9Lx/z8AynoKAXOeiV8AAAAASUVORK5CYII=";
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	176 o.EmbedContent(s);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	177 o.SaveToFile("UnitTestsResults/png2.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	178
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	179 // Check box in Graylevel8
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	180 s = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gUGDDcB53FulQAAAElJREFUGNNtj0sSAEEEQ1+U+185s1CtmRkblQ9CZldsKHJDk6DLGLJa6chjh0ooQmpjXMM86zPwydGEj6Ed/UGykkEM8X+p3u8/8LcOJIWLGeMAAAAASUVORK5CYII=";
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	181 o.EmbedContent(s);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	182 //o.ReplacePlainString(DICOM_TAG_SOP_CLASS_UID, UID_DigitalXRayImageStorageForProcessing);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	183 o.SaveToFile("UnitTestsResults/png3.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	184
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	185
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	186 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	187 // Gradient in Graylevel16
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	188
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	189 ImageBuffer img;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	190 img.SetWidth(256);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	191 img.SetHeight(256);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	192 img.SetFormat(PixelFormat_Grayscale16);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	193
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	194 uint16_t v = 0;
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	195 for (unsigned int y = 0; y < img.GetHeight(); y++)
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	196 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	197 uint16_t p = reinterpret_cast<uint16_t>(img.GetAccessor().GetRow(y));
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	198 for (unsigned int x = 0; x < img.GetWidth(); x++, p++, v++)
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	199 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	200 *p = v;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	201 }
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	202 }
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	203
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	204 o.EmbedImage(img.GetAccessor());
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	205 o.SaveToFile("UnitTestsResults/png4.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	206 }
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	207 }
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	208
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	209
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	210 TEST(FromDcmtkBridge, Encodings1)
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	211 {
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	212 for (unsigned int i = 0; i < testEncodingsCount; i++)
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	213 {
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	214 std::string source(testEncodingsEncoded[i]);
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	215 std::string expected(testEncodingsExpected[i]);
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	216 std::string s = Toolbox::ConvertToUtf8(source, testEncodings[i]);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	217 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
1089 5ea0b56e850d logging in test jodogne parents: 1088 diff changeset	218 EXPECT_EQ(expected, s);
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	219 }
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	220 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	221
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	222
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	223 TEST(FromDcmtkBridge, Enumerations)
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	224 {
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	225 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.12.1.1.2
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	226 Encoding e;
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	227
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	228 ASSERT_FALSE(GetDicomEncoding(e, ""));
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	229 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 6")); ASSERT_EQ(Encoding_Ascii, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	230
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	231 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#table_C.12-2
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	232 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 100")); ASSERT_EQ(Encoding_Latin1, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	233 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 101")); ASSERT_EQ(Encoding_Latin2, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	234 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 109")); ASSERT_EQ(Encoding_Latin3, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	235 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 110")); ASSERT_EQ(Encoding_Latin4, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	236 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 144")); ASSERT_EQ(Encoding_Cyrillic, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	237 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 127")); ASSERT_EQ(Encoding_Arabic, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	238 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 126")); ASSERT_EQ(Encoding_Greek, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	239 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 138")); ASSERT_EQ(Encoding_Hebrew, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	240 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 148")); ASSERT_EQ(Encoding_Latin5, e);
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	241 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 13")); ASSERT_EQ(Encoding_Japanese, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	242 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 166")); ASSERT_EQ(Encoding_Thai, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	243
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	244 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#table_C.12-3
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	245 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 6")); ASSERT_EQ(Encoding_Ascii, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	246 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 100")); ASSERT_EQ(Encoding_Latin1, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	247 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 101")); ASSERT_EQ(Encoding_Latin2, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	248 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 109")); ASSERT_EQ(Encoding_Latin3, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	249 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 110")); ASSERT_EQ(Encoding_Latin4, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	250 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 144")); ASSERT_EQ(Encoding_Cyrillic, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	251 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 127")); ASSERT_EQ(Encoding_Arabic, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	252 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 126")); ASSERT_EQ(Encoding_Greek, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	253 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 138")); ASSERT_EQ(Encoding_Hebrew, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	254 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 148")); ASSERT_EQ(Encoding_Latin5, e);
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	255 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 13")); ASSERT_EQ(Encoding_Japanese, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	256 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 166")); ASSERT_EQ(Encoding_Thai, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	257
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	258 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#table_C.12-4
5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	259 ASSERT_FALSE(GetDicomEncoding(e, "ISO 2022 IR 87")); //ASSERT_EQ(Encoding_JapaneseKanji, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	260 ASSERT_FALSE(GetDicomEncoding(e, "ISO 2022 IR 159")); //ASSERT_EQ(Encoding_JapaneseKanjiSupplementary, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	261 ASSERT_FALSE(GetDicomEncoding(e, "ISO 2022 IR 149")); //ASSERT_EQ(Encoding_Korean, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	262
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	263 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#table_C.12-5
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	264 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 192")); ASSERT_EQ(Encoding_Utf8, e);
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	265 ASSERT_TRUE(GetDicomEncoding(e, "GB18030")); ASSERT_EQ(Encoding_Chinese, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	266 }
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	267
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	268
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	269 TEST(FromDcmtkBridge, Encodings3)
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	270 {
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	271 for (unsigned int i = 0; i < testEncodingsCount; i++)
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	272 {
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	273 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	274 std::string dicom;
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	275
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	276 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	277 ParsedDicomFile f(true);
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	278 f.SetEncoding(testEncodings[i]);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	279
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	280 std::string s = Toolbox::ConvertToUtf8(testEncodingsEncoded[i], testEncodings[i]);
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	281 f.Insert(DICOM_TAG_PATIENT_NAME, s, false);
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	282 f.SaveToMemoryBuffer(dicom);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	283 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	284
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	285 if (testEncodings[i] != Encoding_Windows1251)
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	286 {
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	287 ParsedDicomFile g(dicom);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	288
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	289 if (testEncodings[i] != Encoding_Ascii)
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	290 {
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	291 ASSERT_EQ(testEncodings[i], g.GetEncoding());
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	292 }
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	293
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	294 std::string tag;
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	295 ASSERT_TRUE(g.GetTagValue(tag, DICOM_TAG_PATIENT_NAME));
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	296 ASSERT_EQ(std::string(testEncodingsExpected[i]), tag);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	297 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	298 }
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	299 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	300
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	301
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	302 TEST(FromDcmtkBridge, ValueRepresentation)
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	303 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	304 ASSERT_EQ(ValueRepresentation_PersonName,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	305 FromDcmtkBridge::LookupValueRepresentation(DICOM_TAG_PATIENT_NAME));
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	306 ASSERT_EQ(ValueRepresentation_Date,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	307 FromDcmtkBridge::LookupValueRepresentation(DicomTag(0x0008, 0x0020) /* StudyDate */));
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	308 ASSERT_EQ(ValueRepresentation_Time,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	309 FromDcmtkBridge::LookupValueRepresentation(DicomTag(0x0008, 0x0030) /* StudyTime */));
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	310 ASSERT_EQ(ValueRepresentation_DateTime,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	311 FromDcmtkBridge::LookupValueRepresentation(DicomTag(0x0008, 0x002a) /* AcquisitionDateTime */));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	312 ASSERT_EQ(ValueRepresentation_NotSupported,
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	313 FromDcmtkBridge::LookupValueRepresentation(DicomTag(0x0001, 0x0001) /* some private tag */));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	314 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	315
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	316
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	317 TEST(FromDcmtkBridge, ValueRepresentationConversions)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	318 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	319 ASSERT_EQ(1, ValueRepresentation_ApplicationEntity);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	320 ASSERT_EQ(1, OrthancPluginValueRepresentation_AE);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	321
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	322 for (int i = ValueRepresentation_ApplicationEntity;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	323 i <= ValueRepresentation_NotSupported; i++)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	324 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	325 ValueRepresentation vr = static_cast<ValueRepresentation>(i);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	326
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	327 if (vr == ValueRepresentation_NotSupported)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	328 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	329 ASSERT_THROW(ToDcmtkBridge::Convert(vr), OrthancException);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	330 ASSERT_THROW(Plugins::Convert(vr), OrthancException);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	331 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	332 else if (vr == ValueRepresentation_OtherDouble \|\|
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	333 vr == ValueRepresentation_OtherLong \|\|
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	334 vr == ValueRepresentation_UniversalResource \|\|
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	335 vr == ValueRepresentation_UnlimitedCharacters)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	336 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	337 // These VR are not supported as of DCMTK 3.6.0
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	338 ASSERT_THROW(ToDcmtkBridge::Convert(vr), OrthancException);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	339 ASSERT_EQ(OrthancPluginValueRepresentation_UN, Plugins::Convert(vr));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	340 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	341 else
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	342 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	343 ASSERT_EQ(vr, FromDcmtkBridge::Convert(ToDcmtkBridge::Convert(vr)));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	344
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	345 OrthancPluginValueRepresentation plugins = Plugins::Convert(vr);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	346 ASSERT_EQ(vr, Plugins::Convert(plugins));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	347 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	348 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	349
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	350 for (int i = OrthancPluginValueRepresentation_AE;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	351 i <= OrthancPluginValueRepresentation_UT; i++)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	352 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	353 OrthancPluginValueRepresentation plugins = static_cast<OrthancPluginValueRepresentation>(i);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	354 ValueRepresentation orthanc = Plugins::Convert(plugins);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	355 ASSERT_EQ(plugins, Plugins::Convert(orthanc));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	356 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	357 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	358
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	359
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	360
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	361 static const DicomTag REFERENCED_STUDY_SEQUENCE(0x0008, 0x1110);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	362 static const DicomTag REFERENCED_PATIENT_SEQUENCE(0x0008, 0x1120);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	363
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	364 static void CreateSampleJson(Json::Value& a)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	365 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	366 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	367 Json::Value b = Json::objectValue;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	368 b["PatientName"] = "Hello";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	369 b["PatientID"] = "World";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	370 b["StudyDescription"] = "Toto";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	371 a.append(b);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	372 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	373
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	374 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	375 Json::Value b = Json::objectValue;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	376 b["PatientName"] = "data:application/octet-stream;base64,SGVsbG8y"; // echo -n "Hello2" \| base64
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	377 b["PatientID"] = "World2";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	378 a.append(b);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	379 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	380 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	381
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	382
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	383 namespace Orthanc
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	384 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	385 // Namespace for the "FRIEND_TEST()" directive in "FromDcmtkBridge" to apply:
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	386 // https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md#private-class-members
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	387 TEST(FromDcmtkBridge, FromJson)
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	388 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	389 std::auto_ptr<DcmElement> element;
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	390
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	391 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	392 Json::Value a;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	393 a = "Hello";
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	394 element.reset(FromDcmtkBridge::FromJson(DICOM_TAG_PATIENT_NAME, a, false, Encoding_Utf8));
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	395
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	396 Json::Value b;
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	397 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0, Encoding_Ascii);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	398 ASSERT_EQ("Hello", b["0010,0010"].asString());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	399 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	400
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	401 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	402 Json::Value a;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	403 a = "Hello";
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	404 // Cannot assign a string to a sequence
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	405 ASSERT_THROW(element.reset(FromDcmtkBridge::FromJson(REFERENCED_STUDY_SEQUENCE, a, false, Encoding_Utf8)), OrthancException);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	406 }
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	407
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	408 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	409 Json::Value a = Json::arrayValue;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	410 a.append("Hello");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	411 // Cannot assign an array to a string
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	412 ASSERT_THROW(element.reset(FromDcmtkBridge::FromJson(DICOM_TAG_PATIENT_NAME, a, false, Encoding_Utf8)), OrthancException);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	413 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	414
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	415 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	416 Json::Value a;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	417 a = "data:application/octet-stream;base64,SGVsbG8="; // echo -n "Hello" \| base64
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	418 element.reset(FromDcmtkBridge::FromJson(DICOM_TAG_PATIENT_NAME, a, true, Encoding_Utf8));
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	419
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	420 Json::Value b;
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	421 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0, Encoding_Ascii);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	422 ASSERT_EQ("Hello", b["0010,0010"].asString());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	423 }
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	424
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	425 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	426 Json::Value a = Json::arrayValue;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	427 CreateSampleJson(a);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	428 element.reset(FromDcmtkBridge::FromJson(REFERENCED_STUDY_SEQUENCE, a, true, Encoding_Utf8));
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	429
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	430 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	431 Json::Value b;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	432 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0, Encoding_Ascii);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	433 ASSERT_EQ(Json::arrayValue, b["0008,1110"].type());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	434 ASSERT_EQ(2u, b["0008,1110"].size());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	435
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	436 Json::Value::ArrayIndex i = (b["0008,1110"][0]["0010,0010"].asString() == "Hello") ? 0 : 1;
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	437
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	438 ASSERT_EQ(3u, b["0008,1110"][i].size());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	439 ASSERT_EQ(2u, b["0008,1110"][1 - i].size());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	440 ASSERT_EQ(b["0008,1110"][i]["0010,0010"].asString(), "Hello");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	441 ASSERT_EQ(b["0008,1110"][i]["0010,0020"].asString(), "World");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	442 ASSERT_EQ(b["0008,1110"][i]["0008,1030"].asString(), "Toto");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	443 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0010"].asString(), "Hello2");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	444 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0020"].asString(), "World2");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	445 }
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	446
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	447 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	448 Json::Value b;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	449 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0, Encoding_Ascii);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	450
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	451 Json::Value c;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	452 ServerToolbox::SimplifyTags(c, b, DicomToJsonFormat_Human);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	453
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	454 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	455 ASSERT_EQ(0, c["ReferencedStudySequence"].compare(a));
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	456 }
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	457 }
4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	458 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	459 }
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	460
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	461
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	462 TEST(ParsedDicomFile, InsertReplaceStrings)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	463 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	464 ParsedDicomFile f(true);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	465
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	466 f.Insert(DICOM_TAG_PATIENT_NAME, "World", false);
8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	467 ASSERT_THROW(f.Insert(DICOM_TAG_PATIENT_ID, "Hello", false), OrthancException); // Already existing tag
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	468 f.ReplacePlainString(DICOM_TAG_SOP_INSTANCE_UID, "Toto"); // (*)
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	469 f.ReplacePlainString(DICOM_TAG_SOP_CLASS_UID, "Tata"); // (**)
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	470
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	471 std::string s;
2209 e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2207 diff changeset	472 ASSERT_FALSE(f.LookupTransferSyntax(s));
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	473
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	474 ASSERT_THROW(f.Replace(DICOM_TAG_ACCESSION_NUMBER, std::string("Accession"),
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	475 false, DicomReplaceMode_ThrowIfAbsent), OrthancException);
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	476 f.Replace(DICOM_TAG_ACCESSION_NUMBER, std::string("Accession"), false, DicomReplaceMode_IgnoreIfAbsent);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	477 ASSERT_FALSE(f.GetTagValue(s, DICOM_TAG_ACCESSION_NUMBER));
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	478 f.Replace(DICOM_TAG_ACCESSION_NUMBER, std::string("Accession"), false, DicomReplaceMode_InsertIfAbsent);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	479 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_ACCESSION_NUMBER));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	480 ASSERT_EQ(s, "Accession");
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	481 f.Replace(DICOM_TAG_ACCESSION_NUMBER, std::string("Accession2"), false, DicomReplaceMode_IgnoreIfAbsent);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	482 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_ACCESSION_NUMBER));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	483 ASSERT_EQ(s, "Accession2");
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	484 f.Replace(DICOM_TAG_ACCESSION_NUMBER, std::string("Accession3"), false, DicomReplaceMode_ThrowIfAbsent);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	485 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_ACCESSION_NUMBER));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	486 ASSERT_EQ(s, "Accession3");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	487
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	488 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_PATIENT_NAME));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	489 ASSERT_EQ(s, "World");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	490 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_SOP_INSTANCE_UID));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	491 ASSERT_EQ(s, "Toto");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	492 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_MEDIA_STORAGE_SOP_INSTANCE_UID)); // Implicitly modified by (*)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	493 ASSERT_EQ(s, "Toto");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	494 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_SOP_CLASS_UID));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	495 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	496 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_MEDIA_STORAGE_SOP_CLASS_UID)); // Implicitly modified by (**)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	497 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	498 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	499
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	500
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	501
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	502
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	503 TEST(ParsedDicomFile, InsertReplaceJson)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	504 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	505 ParsedDicomFile f(true);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	506
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	507 Json::Value a;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	508 CreateSampleJson(a);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	509
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	510 ASSERT_FALSE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	511 f.Remove(REFERENCED_STUDY_SEQUENCE); // No effect
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	512 f.Insert(REFERENCED_STUDY_SEQUENCE, a, true);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	513 ASSERT_TRUE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	514 ASSERT_THROW(f.Insert(REFERENCED_STUDY_SEQUENCE, a, true), OrthancException);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	515 f.Remove(REFERENCED_STUDY_SEQUENCE);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	516 ASSERT_FALSE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	517 f.Insert(REFERENCED_STUDY_SEQUENCE, a, true);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	518 ASSERT_TRUE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	519
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	520 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	521 ASSERT_THROW(f.Replace(REFERENCED_PATIENT_SEQUENCE, a, false, DicomReplaceMode_ThrowIfAbsent), OrthancException);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	522 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	523 f.Replace(REFERENCED_PATIENT_SEQUENCE, a, false, DicomReplaceMode_IgnoreIfAbsent);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	524 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	525 f.Replace(REFERENCED_PATIENT_SEQUENCE, a, false, DicomReplaceMode_InsertIfAbsent);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	526 ASSERT_TRUE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	527
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	528 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	529 Json::Value b;
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	530 f.DatasetToJson(b, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	531
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	532 Json::Value c;
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2117 diff changeset	533 ServerToolbox::SimplifyTags(c, b, DicomToJsonFormat_Human);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	534
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	535 ASSERT_EQ(0, c["ReferencedPatientSequence"].compare(a));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	536 ASSERT_NE(0, c["ReferencedStudySequence"].compare(a)); // Because Data URI Scheme decoding was enabled
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	537 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	538
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	539 a = "data:application/octet-stream;base64,VGF0YQ=="; // echo -n "Tata" \| base64
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	540 f.Replace(DICOM_TAG_SOP_INSTANCE_UID, a, false, DicomReplaceMode_InsertIfAbsent); // (*)
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	541 f.Replace(DICOM_TAG_SOP_CLASS_UID, a, true, DicomReplaceMode_InsertIfAbsent); // (**)
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	542
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	543 std::string s;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	544 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_SOP_INSTANCE_UID));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	545 ASSERT_EQ(s, a.asString());
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	546 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_MEDIA_STORAGE_SOP_INSTANCE_UID)); // Implicitly modified by (*)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	547 ASSERT_EQ(s, a.asString());
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	548 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_SOP_CLASS_UID));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	549 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	550 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_MEDIA_STORAGE_SOP_CLASS_UID)); // Implicitly modified by (**)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	551 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	552 }
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	553
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	554
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	555 TEST(ParsedDicomFile, JsonEncoding)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	556 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	557 ParsedDicomFile f(true);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	558
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	559 for (unsigned int i = 0; i < testEncodingsCount; i++)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	560 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	561 if (testEncodings[i] != Encoding_Windows1251)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	562 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	563 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	564 f.SetEncoding(testEncodings[i]);
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	565
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	566 if (testEncodings[i] != Encoding_Ascii)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	567 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	568 ASSERT_EQ(testEncodings[i], f.GetEncoding());
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	569 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	570
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	571 Json::Value s = Toolbox::ConvertToUtf8(testEncodingsEncoded[i], testEncodings[i]);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	572 f.Replace(DICOM_TAG_PATIENT_NAME, s, false, DicomReplaceMode_InsertIfAbsent);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	573
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	574 Json::Value v;
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	575 f.DatasetToJson(v, DicomToJsonFormat_Human, DicomToJsonFlags_Default, 0);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	576 ASSERT_EQ(v["PatientName"].asString(), std::string(testEncodingsExpected[i]));
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	577 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	578 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	579 }
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	580
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	581
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	582 TEST(ParsedDicomFile, ToJsonFlags1)
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	583 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	584 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7053, 0x1000), ValueRepresentation_PersonName, "MyPrivateTag", 1, 1, "");
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	585 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7050, 0x1000), ValueRepresentation_PersonName, "Declared public tag", 1, 1, "");
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	586
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	587 ParsedDicomFile f(true);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	588 f.Insert(DicomTag(0x7050, 0x1000), "Some public tag", false); // Even group => public tag
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	589 f.Insert(DicomTag(0x7052, 0x1000), "Some unknown tag", false); // Even group => public, unknown tag
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	590 f.Insert(DicomTag(0x7053, 0x1000), "Some private tag", false); // Odd group => private tag
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	591
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	592 Json::Value v;
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	593 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_None, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	594 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	595 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	596 ASSERT_FALSE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	597 ASSERT_FALSE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	598 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	599 ASSERT_EQ(Json::stringValue, v["7050,1000"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	600 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	601
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	602 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePrivateTags \| DicomToJsonFlags_ConvertBinaryToNull), 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	603 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	604 ASSERT_EQ(7u, v.getMemberNames().size());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	605 ASSERT_FALSE(v.isMember("7052,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	606 ASSERT_TRUE(v.isMember("7050,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	607 ASSERT_TRUE(v.isMember("7053,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	608 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	609 ASSERT_EQ(Json::nullValue, v["7053,1000"].type());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	610
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	611 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePrivateTags, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	612 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	613 ASSERT_EQ(7u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	614 ASSERT_FALSE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	615 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	616 ASSERT_TRUE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	617 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	618 std::string mime, content;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	619 ASSERT_EQ(Json::stringValue, v["7053,1000"].type());
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	620 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7053,1000"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	621 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	622 ASSERT_EQ("Some private tag", content);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	623
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	624 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludeUnknownTags \| DicomToJsonFlags_ConvertBinaryToNull), 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	625 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	626 ASSERT_EQ(7u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	627 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	628 ASSERT_TRUE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	629 ASSERT_FALSE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	630 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	631 ASSERT_EQ(Json::nullValue, v["7052,1000"].type());
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	632
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	633 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludeUnknownTags), 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	634 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	635 ASSERT_EQ(7u, v.getMemberNames().size());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	636 ASSERT_TRUE(v.isMember("7050,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	637 ASSERT_TRUE(v.isMember("7052,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	638 ASSERT_FALSE(v.isMember("7053,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	639 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	640 ASSERT_EQ(Json::stringValue, v["7052,1000"].type());
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	641 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7052,1000"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	642 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	643 ASSERT_EQ("Some unknown tag", content);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	644
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	645 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludeUnknownTags \| DicomToJsonFlags_IncludePrivateTags \| DicomToJsonFlags_ConvertBinaryToNull), 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	646 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	647 ASSERT_EQ(8u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	648 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	649 ASSERT_TRUE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	650 ASSERT_TRUE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	651 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	652 ASSERT_EQ(Json::nullValue, v["7052,1000"].type());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	653 ASSERT_EQ(Json::nullValue, v["7053,1000"].type());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	654 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	655
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	656
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	657 TEST(ParsedDicomFile, ToJsonFlags2)
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	658 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	659 ParsedDicomFile f(true);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	660 f.Insert(DICOM_TAG_PIXEL_DATA, "Pixels", false);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	661
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	662 Json::Value v;
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	663 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_None, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	664 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	665 ASSERT_EQ(5u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	666 ASSERT_FALSE(v.isMember("7fe0,0010"));
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	667
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	668 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePixelData \| DicomToJsonFlags_ConvertBinaryToNull), 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	669 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	670 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	671 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	672 ASSERT_EQ(Json::nullValue, v["7fe0,0010"].type());
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	673
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	674 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePixelData \| DicomToJsonFlags_ConvertBinaryToAscii), 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	675 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	676 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	677 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	678 ASSERT_EQ(Json::stringValue, v["7fe0,0010"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	679 ASSERT_EQ("Pixels", v["7fe0,0010"].asString());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	680
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	681 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePixelData, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	682 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	683 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	684 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	685 ASSERT_EQ(Json::stringValue, v["7fe0,0010"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	686 std::string mime, content;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	687 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7fe0,0010"].asString()));
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	688 ASSERT_EQ("application/octet-stream", mime);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	689 ASSERT_EQ("Pixels", content);
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	690 }
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	691
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	692
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	693 TEST(DicomFindAnswers, Basic)
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	694 {
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	695 DicomFindAnswers a(false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	696
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	697 {
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	698 DicomMap m;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	699 m.SetValue(DICOM_TAG_PATIENT_ID, "hello", false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	700 a.Add(m);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	701 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	702
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	703 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	704 ParsedDicomFile d(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	705 d.ReplacePlainString(DICOM_TAG_PATIENT_ID, "my");
1789 bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	706 a.Add(d);
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	707 }
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	708
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	709 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	710 DicomMap m;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	711 m.SetValue(DICOM_TAG_PATIENT_ID, "world", false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	712 a.Add(m);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	713 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	714
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	715 Json::Value j;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	716 a.ToJson(j, true);
1789 bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	717 ASSERT_EQ(3u, j.size());
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	718
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	719 //std::cout << j;
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	720 }
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	721
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	722
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	723 TEST(ParsedDicomFile, FromJson)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	724 {
2117 87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	725 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7057, 0x1000), ValueRepresentation_OtherByte, "MyPrivateTag2", 1, 1, "ORTHANC");
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	726 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7059, 0x1000), ValueRepresentation_OtherByte, "MyPrivateTag3", 1, 1, "");
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	727 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7050, 0x1000), ValueRepresentation_PersonName, "Declared public tag2", 1, 1, "");
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	728
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	729 Json::Value v;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	730 const std::string sopClassUid = "1.2.840.10008.5.1.4.1.1.1"; // CR Image Storage:
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	731
2117 87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	732 // Test the private creator
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	733 ASSERT_EQ(DcmTag_ERROR_TagName, FromDcmtkBridge::GetTagName(DicomTag(0x7057, 0x1000), "NOPE"));
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	734 ASSERT_EQ("MyPrivateTag2", FromDcmtkBridge::GetTagName(DicomTag(0x7057, 0x1000), "ORTHANC"));
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	735
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	736 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	737 v["SOPClassUID"] = sopClassUid;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	738 v["SpecificCharacterSet"] = "ISO_IR 148"; // This is latin-5
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	739 v["PatientName"] = "Sébastien";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	740 v["7050-1000"] = "Some public tag"; // Even group => public tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	741 v["7052-1000"] = "Some unknown tag"; // Even group => public, unknown tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	742 v["7057-1000"] = "Some private tag"; // Odd group => private tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	743 v["7059-1000"] = "Some private tag2"; // Odd group => private tag, with an odd length to test padding
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	744
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	745 std::string s;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	746 Toolbox::EncodeDataUriScheme(s, "application/octet-stream", "Sebastien");
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	747 v["StudyDescription"] = s;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	748
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	749 v["PixelData"] = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // A red dot of 5x5 pixels
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	750 v["0040,0100"] = Json::arrayValue; // ScheduledProcedureStepSequence
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	751
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	752 Json::Value vv;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	753 vv["Modality"] = "MR";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	754 v["0040,0100"].append(vv);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	755
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	756 vv["Modality"] = "CT";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	757 v["0040,0100"].append(vv);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	758 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	759
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	760 const DicomToJsonFlags toJsonFlags = static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludeBinary \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	761 DicomToJsonFlags_IncludePixelData \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	762 DicomToJsonFlags_IncludePrivateTags \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	763 DicomToJsonFlags_IncludeUnknownTags \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	764 DicomToJsonFlags_ConvertBinaryToAscii);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	765
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	766
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	767 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	768 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	769 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	770
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	771 Json::Value vv;
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	772 dicom->DatasetToJson(vv, DicomToJsonFormat_Human, toJsonFlags, 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	773
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	774 ASSERT_EQ(vv["SOPClassUID"].asString(), sopClassUid);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	775 ASSERT_EQ(vv["MediaStorageSOPClassUID"].asString(), sopClassUid);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	776 ASSERT_TRUE(vv.isMember("SOPInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	777 ASSERT_TRUE(vv.isMember("SeriesInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	778 ASSERT_TRUE(vv.isMember("StudyInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	779 ASSERT_TRUE(vv.isMember("PatientID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	780 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	781
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	782
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	783 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	784 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	785 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	786
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	787 Json::Value vv;
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	788 dicom->DatasetToJson(vv, DicomToJsonFormat_Human, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePixelData), 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	789
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	790 std::string mime, content;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	791 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, vv["PixelData"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	792 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	793 ASSERT_EQ(5u * 5u * 3u /* the red dot is 5x5 pixels in RGB24 / + 1 / for padding */, content.size());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	794 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	795
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	796
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	797 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	798 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	799 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_DecodeDataUriScheme)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	800
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	801 Json::Value vv;
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	802 dicom->DatasetToJson(vv, DicomToJsonFormat_Short, toJsonFlags, 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	803
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	804 ASSERT_FALSE(vv.isMember("SOPInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	805 ASSERT_FALSE(vv.isMember("SeriesInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	806 ASSERT_FALSE(vv.isMember("StudyInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	807 ASSERT_FALSE(vv.isMember("PatientID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	808 ASSERT_EQ(2u, vv["0040,0100"].size());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	809 ASSERT_EQ("MR", vv["0040,0100"][0]["0008,0060"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	810 ASSERT_EQ("CT", vv["0040,0100"][1]["0008,0060"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	811 ASSERT_EQ("Some public tag", vv["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	812 ASSERT_EQ("Some unknown tag", vv["7052,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	813 ASSERT_EQ("Some private tag", vv["7057,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	814 ASSERT_EQ("Some private tag2", vv["7059,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	815 ASSERT_EQ("Sébastien", vv["0010,0010"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	816 ASSERT_EQ("Sebastien", vv["0008,1030"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	817 ASSERT_EQ("ISO_IR 148", vv["0008,0005"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	818 ASSERT_EQ("5", vv[DICOM_TAG_ROWS.Format()].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	819 ASSERT_EQ("5", vv[DICOM_TAG_COLUMNS.Format()].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	820 ASSERT_TRUE(vv[DICOM_TAG_PIXEL_DATA.Format()].asString().empty());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	821 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	822 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	823
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	824
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	825
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	826 TEST(TestImages, PatternGrayscale8)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	827 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	828 static const char* PATH = "UnitTestsResults/PatternGrayscale8.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	829
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	830 Orthanc::Image image(Orthanc::PixelFormat_Grayscale8, 256, 256, false);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	831
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	832 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	833 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	834 uint8_t p = reinterpret_cast<uint8_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	835 for (int x = 0; x < 256; x++, p++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	836 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	837 *p = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	838 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	839 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	840
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	841 Orthanc::ImageAccessor r = image.GetRegion(32, 32, 64, 192);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	842 Orthanc::ImageProcessing::Set(r, 0);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	843 r = image.GetRegion(160, 32, 64, 192);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	844 Orthanc::ImageProcessing::Set(r, 255);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	845
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	846 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	847 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	848 f.ReplacePlainString(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.7");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	849 f.ReplacePlainString(DICOM_TAG_STUDY_INSTANCE_UID, "1.2.276.0.7230010.3.1.2.2831176407.321.1458901422.884998");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	850 f.ReplacePlainString(DICOM_TAG_PATIENT_ID, "ORTHANC");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	851 f.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "Orthanc");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	852 f.ReplacePlainString(DICOM_TAG_STUDY_DESCRIPTION, "Patterns");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	853 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "Grayscale8");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	854 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	855
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	856 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	857 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	858
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	859 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	860 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	861 Orthanc::SystemToolbox::ReadFile(s, PATH);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	862 Orthanc::ParsedDicomFile f(s);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	863
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	864 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0));
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	865 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	866 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	867 ASSERT_EQ(Orthanc::PixelFormat_Grayscale8, decoded->GetFormat());
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	868
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	869 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	870 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	871 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	872 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	873 ASSERT_EQ(0, memcmp(a, b, 256));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	874 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	875 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	876 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	877
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	878
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	879 TEST(TestImages, PatternRGB)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	880 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	881 static const char* PATH = "UnitTestsResults/PatternRGB24.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	882
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	883 Orthanc::Image image(Orthanc::PixelFormat_RGB24, 384, 256, false);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	884
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	885 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	886 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	887 uint8_t p = reinterpret_cast<uint8_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	888 for (int x = 0; x < 128; x++, p += 3)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	889 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	890 p[0] = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	891 p[1] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	892 p[2] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	893 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	894 for (int x = 128; x < 128 * 2; x++, p += 3)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	895 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	896 p[0] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	897 p[1] = 255 - y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	898 p[2] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	899 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	900 for (int x = 128 * 2; x < 128 * 3; x++, p += 3)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	901 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	902 p[0] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	903 p[1] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	904 p[2] = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	905 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	906 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	907
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	908 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	909 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	910 f.ReplacePlainString(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.7");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	911 f.ReplacePlainString(DICOM_TAG_STUDY_INSTANCE_UID, "1.2.276.0.7230010.3.1.2.2831176407.321.1458901422.884998");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	912 f.ReplacePlainString(DICOM_TAG_PATIENT_ID, "ORTHANC");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	913 f.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "Orthanc");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	914 f.ReplacePlainString(DICOM_TAG_STUDY_DESCRIPTION, "Patterns");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	915 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "RGB24");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	916 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	917
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	918 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	919 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	920
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	921 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	922 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	923 Orthanc::SystemToolbox::ReadFile(s, PATH);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	924 Orthanc::ParsedDicomFile f(s);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	925
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	926 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0));
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	927 ASSERT_EQ(384u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	928 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	929 ASSERT_EQ(Orthanc::PixelFormat_RGB24, decoded->GetFormat());
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	930
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	931 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	932 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	933 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	934 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	935 ASSERT_EQ(0, memcmp(a, b, 3 * 384));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	936 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	937 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	938 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	939
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	940
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	941 TEST(TestImages, PatternUint16)
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	942 {
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	943 static const char* PATH = "UnitTestsResults/PatternGrayscale16.dcm";
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	944
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	945 Orthanc::Image image(Orthanc::PixelFormat_Grayscale16, 256, 256, false);
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	946
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	947 uint16_t v = 0;
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	948 for (int y = 0; y < 256; y++)
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	949 {
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	950 uint16_t p = reinterpret_cast<uint16_t>(image.GetRow(y));
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	951 for (int x = 0; x < 256; x++, v++, p++)
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	952 {
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	953 *p = htole16(v); // Orthanc uses Little-Endian transfer syntax to encode images
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	954 }
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	955 }
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	956
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	957 Orthanc::ImageAccessor r = image.GetRegion(32, 32, 64, 192);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	958 Orthanc::ImageProcessing::Set(r, 0);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	959 r = image.GetRegion(160, 32, 64, 192);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	960 Orthanc::ImageProcessing::Set(r, 65535);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	961
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	962 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	963 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	964 f.ReplacePlainString(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.7");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	965 f.ReplacePlainString(DICOM_TAG_STUDY_INSTANCE_UID, "1.2.276.0.7230010.3.1.2.2831176407.321.1458901422.884998");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	966 f.ReplacePlainString(DICOM_TAG_PATIENT_ID, "ORTHANC");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	967 f.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "Orthanc");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	968 f.ReplacePlainString(DICOM_TAG_STUDY_DESCRIPTION, "Patterns");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	969 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "Grayscale16");
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	970 f.EmbedImage(image);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	971
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	972 f.SaveToFile(PATH);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	973 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	974
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	975 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	976 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	977 Orthanc::SystemToolbox::ReadFile(s, PATH);
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	978 Orthanc::ParsedDicomFile f(s);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	979
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	980 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0));
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	981 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	982 ASSERT_EQ(256u, decoded->GetHeight());
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	983 ASSERT_EQ(Orthanc::PixelFormat_Grayscale16, decoded->GetFormat());
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	984
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	985 for (int y = 0; y < 256; y++)
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	986 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	987 const void* a = image.GetConstRow(y);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	988 const void* b = decoded->GetConstRow(y);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	989 ASSERT_EQ(0, memcmp(a, b, 512));
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	990 }
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	991 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	992 }
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	993
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	994
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	995 TEST(TestImages, PatternInt16)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	996 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	997 static const char* PATH = "UnitTestsResults/PatternSignedGrayscale16.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	998
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	999 Orthanc::Image image(Orthanc::PixelFormat_SignedGrayscale16, 256, 256, false);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1000
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1001 int16_t v = -32768;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1002 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1003 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1004 int16_t p = reinterpret_cast<int16_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1005 for (int x = 0; x < 256; x++, v++, p++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1006 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1007 *p = htole16(v); // Orthanc uses Little-Endian transfer syntax to encode images
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1008 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1009 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1010
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1011 Orthanc::ImageAccessor r = image.GetRegion(32, 32, 64, 192);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1012 Orthanc::ImageProcessing::Set(r, -32768);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1013 r = image.GetRegion(160, 32, 64, 192);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1014 Orthanc::ImageProcessing::Set(r, 32767);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1015
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1016 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1017 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1018 f.ReplacePlainString(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.7");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1019 f.ReplacePlainString(DICOM_TAG_STUDY_INSTANCE_UID, "1.2.276.0.7230010.3.1.2.2831176407.321.1458901422.884998");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1020 f.ReplacePlainString(DICOM_TAG_PATIENT_ID, "ORTHANC");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1021 f.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "Orthanc");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1022 f.ReplacePlainString(DICOM_TAG_STUDY_DESCRIPTION, "Patterns");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1023 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "SignedGrayscale16");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1024 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1025
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1026 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1027 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1028
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1029 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1030 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	1031 Orthanc::SystemToolbox::ReadFile(s, PATH);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1032 Orthanc::ParsedDicomFile f(s);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1033
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1034 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0));
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	1035 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	1036 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1037 ASSERT_EQ(Orthanc::PixelFormat_SignedGrayscale16, decoded->GetFormat());
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1038
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1039 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1040 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1041 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1042 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1043 ASSERT_EQ(0, memcmp(a, b, 512));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1044 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1045 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1046 }
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1047
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1048
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1049
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1050 static void CheckEncoding(const ParsedDicomFile& dicom,
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1051 Encoding expected)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1052 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1053 const char* value = NULL;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1054 ASSERT_TRUE(dicom.GetDcmtkObject().getDataset()->findAndGetString(DCM_SpecificCharacterSet, value).good());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1055
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1056 Encoding encoding;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1057 ASSERT_TRUE(GetDicomEncoding(encoding, value));
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1058 ASSERT_EQ(expected, encoding);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1059 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1060
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1061
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1062 TEST(ParsedDicomFile, DicomMapEncodings1)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1063 {
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1064 SetDefaultDicomEncoding(Encoding_Ascii);
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1065 ASSERT_EQ(Encoding_Ascii, GetDefaultDicomEncoding());
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1066
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1067 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1068 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1069 ParsedDicomFile dicom(m);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1070 ASSERT_EQ(1, dicom.GetDcmtkObject().getDataset()->card());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1071 CheckEncoding(dicom, Encoding_Ascii);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1072 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1073
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1074 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1075 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1076 ParsedDicomFile dicom(m, Encoding_Latin4);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1077 ASSERT_EQ(1, dicom.GetDcmtkObject().getDataset()->card());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1078 CheckEncoding(dicom, Encoding_Latin4);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1079 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1080
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1081 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1082 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1083 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 148", false);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1084 ParsedDicomFile dicom(m);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1085 ASSERT_EQ(1, dicom.GetDcmtkObject().getDataset()->card());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1086 CheckEncoding(dicom, Encoding_Latin5);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1087 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1088
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1089 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1090 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1091 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 148", false);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1092 ParsedDicomFile dicom(m, Encoding_Latin1);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1093 ASSERT_EQ(1, dicom.GetDcmtkObject().getDataset()->card());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1094 CheckEncoding(dicom, Encoding_Latin5);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1095 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1096 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1097
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1098
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1099 TEST(ParsedDicomFile, DicomMapEncodings2)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1100 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1101 const char* utf8 = NULL;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1102 for (unsigned int i = 0; i < testEncodingsCount; i++)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1103 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1104 if (testEncodings[i] == Encoding_Utf8)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1105 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1106 utf8 = testEncodingsEncoded[i];
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1107 break;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1108 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1109 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1110
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1111 ASSERT_TRUE(utf8 != NULL);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1112
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1113 for (unsigned int i = 0; i < testEncodingsCount; i++)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1114 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1115 // 1251 codepage is not supported by the core DICOM standard, ignore it
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1116 if (testEncodings[i] != Encoding_Windows1251)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1117 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1118 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1119 // Sanity check to test the proper behavior of "EncodingTests.py"
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1120 std::string encoded = Toolbox::ConvertFromUtf8(testEncodingsExpected[i], testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1121 ASSERT_STREQ(testEncodingsEncoded[i], encoded.c_str());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1122 std::string decoded = Toolbox::ConvertToUtf8(encoded, testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1123 ASSERT_STREQ(testEncodingsExpected[i], decoded.c_str());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1124
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1125 if (testEncodings[i] != Encoding_Chinese)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1126 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1127 // A specific source string is used in "EncodingTests.py" to
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1128 // test against Chinese, it is normal that it does not correspond to UTF8
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1129
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1130 std::string encoded = Toolbox::ConvertToUtf8(Toolbox::ConvertFromUtf8(utf8, testEncodings[i]), testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1131 ASSERT_STREQ(testEncodingsExpected[i], encoded.c_str());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1132 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1133 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1134
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1135
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1136 Json::Value v;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1137
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1138 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1139 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1140 m.SetValue(DICOM_TAG_PATIENT_NAME, testEncodingsExpected[i], false);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1141
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1142 ParsedDicomFile dicom(m, testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1143
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1144 const char* encoded = NULL;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1145 ASSERT_TRUE(dicom.GetDcmtkObject().getDataset()->findAndGetString(DCM_PatientName, encoded).good());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1146 ASSERT_STREQ(testEncodingsEncoded[i], encoded);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1147
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1148 dicom.DatasetToJson(v, DicomToJsonFormat_Human, DicomToJsonFlags_Default, 0);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1149
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1150 Encoding encoding;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1151 ASSERT_TRUE(GetDicomEncoding(encoding, v["SpecificCharacterSet"].asCString()));
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1152 ASSERT_EQ(encoding, testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1153 ASSERT_STREQ(testEncodingsExpected[i], v["PatientName"].asCString());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1154 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1155
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1156
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1157 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1158 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1159 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, GetDicomSpecificCharacterSet(testEncodings[i]), false);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1160 m.SetValue(DICOM_TAG_PATIENT_NAME, testEncodingsExpected[i], false);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1161
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1162 ParsedDicomFile dicom(m, testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1163
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1164 Json::Value v2;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1165 dicom.DatasetToJson(v2, DicomToJsonFormat_Human, DicomToJsonFlags_Default, 0);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1166
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1167 ASSERT_EQ(v2["PatientName"].asString(), v["PatientName"].asString());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1168 ASSERT_EQ(v2["SpecificCharacterSet"].asString(), v["SpecificCharacterSet"].asString());
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1169 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1170 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1171 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1172 }
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1173
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1174
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1175 TEST(ParsedDicomFile, ChangeEncoding)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1176 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1177 for (unsigned int i = 0; i < testEncodingsCount; i++)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1178 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1179 // 1251 codepage is not supported by the core DICOM standard, ignore it
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1180 if (testEncodings[i] != Encoding_Windows1251)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1181 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1182 DicomMap m;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1183 m.SetValue(DICOM_TAG_PATIENT_NAME, testEncodingsExpected[i], false);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1184
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1185 std::string tag;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1186
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1187 ParsedDicomFile dicom(m, Encoding_Utf8);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1188 ASSERT_EQ(Encoding_Utf8, dicom.GetEncoding());
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1189 ASSERT_TRUE(dicom.GetTagValue(tag, DICOM_TAG_PATIENT_NAME));
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1190 ASSERT_EQ(tag, testEncodingsExpected[i]);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1191
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1192 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1193 Json::Value v;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1194 dicom.DatasetToJson(v, DicomToJsonFormat_Human, DicomToJsonFlags_Default, 0);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1195 ASSERT_STREQ(v["SpecificCharacterSet"].asCString(), "ISO_IR 192");
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1196 ASSERT_STREQ(v["PatientName"].asCString(), testEncodingsExpected[i]);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1197 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1198
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1199 dicom.ChangeEncoding(testEncodings[i]);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1200
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1201 ASSERT_EQ(testEncodings[i], dicom.GetEncoding());
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1202
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1203 const char* c = NULL;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1204 ASSERT_TRUE(dicom.GetDcmtkObject().getDataset()->findAndGetString(DCM_PatientName, c).good());
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1205 EXPECT_STREQ(c, testEncodingsEncoded[i]);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1206
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1207 ASSERT_TRUE(dicom.GetTagValue(tag, DICOM_TAG_PATIENT_NAME)); // Decodes to UTF-8
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1208 EXPECT_EQ(tag, testEncodingsExpected[i]);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1209
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1210 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1211 Json::Value v;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1212 dicom.DatasetToJson(v, DicomToJsonFormat_Human, DicomToJsonFlags_Default, 0);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1213 ASSERT_STREQ(v["SpecificCharacterSet"].asCString(), GetDicomSpecificCharacterSet(testEncodings[i]));
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1214 ASSERT_STREQ(v["PatientName"].asCString(), testEncodingsExpected[i]);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1215 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1216 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1217 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1218 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1219
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1220
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1221 TEST(Toolbox, CaseWithAccents)
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1222 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1223 ASSERT_EQ(toUpperResult, Toolbox::ToUpperCaseWithAccents(toUpperSource));
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1224 }

Mercurial > hg > orthanc

annotate UnitTestsSources/FromDcmtkTests.cpp @ 2382:7284093111b0