orthanc: UnitTestsSources/FromDcmtkTests.cpp annotate

annotate UnitTestsSources/FromDcmtkTests.cpp @ 3217:cf8cbeb35f33

preliminary support of Korean character set

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 13 Feb 2019 17:46:12 +0100
parents	683d572424b6
children	4351f52f15d5

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
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3048 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., 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
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	37 #include "../Core/DicomNetworking/DicomFindAnswers.h"
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	38 #include "../Core/DicomParsing/DicomModification.h"
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	39 #include "../Core/DicomParsing/FromDcmtkBridge.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	40 #include "../Core/DicomParsing/Internals/DicomImageDecoder.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	41 #include "../Core/DicomParsing/ToDcmtkBridge.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	42 #include "../Core/Endianness.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	43 #include "../Core/Images/Image.h"
1612 96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	44 #include "../Core/Images/ImageBuffer.h"
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	45 #include "../Core/Images/ImageProcessing.h"
1612 96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	46 #include "../Core/Images/PngReader.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	47 #include "../Core/Images/PngWriter.h"
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	48 #include "../Core/OrthancException.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	49 #include "../Core/SystemToolbox.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	50 #include "../OrthancServer/ServerToolbox.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	51 #include "../Plugins/Engine/PluginsEnumerations.h"
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	52 #include "../Resources/EncodingTests.h"
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	54 #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	55 #include <dcmtk/dcmdata/dcdeftag.h>
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	56
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 using namespace Orthanc;
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 TEST(DicomFormat, Tag)
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	61 ASSERT_EQ("PatientName", FromDcmtkBridge::GetTagName(DicomTag(0x0010, 0x0010), ""));
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 DicomTag t = FromDcmtkBridge::ParseTag("SeriesDescription");
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 ASSERT_EQ(0x0008, t.GetGroup());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 ASSERT_EQ(0x103E, t.GetElement());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 t = FromDcmtkBridge::ParseTag("0020-e040");
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 ASSERT_EQ(0x0020, t.GetGroup());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 ASSERT_EQ(0xe040, t.GetElement());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 // Test ==() and !=() operators
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 ASSERT_TRUE(DICOM_TAG_PATIENT_ID == DicomTag(0x0010, 0x0020));
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 ASSERT_FALSE(DICOM_TAG_PATIENT_ID != DicomTag(0x0010, 0x0020));
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 }
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	77 TEST(DicomModification, Basic)
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	78 {
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	79 DicomModification m;
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	80 m.SetupAnonymization(DicomVersion_2008);
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	81 //m.SetLevel(DicomRootLevel_Study);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	82 //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	83 //m.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "coucou");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	84
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	85 ParsedDicomFile o(true);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	86 o.SaveToFile("UnitTestsResults/anon.dcm");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	87
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	88 for (int i = 0; i < 10; i++)
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	89 {
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	90 char b[1024];
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	91 sprintf(b, "UnitTestsResults/anon%06d.dcm", i);
2521 6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	92 std::auto_ptr<ParsedDicomFile> f(o.Clone(false));
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	93 if (i > 4)
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	94 o.ReplacePlainString(DICOM_TAG_SERIES_INSTANCE_UID, "coucou");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	95 m.Apply(*f);
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	96 f->SaveToFile(b);
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	97 }
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	98 }
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	99
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	100
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	101 TEST(DicomModification, Anonymization)
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	102 {
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	103 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	104
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	105 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	106 const DicomTag privateTag2(FromDcmtkBridge::ParseTag("0031-1020"));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	107 ASSERT_TRUE(privateTag.IsPrivate());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	108 ASSERT_TRUE(privateTag2.IsPrivate());
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	109 ASSERT_EQ(0x0031, privateTag2.GetGroup());
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	110 ASSERT_EQ(0x1020, privateTag2.GetElement());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	111
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	112 std::string s;
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	113 ParsedDicomFile o(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	114 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	115 ASSERT_FALSE(o.GetTagValue(s, privateTag));
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	116 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	117 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	118 ASSERT_STREQ("private tag", s.c_str());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	119
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	120 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	121 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	122 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	123 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	124 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	125 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	126 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	127 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	128 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	129 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	130 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	131
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	132 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	133 ASSERT_FALSE(Toolbox::IsUuid(s));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	134
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	135 DicomModification m;
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	136 m.SetupAnonymization(DicomVersion_2008);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	137 m.Keep(privateTag);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	138
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	139 m.Apply(o);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	140
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	141 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	142 ASSERT_TRUE(Toolbox::IsUuid(s));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	143 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	144 ASSERT_STREQ("private tag", s.c_str());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	145
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	146 m.SetupAnonymization(DicomVersion_2008);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	147 m.Apply(o);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	148 ASSERT_FALSE(o.GetTagValue(s, privateTag));
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
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	151
802 82b07ab959f4 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 800 diff changeset	152 #include <dcmtk/dcmdata/dcuid.h>
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	153
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	154 TEST(DicomModification, Png)
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	155 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	156 // 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	157 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	158
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	159 std::string m, cc;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	160 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	161
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	162 ASSERT_EQ("image/png", m);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	163
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	164 PngReader reader;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	165 reader.ReadFromMemory(cc);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	166
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1417 diff changeset	167 ASSERT_EQ(5u, reader.GetHeight());
9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1417 diff changeset	168 ASSERT_EQ(5u, reader.GetWidth());
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	169 ASSERT_EQ(PixelFormat_RGBA32, reader.GetFormat());
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	170
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	171 ParsedDicomFile o(true);
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	172 o.EmbedContent(s);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	173 o.SaveToFile("UnitTestsResults/png1.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	174
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	175 // Red dot, without alpha channel
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	176 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	177 o.EmbedContent(s);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	178 o.SaveToFile("UnitTestsResults/png2.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	179
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	180 // Check box in Graylevel8
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	181 s = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gUGDDcB53FulQAAAElJREFUGNNtj0sSAEEEQ1+U+185s1CtmRkblQ9CZldsKHJDk6DLGLJa6chjh0ooQmpjXMM86zPwydGEj6Ed/UGykkEM8X+p3u8/8LcOJIWLGeMAAAAASUVORK5CYII=";
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	182 o.EmbedContent(s);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	183 //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	184 o.SaveToFile("UnitTestsResults/png3.dcm");
800 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 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	188 // Gradient in Graylevel16
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	189
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	190 ImageBuffer img;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	191 img.SetWidth(256);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	192 img.SetHeight(256);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	193 img.SetFormat(PixelFormat_Grayscale16);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	194
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	195 ImageAccessor accessor;
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	196 img.GetWriteableAccessor(accessor);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	197
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	198 uint16_t v = 0;
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	199 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	200 {
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	201 uint16_t p = reinterpret_cast<uint16_t>(accessor.GetRow(y));
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	202 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	203 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	204 *p = v;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	205 }
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
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	208 o.EmbedImage(accessor);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	209 o.SaveToFile("UnitTestsResults/png4.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	210 }
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	211 }
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	212
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	213
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	214 TEST(FromDcmtkBridge, Encodings1)
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	215 {
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	216 for (unsigned int i = 0; i < testEncodingsCount; i++)
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	217 {
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	218 std::string source(testEncodingsEncoded[i]);
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	219 std::string expected(testEncodingsExpected[i]);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	220 std::string s = Toolbox::ConvertToUtf8(source, testEncodings[i], false);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	221 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
1089 5ea0b56e850d logging in test jodogne parents: 1088 diff changeset	222 EXPECT_EQ(expected, s);
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	223 }
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	224 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	225
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	226
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	227 TEST(FromDcmtkBridge, Enumerations)
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	228 {
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	229 // 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	230 Encoding e;
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	231
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	232 ASSERT_FALSE(GetDicomEncoding(e, ""));
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	233 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	234
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	235 // 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	236 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	237 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	238 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	239 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	240 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	241 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	242 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	243 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	244 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	245 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	246 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	247
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	248 // 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	249 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	250 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	251 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	252 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	253 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	254 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	255 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	256 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	257 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	258 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	259 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	260 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	261
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	262 // 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	263 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	264 ASSERT_FALSE(GetDicomEncoding(e, "ISO 2022 IR 159")); //ASSERT_EQ(Encoding_JapaneseKanjiSupplementary, e);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	265 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 149")); ASSERT_EQ(Encoding_Korean, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	266
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	267 // 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	268 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	269 ASSERT_TRUE(GetDicomEncoding(e, "GB18030")); ASSERT_EQ(Encoding_Chinese, e);
2401 a051aba0037c Use "GBK" (frequently used in China) as an alias for "GB18030" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	270 ASSERT_TRUE(GetDicomEncoding(e, "GBK")); ASSERT_EQ(Encoding_Chinese, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	271 }
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	272
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	273
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	274 TEST(FromDcmtkBridge, Encodings3)
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	275 {
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	276 for (unsigned int i = 0; i < testEncodingsCount; i++)
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	277 {
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	278 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	279 std::string dicom;
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	280
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	281 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	282 ParsedDicomFile f(true);
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	283 f.SetEncoding(testEncodings[i]);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	284
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	285 std::string s = Toolbox::ConvertToUtf8(testEncodingsEncoded[i], testEncodings[i], false);
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	286 f.Insert(DICOM_TAG_PATIENT_NAME, s, false);
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	287 f.SaveToMemoryBuffer(dicom);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	288 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	289
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	290 if (testEncodings[i] != Encoding_Windows1251)
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	291 {
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	292 ParsedDicomFile g(dicom);
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 if (testEncodings[i] != Encoding_Ascii)
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	295 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	296 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	297 ASSERT_EQ(testEncodings[i], g.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	298 ASSERT_FALSE(hasCodeExtensions);
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	299 }
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	300
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	301 std::string tag;
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	302 ASSERT_TRUE(g.GetTagValue(tag, DICOM_TAG_PATIENT_NAME));
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	303 ASSERT_EQ(std::string(testEncodingsExpected[i]), tag);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	304 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	305 }
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	306 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	307
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	308
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	309 TEST(FromDcmtkBridge, ValueRepresentation)
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	310 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	311 ASSERT_EQ(ValueRepresentation_PersonName,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	312 FromDcmtkBridge::LookupValueRepresentation(DICOM_TAG_PATIENT_NAME));
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	313 ASSERT_EQ(ValueRepresentation_Date,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	314 FromDcmtkBridge::LookupValueRepresentation(DicomTag(0x0008, 0x0020) /* StudyDate */));
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	315 ASSERT_EQ(ValueRepresentation_Time,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	316 FromDcmtkBridge::LookupValueRepresentation(DicomTag(0x0008, 0x0030) /* StudyTime */));
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	317 ASSERT_EQ(ValueRepresentation_DateTime,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	318 FromDcmtkBridge::LookupValueRepresentation(DicomTag(0x0008, 0x002a) /* AcquisitionDateTime */));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	319 ASSERT_EQ(ValueRepresentation_NotSupported,
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	320 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	321 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	322
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	323
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	324 TEST(FromDcmtkBridge, ValueRepresentationConversions)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	325 {
3048 8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2861 diff changeset	326 #if ORTHANC_ENABLE_PLUGINS == 1
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	327 ASSERT_EQ(1, ValueRepresentation_ApplicationEntity);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	328 ASSERT_EQ(1, OrthancPluginValueRepresentation_AE);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	329
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	330 for (int i = ValueRepresentation_ApplicationEntity;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	331 i <= ValueRepresentation_NotSupported; i++)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	332 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	333 ValueRepresentation vr = static_cast<ValueRepresentation>(i);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	334
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	335 if (vr == ValueRepresentation_NotSupported)
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 ASSERT_THROW(ToDcmtkBridge::Convert(vr), OrthancException);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	338 ASSERT_THROW(Plugins::Convert(vr), OrthancException);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	339 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	340 else if (vr == ValueRepresentation_OtherDouble \|\|
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	341 vr == ValueRepresentation_OtherLong \|\|
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	342 vr == ValueRepresentation_UniversalResource \|\|
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	343 vr == ValueRepresentation_UnlimitedCharacters)
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 // 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	346 ASSERT_THROW(ToDcmtkBridge::Convert(vr), OrthancException);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	347 ASSERT_EQ(OrthancPluginValueRepresentation_UN, Plugins::Convert(vr));
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 else
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	350 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	351 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	352
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	353 OrthancPluginValueRepresentation plugins = Plugins::Convert(vr);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	354 ASSERT_EQ(vr, Plugins::Convert(plugins));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	355 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	356 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	357
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	358 for (int i = OrthancPluginValueRepresentation_AE;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	359 i <= OrthancPluginValueRepresentation_UT; i++)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	360 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	361 OrthancPluginValueRepresentation plugins = static_cast<OrthancPluginValueRepresentation>(i);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	362 ValueRepresentation orthanc = Plugins::Convert(plugins);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	363 ASSERT_EQ(plugins, Plugins::Convert(orthanc));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	364 }
3048 8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2861 diff changeset	365 #endif
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	366 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	367
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	368
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	369
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	370 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	371 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	372
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	373 static void CreateSampleJson(Json::Value& a)
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 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	376 Json::Value b = Json::objectValue;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	377 b["PatientName"] = "Hello";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	378 b["PatientID"] = "World";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	379 b["StudyDescription"] = "Toto";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	380 a.append(b);
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
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	383 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	384 Json::Value b = Json::objectValue;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	385 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	386 b["PatientID"] = "World2";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	387 a.append(b);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	388 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	389 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	390
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	391
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	392 namespace Orthanc
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	393 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	394 // Namespace for the "FRIEND_TEST()" directive in "FromDcmtkBridge" to apply:
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	395 // 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	396 TEST(FromDcmtkBridge, FromJson)
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	397 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	398 std::auto_ptr<DcmElement> element;
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	399
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 Json::Value a;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	402 a = "Hello";
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	403 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	404
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	405 Json::Value b;
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	406 std::set<DicomTag> ignoreTagLength;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	407 ignoreTagLength.insert(DICOM_TAG_PATIENT_ID);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	408
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	409 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	410 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength);
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	411 ASSERT_TRUE(b.isMember("0010,0010"));
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	412 ASSERT_EQ("Hello", b["0010,0010"].asString());
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	413
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	414 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	415 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength);
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	416 ASSERT_TRUE(b["0010,0010"].isNull()); // "Hello" has more than 3 characters
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	417
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	418 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	419 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength);
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	420 ASSERT_TRUE(b["0010,0010"].isObject());
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	421 ASSERT_EQ("PatientName", b["0010,0010"]["Name"].asString());
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	422 ASSERT_EQ("TooLong", b["0010,0010"]["Type"].asString());
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	423 ASSERT_TRUE(b["0010,0010"]["Value"].isNull());
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	424
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	425 ignoreTagLength.insert(DICOM_TAG_PATIENT_NAME);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	426 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	427 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	428 ASSERT_EQ("Hello", b["0010,0010"].asString());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	429 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	430
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	431 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	432 Json::Value a;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	433 a = "Hello";
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	434 // Cannot assign a string to a sequence
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	435 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	436 }
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	437
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	438 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	439 Json::Value a = Json::arrayValue;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	440 a.append("Hello");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	441 // Cannot assign an array to a string
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	442 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	443 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	444
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	445 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	446 Json::Value a;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	447 a = "data:application/octet-stream;base64,SGVsbG8="; // echo -n "Hello" \| base64
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	448 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	449
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	450 Json::Value b;
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	451 std::set<DicomTag> ignoreTagLength;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	452 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	453 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	454 ASSERT_EQ("Hello", b["0010,0010"].asString());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	455 }
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	456
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	457 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	458 Json::Value a = Json::arrayValue;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	459 CreateSampleJson(a);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	460 element.reset(FromDcmtkBridge::FromJson(REFERENCED_STUDY_SEQUENCE, a, true, Encoding_Utf8));
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	461
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	462 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	463 Json::Value b;
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	464 std::set<DicomTag> ignoreTagLength;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	465 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	466 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	467 ASSERT_EQ(Json::arrayValue, b["0008,1110"].type());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	468 ASSERT_EQ(2u, b["0008,1110"].size());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	469
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	470 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	471
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	472 ASSERT_EQ(3u, b["0008,1110"][i].size());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	473 ASSERT_EQ(2u, b["0008,1110"][1 - i].size());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	474 ASSERT_EQ(b["0008,1110"][i]["0010,0010"].asString(), "Hello");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	475 ASSERT_EQ(b["0008,1110"][i]["0010,0020"].asString(), "World");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	476 ASSERT_EQ(b["0008,1110"][i]["0008,1030"].asString(), "Toto");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	477 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0010"].asString(), "Hello2");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	478 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0020"].asString(), "World2");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	479 }
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	480
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	481 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	482 Json::Value b;
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	483 std::set<DicomTag> ignoreTagLength;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	484 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	485 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	486
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	487 Json::Value c;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	488 ServerToolbox::SimplifyTags(c, b, DicomToJsonFormat_Human);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	489
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	490 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	491 ASSERT_EQ(0, c["ReferencedStudySequence"].compare(a));
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	492 }
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	493 }
4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	494 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	495 }
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	496
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	497
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	498 TEST(ParsedDicomFile, InsertReplaceStrings)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	499 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	500 ParsedDicomFile f(true);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	501
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	502 f.Insert(DICOM_TAG_PATIENT_NAME, "World", false);
8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	503 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	504 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	505 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	506
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	507 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	508 ASSERT_FALSE(f.LookupTransferSyntax(s));
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	509
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	510 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	511 false, DicomReplaceMode_ThrowIfAbsent), OrthancException);
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	512 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	513 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	514 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	515 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	516 ASSERT_EQ(s, "Accession");
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	517 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	518 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	519 ASSERT_EQ(s, "Accession2");
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	520 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	521 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	522 ASSERT_EQ(s, "Accession3");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	523
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	524 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	525 ASSERT_EQ(s, "World");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	526 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	527 ASSERT_EQ(s, "Toto");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	528 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	529 ASSERT_EQ(s, "Toto");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	530 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	531 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	532 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	533 ASSERT_EQ(s, "Tata");
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
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	536
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 TEST(ParsedDicomFile, InsertReplaceJson)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	540 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	541 ParsedDicomFile f(true);
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 Json::Value a;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	544 CreateSampleJson(a);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	545
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	546 ASSERT_FALSE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	547 f.Remove(REFERENCED_STUDY_SEQUENCE); // No effect
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	548 f.Insert(REFERENCED_STUDY_SEQUENCE, a, true);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	549 ASSERT_TRUE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	550 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	551 f.Remove(REFERENCED_STUDY_SEQUENCE);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	552 ASSERT_FALSE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	553 f.Insert(REFERENCED_STUDY_SEQUENCE, a, true);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	554 ASSERT_TRUE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	555
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	556 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	557 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	558 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	559 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	560 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	561 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	562 ASSERT_TRUE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	563
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	564 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	565 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	566 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	567
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	568 Json::Value c;
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2117 diff changeset	569 ServerToolbox::SimplifyTags(c, b, DicomToJsonFormat_Human);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	570
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	571 ASSERT_EQ(0, c["ReferencedPatientSequence"].compare(a));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	572 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	573 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	574
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	575 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	576 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	577 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	578
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	579 std::string s;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	580 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	581 ASSERT_EQ(s, a.asString());
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	582 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	583 ASSERT_EQ(s, a.asString());
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	584 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	585 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	586 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	587 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	588 }
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	589
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	590
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	591 TEST(ParsedDicomFile, JsonEncoding)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	592 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	593 ParsedDicomFile f(true);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	594
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	595 for (unsigned int i = 0; i < testEncodingsCount; i++)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	596 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	597 if (testEncodings[i] != Encoding_Windows1251)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	598 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	599 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	600 f.SetEncoding(testEncodings[i]);
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	601
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	602 if (testEncodings[i] != Encoding_Ascii)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	603 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	604 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	605 ASSERT_EQ(testEncodings[i], f.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	606 ASSERT_FALSE(hasCodeExtensions);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	607 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	608
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	609 Json::Value s = Toolbox::ConvertToUtf8(testEncodingsEncoded[i], testEncodings[i], false);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	610 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	611
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	612 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	613 f.DatasetToJson(v, DicomToJsonFormat_Human, DicomToJsonFlags_Default, 0);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	614 ASSERT_EQ(v["PatientName"].asString(), std::string(testEncodingsExpected[i]));
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	615 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	616 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	617 }
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	618
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	619
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	620 TEST(ParsedDicomFile, ToJsonFlags1)
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	621 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	622 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	623 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	624
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	625 ParsedDicomFile f(true);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	626 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	627 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	628 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	629
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	630 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	631 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_None, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	632 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	633 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	634 ASSERT_FALSE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	635 ASSERT_FALSE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	636 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	637 ASSERT_EQ(Json::stringValue, v["7050,1000"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	638 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	639
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	640 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	641 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	642 ASSERT_EQ(7u, v.getMemberNames().size());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	643 ASSERT_FALSE(v.isMember("7052,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	644 ASSERT_TRUE(v.isMember("7050,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	645 ASSERT_TRUE(v.isMember("7053,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	646 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	647 ASSERT_EQ(Json::nullValue, v["7053,1000"].type());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	648
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	649 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePrivateTags, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	650 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	651 ASSERT_EQ(7u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	652 ASSERT_FALSE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	653 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	654 ASSERT_TRUE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	655 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	656 std::string mime, content;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	657 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	658 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7053,1000"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	659 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	660 ASSERT_EQ("Some private tag", content);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	661
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	662 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	663 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	664 ASSERT_EQ(7u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	665 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	666 ASSERT_TRUE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	667 ASSERT_FALSE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	668 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	669 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	670
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	671 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	672 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	673 ASSERT_EQ(7u, v.getMemberNames().size());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	674 ASSERT_TRUE(v.isMember("7050,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	675 ASSERT_TRUE(v.isMember("7052,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	676 ASSERT_FALSE(v.isMember("7053,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	677 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	678 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	679 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7052,1000"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	680 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	681 ASSERT_EQ("Some unknown tag", content);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	682
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	683 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	684 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	685 ASSERT_EQ(8u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	686 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	687 ASSERT_TRUE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	688 ASSERT_TRUE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	689 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	690 ASSERT_EQ(Json::nullValue, v["7052,1000"].type());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	691 ASSERT_EQ(Json::nullValue, v["7053,1000"].type());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	692 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	693
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	694
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	695 TEST(ParsedDicomFile, ToJsonFlags2)
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	696 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	697 ParsedDicomFile f(true);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	698 f.Insert(DICOM_TAG_PIXEL_DATA, "Pixels", false);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	699
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	700 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	701 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_None, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	702 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	703 ASSERT_EQ(5u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	704 ASSERT_FALSE(v.isMember("7fe0,0010"));
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	705
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	706 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	707 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	708 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	709 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	710 ASSERT_EQ(Json::nullValue, v["7fe0,0010"].type());
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	711
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	712 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	713 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	714 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	715 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	716 ASSERT_EQ(Json::stringValue, v["7fe0,0010"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	717 ASSERT_EQ("Pixels", v["7fe0,0010"].asString());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	718
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	719 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePixelData, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	720 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	721 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	722 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	723 ASSERT_EQ(Json::stringValue, v["7fe0,0010"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	724 std::string mime, content;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	725 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	726 ASSERT_EQ("application/octet-stream", mime);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	727 ASSERT_EQ("Pixels", content);
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	728 }
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	729
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	730
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	731 TEST(DicomFindAnswers, Basic)
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	732 {
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	733 DicomFindAnswers a(false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	734
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	735 {
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	736 DicomMap m;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	737 m.SetValue(DICOM_TAG_PATIENT_ID, "hello", false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	738 a.Add(m);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	739 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	740
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	741 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	742 ParsedDicomFile d(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	743 d.ReplacePlainString(DICOM_TAG_PATIENT_ID, "my");
1789 bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	744 a.Add(d);
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	745 }
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	746
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	747 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	748 DicomMap m;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	749 m.SetValue(DICOM_TAG_PATIENT_ID, "world", false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	750 a.Add(m);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	751 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	752
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	753 Json::Value j;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	754 a.ToJson(j, true);
1789 bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	755 ASSERT_EQ(3u, j.size());
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	756
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	757 //std::cout << j;
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	758 }
1818 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
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	761 TEST(ParsedDicomFile, FromJson)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	762 {
2117 87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	763 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	764 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7059, 0x1000), ValueRepresentation_OtherByte, "MyPrivateTag3", 1, 1, "");
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	765 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	766
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	767 Json::Value v;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	768 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	769
2117 87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	770 // Test the private creator
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	771 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	772 ASSERT_EQ("MyPrivateTag2", FromDcmtkBridge::GetTagName(DicomTag(0x7057, 0x1000), "ORTHANC"));
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	773
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	774 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	775 v["SOPClassUID"] = sopClassUid;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	776 v["SpecificCharacterSet"] = "ISO_IR 148"; // This is latin-5
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	777 v["PatientName"] = "Sébastien";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	778 v["7050-1000"] = "Some public tag"; // Even group => public tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	779 v["7052-1000"] = "Some unknown tag"; // Even group => public, unknown tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	780 v["7057-1000"] = "Some private tag"; // Odd group => private tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	781 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	782
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	783 std::string s;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	784 Toolbox::EncodeDataUriScheme(s, "application/octet-stream", "Sebastien");
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	785 v["StudyDescription"] = s;
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 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	788 v["0040,0100"] = Json::arrayValue; // ScheduledProcedureStepSequence
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 Json::Value vv;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	791 vv["Modality"] = "MR";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	792 v["0040,0100"].append(vv);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	793
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	794 vv["Modality"] = "CT";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	795 v["0040,0100"].append(vv);
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 const DicomToJsonFlags toJsonFlags = static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludeBinary \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	799 DicomToJsonFlags_IncludePixelData \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	800 DicomToJsonFlags_IncludePrivateTags \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	801 DicomToJsonFlags_IncludeUnknownTags \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	802 DicomToJsonFlags_ConvertBinaryToAscii);
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
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	805 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	806 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	807 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	808
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	809 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	810 dicom->DatasetToJson(vv, DicomToJsonFormat_Human, toJsonFlags, 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	811
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	812 ASSERT_EQ(vv["SOPClassUID"].asString(), sopClassUid);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	813 ASSERT_EQ(vv["MediaStorageSOPClassUID"].asString(), sopClassUid);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	814 ASSERT_TRUE(vv.isMember("SOPInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	815 ASSERT_TRUE(vv.isMember("SeriesInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	816 ASSERT_TRUE(vv.isMember("StudyInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	817 ASSERT_TRUE(vv.isMember("PatientID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	818 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	819
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	820
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 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	823 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	824
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	825 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	826 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	827
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	828 std::string mime, content;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	829 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, vv["PixelData"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	830 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	831 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	832 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	833
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	834
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	835 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	836 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	837 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_DecodeDataUriScheme)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	838
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	839 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	840 dicom->DatasetToJson(vv, DicomToJsonFormat_Short, toJsonFlags, 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	841
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	842 ASSERT_FALSE(vv.isMember("SOPInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	843 ASSERT_FALSE(vv.isMember("SeriesInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	844 ASSERT_FALSE(vv.isMember("StudyInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	845 ASSERT_FALSE(vv.isMember("PatientID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	846 ASSERT_EQ(2u, vv["0040,0100"].size());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	847 ASSERT_EQ("MR", vv["0040,0100"][0]["0008,0060"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	848 ASSERT_EQ("CT", vv["0040,0100"][1]["0008,0060"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	849 ASSERT_EQ("Some public tag", vv["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	850 ASSERT_EQ("Some unknown tag", vv["7052,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	851 ASSERT_EQ("Some private tag", vv["7057,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	852 ASSERT_EQ("Some private tag2", vv["7059,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	853 ASSERT_EQ("Sébastien", vv["0010,0010"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	854 ASSERT_EQ("Sebastien", vv["0008,1030"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	855 ASSERT_EQ("ISO_IR 148", vv["0008,0005"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	856 ASSERT_EQ("5", vv[DICOM_TAG_ROWS.Format()].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	857 ASSERT_EQ("5", vv[DICOM_TAG_COLUMNS.Format()].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	858 ASSERT_TRUE(vv[DICOM_TAG_PIXEL_DATA.Format()].asString().empty());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	859 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	860 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	861
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	862
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	863
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	864 TEST(TestImages, PatternGrayscale8)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	865 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	866 static const char* PATH = "UnitTestsResults/PatternGrayscale8.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	867
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	868 Orthanc::Image image(Orthanc::PixelFormat_Grayscale8, 256, 256, false);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	869
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	870 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	871 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	872 uint8_t p = reinterpret_cast<uint8_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	873 for (int x = 0; x < 256; x++, p++)
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 *p = y;
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
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	879 Orthanc::ImageAccessor r;
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	880
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	881 image.GetRegion(r, 32, 32, 64, 192);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	882 Orthanc::ImageProcessing::Set(r, 0);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	883
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	884 image.GetRegion(r, 160, 32, 64, 192);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	885 Orthanc::ImageProcessing::Set(r, 255);
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 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	888 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	889 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	890 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	891 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	892 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	893 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	894 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "Grayscale8");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	895 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	896
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	897 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	898 }
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 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	901 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	902 Orthanc::SystemToolbox::ReadFile(s, PATH);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	903 Orthanc::ParsedDicomFile f(s);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	904
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	905 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	906 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	907 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	908 ASSERT_EQ(Orthanc::PixelFormat_Grayscale8, decoded->GetFormat());
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	909
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	910 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	911 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	912 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	913 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	914 ASSERT_EQ(0, memcmp(a, b, 256));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	915 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	916 }
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
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 TEST(TestImages, PatternRGB)
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 static const char* PATH = "UnitTestsResults/PatternRGB24.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	923
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	924 Orthanc::Image image(Orthanc::PixelFormat_RGB24, 384, 256, false);
1941 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 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	927 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	928 uint8_t p = reinterpret_cast<uint8_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	929 for (int x = 0; x < 128; x++, p += 3)
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 p[0] = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	932 p[1] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	933 p[2] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	934 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	935 for (int x = 128; x < 128 * 2; x++, p += 3)
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 p[0] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	938 p[1] = 255 - y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	939 p[2] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	940 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	941 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	942 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	943 p[0] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	944 p[1] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	945 p[2] = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	946 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	947 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	948
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	949 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	950 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	951 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	952 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	953 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	954 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	955 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	956 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "RGB24");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	957 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	958
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	959 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	960 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	961
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	962 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	963 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	964 Orthanc::SystemToolbox::ReadFile(s, PATH);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	965 Orthanc::ParsedDicomFile f(s);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	966
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	967 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	968 ASSERT_EQ(384u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	969 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	970 ASSERT_EQ(Orthanc::PixelFormat_RGB24, decoded->GetFormat());
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	971
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	972 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	973 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	974 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	975 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	976 ASSERT_EQ(0, memcmp(a, b, 3 * 384));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	977 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	978 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	979 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	980
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	981
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	982 TEST(TestImages, PatternUint16)
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	983 {
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	984 static const char* PATH = "UnitTestsResults/PatternGrayscale16.dcm";
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	985
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	986 Orthanc::Image image(Orthanc::PixelFormat_Grayscale16, 256, 256, false);
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	987
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	988 uint16_t v = 0;
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	989 for (int y = 0; y < 256; y++)
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	990 {
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	991 uint16_t p = reinterpret_cast<uint16_t>(image.GetRow(y));
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	992 for (int x = 0; x < 256; x++, v++, p++)
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	993 {
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	994 *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	995 }
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	996 }
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	997
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	998 Orthanc::ImageAccessor r;
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	999
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1000 image.GetRegion(r, 32, 32, 64, 192);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1001 Orthanc::ImageProcessing::Set(r, 0);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1002
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1003 image.GetRegion(r, 160, 32, 64, 192);
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1004 Orthanc::ImageProcessing::Set(r, 65535);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1005
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1006 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1007 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1008 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	1009 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	1010 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	1011 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	1012 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	1013 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "Grayscale16");
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1014 f.EmbedImage(image);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1015
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1016 f.SaveToFile(PATH);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1017 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	1018
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1019 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1020 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	1021 Orthanc::SystemToolbox::ReadFile(s, PATH);
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1022 Orthanc::ParsedDicomFile f(s);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1023
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1024 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	1025 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	1026 ASSERT_EQ(256u, decoded->GetHeight());
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1027 ASSERT_EQ(Orthanc::PixelFormat_Grayscale16, decoded->GetFormat());
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1028
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1029 for (int y = 0; y < 256; y++)
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1030 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1031 const void* a = image.GetConstRow(y);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1032 const void* b = decoded->GetConstRow(y);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1033 ASSERT_EQ(0, memcmp(a, b, 512));
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1034 }
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1035 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	1036 }
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1037
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 TEST(TestImages, PatternInt16)
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 static const char* PATH = "UnitTestsResults/PatternSignedGrayscale16.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1042
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	1043 Orthanc::Image image(Orthanc::PixelFormat_SignedGrayscale16, 256, 256, false);
1941 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 int16_t v = -32768;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1046 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1047 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1048 int16_t p = reinterpret_cast<int16_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1049 for (int x = 0; x < 256; x++, v++, p++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1050 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1051 *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	1052 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1053 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1054
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1055 Orthanc::ImageAccessor r;
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1056 image.GetRegion(r, 32, 32, 64, 192);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1057 Orthanc::ImageProcessing::Set(r, -32768);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1058
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1059 image.GetRegion(r, 160, 32, 64, 192);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1060 Orthanc::ImageProcessing::Set(r, 32767);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1061
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1062 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1063 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1064 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	1065 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	1066 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	1067 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	1068 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	1069 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "SignedGrayscale16");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1070 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1071
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1072 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1073 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1074
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1075 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1076 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	1077 Orthanc::SystemToolbox::ReadFile(s, PATH);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1078 Orthanc::ParsedDicomFile f(s);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1079
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1080 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	1081 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	1082 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1083 ASSERT_EQ(Orthanc::PixelFormat_SignedGrayscale16, decoded->GetFormat());
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1084
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1085 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1086 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1087 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1088 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1089 ASSERT_EQ(0, memcmp(a, b, 512));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1090 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1091 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1092 }
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1093
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1094
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 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	1097 Encoding expected)
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 const char* value = NULL;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1100 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	1101
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1102 Encoding encoding;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1103 ASSERT_TRUE(GetDicomEncoding(encoding, value));
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1104 ASSERT_EQ(expected, encoding);
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
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1107
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1108 TEST(ParsedDicomFile, DicomMapEncodings1)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1109 {
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1110 SetDefaultDicomEncoding(Encoding_Ascii);
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1111 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	1112
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1113 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1114 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1115 ParsedDicomFile dicom(m);
2411 82d5e305fbd9 fix gcc warnings in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2409 diff changeset	1116 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card());
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1117 CheckEncoding(dicom, Encoding_Ascii);
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
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1120 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1121 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1122 ParsedDicomFile dicom(m, Encoding_Latin4);
2411 82d5e305fbd9 fix gcc warnings in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2409 diff changeset	1123 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card());
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1124 CheckEncoding(dicom, Encoding_Latin4);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1125 }
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 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1128 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1129 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	1130 ParsedDicomFile dicom(m);
2411 82d5e305fbd9 fix gcc warnings in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2409 diff changeset	1131 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card());
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1132 CheckEncoding(dicom, Encoding_Latin5);
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 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1137 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	1138 ParsedDicomFile dicom(m, Encoding_Latin1);
2411 82d5e305fbd9 fix gcc warnings in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2409 diff changeset	1139 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card());
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1140 CheckEncoding(dicom, Encoding_Latin5);
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 }
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
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1145 TEST(ParsedDicomFile, DicomMapEncodings2)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1146 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1147 const char* utf8 = NULL;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1148 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	1149 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1150 if (testEncodings[i] == Encoding_Utf8)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1151 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1152 utf8 = testEncodingsEncoded[i];
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1153 break;
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 ASSERT_TRUE(utf8 != NULL);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1158
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1159 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	1160 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1161 // 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	1162 if (testEncodings[i] != Encoding_Windows1251)
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 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1165 // 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	1166 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	1167 ASSERT_STREQ(testEncodingsEncoded[i], encoded.c_str());
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1168 std::string decoded = Toolbox::ConvertToUtf8(encoded, testEncodings[i], false);
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1169 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	1170
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1171 if (testEncodings[i] != Encoding_Chinese)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1172 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1173 // 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	1174 // 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	1175
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1176 std::string encoded = Toolbox::ConvertToUtf8(Toolbox::ConvertFromUtf8(utf8, testEncodings[i]), testEncodings[i], false);
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1177 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	1178 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1179 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1180
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1181
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1182 Json::Value v;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1183
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1184 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1185 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1186 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	1187
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1188 ParsedDicomFile dicom(m, testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1189
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1190 const char* encoded = NULL;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1191 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	1192 ASSERT_STREQ(testEncodingsEncoded[i], encoded);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1193
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1194 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	1195
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1196 Encoding encoding;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1197 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	1198 ASSERT_EQ(encoding, testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1199 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	1200 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1201
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1202
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1203 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1204 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1205 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	1206 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	1207
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1208 ParsedDicomFile dicom(m, testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1209
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1210 Json::Value v2;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1211 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	1212
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1213 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	1214 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	1215 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1216 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1217 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1218 }
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1219
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1220
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1221 TEST(ParsedDicomFile, ChangeEncoding)
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1222 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1223 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	1224 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1225 // 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	1226 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	1227 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1228 DicomMap m;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1229 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	1230
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1231 std::string tag;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1232
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1233 ParsedDicomFile dicom(m, Encoding_Utf8);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1234 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1235 ASSERT_EQ(Encoding_Utf8, dicom.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1236 ASSERT_FALSE(hasCodeExtensions);
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1237 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	1238 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	1239
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1240 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1241 Json::Value v;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1242 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	1243 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	1244 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	1245 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1246
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1247 dicom.ChangeEncoding(testEncodings[i]);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1248
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1249 ASSERT_EQ(testEncodings[i], dicom.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1250 ASSERT_FALSE(hasCodeExtensions);
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1251
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1252 const char* c = NULL;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1253 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	1254 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	1255
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1256 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	1257 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	1258
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1259 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1260 Json::Value v;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1261 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	1262 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	1263 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	1264 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1265 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1266 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1267 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1268
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1269
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1270 TEST(Toolbox, CaseWithAccents)
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1271 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1272 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	1273 }
2445 6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1274
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1275
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1276
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1277 TEST(ParsedDicomFile, InvalidCharacterSets)
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1278 {
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1279 {
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1280 // No encoding provided, fallback to default encoding
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1281 DicomMap m;
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1282 m.SetValue(DICOM_TAG_PATIENT_NAME, "HELLO", false);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1283
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1284 ParsedDicomFile d(m, Encoding_Latin3 /* default encoding */);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1285
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1286 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1287 ASSERT_EQ(Encoding_Latin3, d.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1288 ASSERT_FALSE(hasCodeExtensions);
2445 6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1289 }
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1290
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1291 {
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1292 // Valid encoding, "ISO_IR 13" is Japanese
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1293 DicomMap m;
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1294 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 13", false);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1295 m.SetValue(DICOM_TAG_PATIENT_NAME, "HELLO", false);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1296
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1297 ParsedDicomFile d(m, Encoding_Latin3 /* default encoding */);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1298
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1299 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1300 ASSERT_EQ(Encoding_Japanese, d.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1301 ASSERT_FALSE(hasCodeExtensions);
2445 6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1302 }
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1303
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1304 {
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1305 // Invalid value for an encoding ("nope" is not in the DICOM standard)
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1306 DicomMap m;
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1307 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "nope", false);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1308 m.SetValue(DICOM_TAG_PATIENT_NAME, "HELLO", false);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1309
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1310 ASSERT_THROW(ParsedDicomFile d(m, Encoding_Latin3), OrthancException);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1311 }
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1312
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1313 {
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1314 // Invalid encoding, as provided as a binary string
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1315 DicomMap m;
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1316 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 13", true);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1317 m.SetValue(DICOM_TAG_PATIENT_NAME, "HELLO", false);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1318
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1319 ASSERT_THROW(ParsedDicomFile d(m, Encoding_Latin3), OrthancException);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1320 }
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1321
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1322 {
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1323 // Encoding provided as an empty string, fallback to default encoding
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1324 // In Orthanc <= 1.3.1, this test was throwing an exception
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1325 DicomMap m;
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1326 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "", false);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1327 m.SetValue(DICOM_TAG_PATIENT_NAME, "HELLO", false);
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1328
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1329 ParsedDicomFile d(m, Encoding_Latin3 /* default encoding */);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1330
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1331 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1332 ASSERT_EQ(Encoding_Latin3, d.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1333 ASSERT_FALSE(hasCodeExtensions);
2445 6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1334 }
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1335 }
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1336
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1337
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1338
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1339 TEST(Toolbox, RemoveIso2022EscapeSequences)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1340 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1341 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1342 // \| one-byte control messages \|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1343 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1344
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1345 static const uint8_t iso2022_cstr_oneByteControl[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1346 0x0f, 0x41,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1347 0x0e, 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1348 0x8e, 0x1b, 0x4e, 0x43,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1349 0x8f, 0x1b, 0x4f, 0x44,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1350 0x8e, 0x1b, 0x4a, 0x45,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1351 0x8f, 0x1b, 0x4a, 0x46,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1352 0x50, 0x51, 0x52, 0x00
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1353 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1354
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1355 static const uint8_t iso2022_cstr_oneByteControl_ref[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1356 0x41,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1357 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1358 0x43,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1359 0x44,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1360 0x8e, 0x1b, 0x4a, 0x45,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1361 0x8f, 0x1b, 0x4a, 0x46,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1362 0x50, 0x51, 0x52, 0x00
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1363 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1364
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1365 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1366 // \| two-byte control messages \|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1367 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1368
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1369 static const uint8_t iso2022_cstr_twoByteControl[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1370 0x1b, 0x6e, 0x41,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1371 0x1b, 0x6f, 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1372 0x1b, 0x4e, 0x43,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1373 0x1b, 0x4f, 0x44,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1374 0x1b, 0x7e, 0x45,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1375 0x1b, 0x7d, 0x46,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1376 0x1b, 0x7c, 0x47, 0x00
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1377 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1378
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1379 static const uint8_t iso2022_cstr_twoByteControl_ref[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1380 0x41,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1381 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1382 0x43,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1383 0x44,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1384 0x45,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1385 0x46,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1386 0x47, 0x00
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1387 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1388
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1389 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1390 // \| various-length escape sequences \|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1391 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1392
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1393 static const uint8_t iso2022_cstr_escapeSequence[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1394 0x1b, 0x40, 0x41, // 1b and 40 should not be removed (invalid esc seq)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1395 0x1b, 0x50, 0x42, // ditto
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1396 0x1b, 0x7f, 0x43, // ditto
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1397 0x1b, 0x21, 0x4a, 0x44, // this will match
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1398 0x1b, 0x20, 0x21, 0x2f, 0x40, 0x45, // this will match
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1399 0x1b, 0x20, 0x21, 0x2f, 0x2f, 0x40, 0x46, // this will match too
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1400 0x1b, 0x20, 0x21, 0x2f, 0x1f, 0x47, 0x48, 0x00 // this will NOT match!
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1401 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1402
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1403 static const uint8_t iso2022_cstr_escapeSequence_ref[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1404 0x1b, 0x40, 0x41, // 1b and 40 should not be removed (invalid esc seq)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1405 0x1b, 0x50, 0x42, // ditto
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1406 0x1b, 0x7f, 0x43, // ditto
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1407 0x44, // this will match
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1408 0x45, // this will match
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1409 0x46, // this will match too
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1410 0x1b, 0x20, 0x21, 0x2f, 0x1f, 0x47, 0x48, 0x00 // this will NOT match!
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1411 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1412
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1413
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1414 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1415 // \| a real-world japanese sample \|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1416 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1417
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1418 static const uint8_t iso2022_cstr_real_ir13[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1419 0xd4, 0xcf, 0xc0, 0xde, 0x5e, 0xc0, 0xdb, 0xb3,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1420 0x3d, 0x1b, 0x24, 0x42, 0x3b, 0x33, 0x45, 0x44,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1421 0x1b, 0x28, 0x4a, 0x5e, 0x1b, 0x24, 0x42, 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1422 0x40, 0x4f, 0x3a, 0x1b, 0x28, 0x4a, 0x3d, 0x1b,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1423 0x24, 0x42, 0x24, 0x64, 0x24, 0x5e, 0x24, 0x40,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1424 0x1b, 0x28, 0x4a, 0x5e, 0x1b, 0x24, 0x42, 0x24,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1425 0x3f, 0x24, 0x6d, 0x24, 0x26, 0x1b, 0x28, 0x4a, 0x00
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1426 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1427
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1428 static const uint8_t iso2022_cstr_real_ir13_ref[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1429 0xd4, 0xcf, 0xc0, 0xde, 0x5e, 0xc0, 0xdb, 0xb3,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1430 0x3d,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1431 0x3b, 0x33, 0x45, 0x44,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1432 0x5e,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1433 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1434 0x40, 0x4f, 0x3a,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1435 0x3d,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1436 0x24, 0x64, 0x24, 0x5e, 0x24, 0x40,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1437 0x5e,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1438 0x24,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1439 0x3f, 0x24, 0x6d, 0x24, 0x26, 0x00
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1440 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1441
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1442
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1443
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1444 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1445 // \| the actual test \|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1446 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1447
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1448 std::string iso2022_str_oneByteControl(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1449 reinterpret_cast<const char*>(iso2022_cstr_oneByteControl));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1450 std::string iso2022_str_oneByteControl_ref(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1451 reinterpret_cast<const char*>(iso2022_cstr_oneByteControl_ref));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1452 std::string iso2022_str_twoByteControl(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1453 reinterpret_cast<const char*>(iso2022_cstr_twoByteControl));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1454 std::string iso2022_str_twoByteControl_ref(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1455 reinterpret_cast<const char*>(iso2022_cstr_twoByteControl_ref));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1456 std::string iso2022_str_escapeSequence(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1457 reinterpret_cast<const char*>(iso2022_cstr_escapeSequence));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1458 std::string iso2022_str_escapeSequence_ref(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1459 reinterpret_cast<const char*>(iso2022_cstr_escapeSequence_ref));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1460 std::string iso2022_str_real_ir13(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1461 reinterpret_cast<const char*>(iso2022_cstr_real_ir13));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1462 std::string iso2022_str_real_ir13_ref(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1463 reinterpret_cast<const char*>(iso2022_cstr_real_ir13_ref));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1464
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1465 std::string dest;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1466
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1467 Toolbox::RemoveIso2022EscapeSequences(dest, iso2022_str_oneByteControl);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1468 ASSERT_EQ(dest, iso2022_str_oneByteControl_ref);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1469
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1470 Toolbox::RemoveIso2022EscapeSequences(dest, iso2022_str_twoByteControl);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1471 ASSERT_EQ(dest, iso2022_str_twoByteControl_ref);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1472
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1473 Toolbox::RemoveIso2022EscapeSequences(dest, iso2022_str_escapeSequence);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1474 ASSERT_EQ(dest, iso2022_str_escapeSequence_ref);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1475
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1476 Toolbox::RemoveIso2022EscapeSequences(dest, iso2022_str_real_ir13);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1477 ASSERT_EQ(dest, iso2022_str_real_ir13_ref);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1478 }

Mercurial > hg > orthanc

annotate UnitTestsSources/FromDcmtkTests.cpp @ 3217:cf8cbeb35f33