orthanc: UnitTestsSources/FromDcmtkTests.cpp annotate

annotate UnitTestsSources/FromDcmtkTests.cpp @ 3221:4be505c2ac56

Separation of ideographic and phonetic characters in DICOMweb JSON and XML

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 14 Feb 2019 14:04:04 +0100
parents	4351f52f15d5
children	63681433b0fc

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"
3221 4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	39 #include "../Core/DicomParsing/DicomWebJsonVisitor.h"
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	40 #include "../Core/DicomParsing/FromDcmtkBridge.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	41 #include "../Core/DicomParsing/Internals/DicomImageDecoder.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	42 #include "../Core/DicomParsing/ToDcmtkBridge.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	43 #include "../Core/Endianness.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	44 #include "../Core/Images/Image.h"
1612 96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	45 #include "../Core/Images/ImageBuffer.h"
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	46 #include "../Core/Images/ImageProcessing.h"
1612 96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	47 #include "../Core/Images/PngReader.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	48 #include "../Core/Images/PngWriter.h"
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	49 #include "../Core/OrthancException.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	50 #include "../Core/SystemToolbox.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	51 #include "../OrthancServer/ServerToolbox.h"
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	52 #include "../Plugins/Engine/PluginsEnumerations.h"
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	53 #include "../Resources/EncodingTests.h"
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	55 #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	56 #include <dcmtk/dcmdata/dcdeftag.h>
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	57
3221 4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	58 #if ORTHANC_ENABLE_PUGIXML == 1
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	59 # include <pugixml.hpp>
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	60 #endif
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	61
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 using namespace Orthanc;
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 TEST(DicomFormat, Tag)
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	66 ASSERT_EQ("PatientName", FromDcmtkBridge::GetTagName(DicomTag(0x0010, 0x0010), ""));
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 DicomTag t = FromDcmtkBridge::ParseTag("SeriesDescription");
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 ASSERT_EQ(0x0008, t.GetGroup());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 ASSERT_EQ(0x103E, t.GetElement());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 t = FromDcmtkBridge::ParseTag("0020-e040");
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 ASSERT_EQ(0x0020, t.GetGroup());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 ASSERT_EQ(0xe040, t.GetElement());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 // Test ==() and !=() operators
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 ASSERT_TRUE(DICOM_TAG_PATIENT_ID == DicomTag(0x0010, 0x0020));
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 ASSERT_FALSE(DICOM_TAG_PATIENT_ID != DicomTag(0x0010, 0x0020));
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 }
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	82 TEST(DicomModification, Basic)
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	83 {
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	84 DicomModification m;
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	85 m.SetupAnonymization(DicomVersion_2008);
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	86 //m.SetLevel(DicomRootLevel_Study);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	87 //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	88 //m.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "coucou");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	89
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	90 ParsedDicomFile o(true);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	91 o.SaveToFile("UnitTestsResults/anon.dcm");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	92
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	93 for (int i = 0; i < 10; i++)
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	94 {
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	95 char b[1024];
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	96 sprintf(b, "UnitTestsResults/anon%06d.dcm", i);
2521 6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	97 std::auto_ptr<ParsedDicomFile> f(o.Clone(false));
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	98 if (i > 4)
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	99 o.ReplacePlainString(DICOM_TAG_SERIES_INSTANCE_UID, "coucou");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	100 m.Apply(*f);
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	101 f->SaveToFile(b);
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	102 }
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	103 }
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	104
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	105
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	106 TEST(DicomModification, Anonymization)
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	107 {
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	108 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	109
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	110 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	111 const DicomTag privateTag2(FromDcmtkBridge::ParseTag("0031-1020"));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	112 ASSERT_TRUE(privateTag.IsPrivate());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	113 ASSERT_TRUE(privateTag2.IsPrivate());
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	114 ASSERT_EQ(0x0031, privateTag2.GetGroup());
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	115 ASSERT_EQ(0x1020, privateTag2.GetElement());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	116
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	117 std::string s;
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	118 ParsedDicomFile o(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	119 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	120 ASSERT_FALSE(o.GetTagValue(s, privateTag));
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	121 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	122 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	123 ASSERT_STREQ("private tag", s.c_str());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	124
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	125 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	126 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	127 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	128 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	129 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	130 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	131 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	132 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	133 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	134 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	135 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	136
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	137 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	138 ASSERT_FALSE(Toolbox::IsUuid(s));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	139
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	140 DicomModification m;
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	141 m.SetupAnonymization(DicomVersion_2008);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	142 m.Keep(privateTag);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	143
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	144 m.Apply(o);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	145
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	146 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	147 ASSERT_TRUE(Toolbox::IsUuid(s));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	148 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	149 ASSERT_STREQ("private tag", s.c_str());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	150
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	151 m.SetupAnonymization(DicomVersion_2008);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	152 m.Apply(o);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	153 ASSERT_FALSE(o.GetTagValue(s, privateTag));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	154 }
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	155
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	156
802 82b07ab959f4 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 800 diff changeset	157 #include <dcmtk/dcmdata/dcuid.h>
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	158
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	159 TEST(DicomModification, Png)
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	160 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	161 // 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	162 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	163
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	164 std::string m, cc;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	165 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	166
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	167 ASSERT_EQ("image/png", m);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	168
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	169 PngReader reader;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	170 reader.ReadFromMemory(cc);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	171
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1417 diff changeset	172 ASSERT_EQ(5u, reader.GetHeight());
9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1417 diff changeset	173 ASSERT_EQ(5u, reader.GetWidth());
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	174 ASSERT_EQ(PixelFormat_RGBA32, reader.GetFormat());
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	175
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	176 ParsedDicomFile o(true);
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/png1.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 // Red dot, without alpha channel
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	181 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	182 o.EmbedContent(s);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	183 o.SaveToFile("UnitTestsResults/png2.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	184
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	185 // Check box in Graylevel8
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	186 s = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gUGDDcB53FulQAAAElJREFUGNNtj0sSAEEEQ1+U+185s1CtmRkblQ9CZldsKHJDk6DLGLJa6chjh0ooQmpjXMM86zPwydGEj6Ed/UGykkEM8X+p3u8/8LcOJIWLGeMAAAAASUVORK5CYII=";
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	187 o.EmbedContent(s);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	188 //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	189 o.SaveToFile("UnitTestsResults/png3.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	190
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	191
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	192 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	193 // Gradient in Graylevel16
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	194
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	195 ImageBuffer img;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	196 img.SetWidth(256);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	197 img.SetHeight(256);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	198 img.SetFormat(PixelFormat_Grayscale16);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	199
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	200 ImageAccessor accessor;
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	201 img.GetWriteableAccessor(accessor);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	202
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	203 uint16_t v = 0;
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	204 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	205 {
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	206 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	207 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	208 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	209 *p = v;
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 }
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	212
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	213 o.EmbedImage(accessor);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	214 o.SaveToFile("UnitTestsResults/png4.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	215 }
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	216 }
1088 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
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	219 TEST(FromDcmtkBridge, Encodings1)
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	220 {
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	221 for (unsigned int i = 0; i < testEncodingsCount; i++)
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	222 {
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	223 std::string source(testEncodingsEncoded[i]);
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	224 std::string expected(testEncodingsExpected[i]);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	225 std::string s = Toolbox::ConvertToUtf8(source, testEncodings[i], false);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	226 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
1089 5ea0b56e850d logging in test jodogne parents: 1088 diff changeset	227 EXPECT_EQ(expected, s);
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	228 }
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	229 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	230
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 TEST(FromDcmtkBridge, Enumerations)
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	233 {
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	234 // 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	235 Encoding e;
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	236
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	237 ASSERT_FALSE(GetDicomEncoding(e, ""));
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	238 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	239
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	240 // 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	241 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	242 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	243 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	244 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	245 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	246 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	247 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	248 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	249 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	250 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	251 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	252
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	253 // 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	254 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	255 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	256 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	257 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	258 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	259 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	260 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	261 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	262 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	263 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	264 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	265 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	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-4
3219 4351f52f15d5 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	268 ASSERT_TRUE(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	269 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	270 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	271
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	272 // 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	273 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	274 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	275 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	276 }
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	277
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	278
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	279 TEST(FromDcmtkBridge, Encodings3)
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	280 {
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	281 for (unsigned int i = 0; i < testEncodingsCount; i++)
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	282 {
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	283 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	284 std::string dicom;
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	285
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	286 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	287 ParsedDicomFile f(true);
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	288 f.SetEncoding(testEncodings[i]);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	289
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	290 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	291 f.Insert(DICOM_TAG_PATIENT_NAME, s, false);
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	292 f.SaveToMemoryBuffer(dicom);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	293 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	294
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	295 if (testEncodings[i] != Encoding_Windows1251)
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	296 {
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	297 ParsedDicomFile g(dicom);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	298
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	299 if (testEncodings[i] != Encoding_Ascii)
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	300 {
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	301 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	302 ASSERT_EQ(testEncodings[i], g.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	303 ASSERT_FALSE(hasCodeExtensions);
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	304 }
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	305
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	306 std::string tag;
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	307 ASSERT_TRUE(g.GetTagValue(tag, DICOM_TAG_PATIENT_NAME));
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	308 ASSERT_EQ(std::string(testEncodingsExpected[i]), tag);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	309 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	310 }
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	311 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	312
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	313
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	314 TEST(FromDcmtkBridge, ValueRepresentation)
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	315 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	316 ASSERT_EQ(ValueRepresentation_PersonName,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	317 FromDcmtkBridge::LookupValueRepresentation(DICOM_TAG_PATIENT_NAME));
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	318 ASSERT_EQ(ValueRepresentation_Date,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	319 FromDcmtkBridge::LookupValueRepresentation(DicomTag(0x0008, 0x0020) /* StudyDate */));
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	320 ASSERT_EQ(ValueRepresentation_Time,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	321 FromDcmtkBridge::LookupValueRepresentation(DicomTag(0x0008, 0x0030) /* StudyTime */));
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	322 ASSERT_EQ(ValueRepresentation_DateTime,
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	323 FromDcmtkBridge::LookupValueRepresentation(DicomTag(0x0008, 0x002a) /* AcquisitionDateTime */));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	324 ASSERT_EQ(ValueRepresentation_NotSupported,
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	325 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	326 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	327
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	328
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	329 TEST(FromDcmtkBridge, ValueRepresentationConversions)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	330 {
3048 8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2861 diff changeset	331 #if ORTHANC_ENABLE_PLUGINS == 1
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	332 ASSERT_EQ(1, ValueRepresentation_ApplicationEntity);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	333 ASSERT_EQ(1, OrthancPluginValueRepresentation_AE);
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 for (int i = ValueRepresentation_ApplicationEntity;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	336 i <= ValueRepresentation_NotSupported; i++)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	337 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	338 ValueRepresentation vr = static_cast<ValueRepresentation>(i);
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 if (vr == ValueRepresentation_NotSupported)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	341 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	342 ASSERT_THROW(ToDcmtkBridge::Convert(vr), OrthancException);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	343 ASSERT_THROW(Plugins::Convert(vr), OrthancException);
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 else if (vr == ValueRepresentation_OtherDouble \|\|
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	346 vr == ValueRepresentation_OtherLong \|\|
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	347 vr == ValueRepresentation_UniversalResource \|\|
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	348 vr == ValueRepresentation_UnlimitedCharacters)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	349 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	350 // 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	351 ASSERT_THROW(ToDcmtkBridge::Convert(vr), OrthancException);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	352 ASSERT_EQ(OrthancPluginValueRepresentation_UN, Plugins::Convert(vr));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	353 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	354 else
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 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	357
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	358 OrthancPluginValueRepresentation plugins = Plugins::Convert(vr);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	359 ASSERT_EQ(vr, Plugins::Convert(plugins));
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 }
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	362
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	363 for (int i = OrthancPluginValueRepresentation_AE;
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	364 i <= OrthancPluginValueRepresentation_UT; i++)
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	365 {
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	366 OrthancPluginValueRepresentation plugins = static_cast<OrthancPluginValueRepresentation>(i);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	367 ValueRepresentation orthanc = Plugins::Convert(plugins);
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	368 ASSERT_EQ(plugins, Plugins::Convert(orthanc));
6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	369 }
3048 8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2861 diff changeset	370 #endif
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	371 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	372
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	373
1693 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 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	376 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	377
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	378 static void CreateSampleJson(Json::Value& a)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	379 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	380 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	381 Json::Value b = Json::objectValue;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	382 b["PatientName"] = "Hello";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	383 b["PatientID"] = "World";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	384 b["StudyDescription"] = "Toto";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	385 a.append(b);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	386 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	387
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 Json::Value b = Json::objectValue;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	390 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	391 b["PatientID"] = "World2";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	392 a.append(b);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	393 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	394 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	395
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	396
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	397 namespace Orthanc
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	398 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	399 // Namespace for the "FRIEND_TEST()" directive in "FromDcmtkBridge" to apply:
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	400 // 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	401 TEST(FromDcmtkBridge, FromJson)
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	402 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	403 std::auto_ptr<DcmElement> element;
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	404
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	405 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	406 Json::Value a;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	407 a = "Hello";
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	408 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	409
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	410 Json::Value b;
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	411 std::set<DicomTag> ignoreTagLength;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	412 ignoreTagLength.insert(DICOM_TAG_PATIENT_ID);
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, 0, 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.isMember("0010,0010"));
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	417 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	418
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	419 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	420 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	421 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	422
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	423 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	424 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	425 ASSERT_TRUE(b["0010,0010"].isObject());
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	426 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	427 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	428 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	429
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	430 ignoreTagLength.insert(DICOM_TAG_PATIENT_NAME);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	431 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	432 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	433 ASSERT_EQ("Hello", b["0010,0010"].asString());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	434 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	435
2126 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 Json::Value a;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	438 a = "Hello";
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	439 // Cannot assign a string to a sequence
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	440 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	441 }
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	442
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	443 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	444 Json::Value a = Json::arrayValue;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	445 a.append("Hello");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	446 // Cannot assign an array to a string
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	447 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	448 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	449
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	450 {
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	451 Json::Value a;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	452 a = "data:application/octet-stream;base64,SGVsbG8="; // echo -n "Hello" \| base64
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	453 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	454
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	455 Json::Value b;
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	456 std::set<DicomTag> ignoreTagLength;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	457 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	458 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	459 ASSERT_EQ("Hello", b["0010,0010"].asString());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	460 }
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	461
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 a = Json::arrayValue;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	464 CreateSampleJson(a);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	465 element.reset(FromDcmtkBridge::FromJson(REFERENCED_STUDY_SEQUENCE, a, true, Encoding_Utf8));
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	466
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	467 {
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	468 Json::Value b;
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	469 std::set<DicomTag> ignoreTagLength;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	470 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	471 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	472 ASSERT_EQ(Json::arrayValue, b["0008,1110"].type());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	473 ASSERT_EQ(2u, b["0008,1110"].size());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	474
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	475 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	476
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	477 ASSERT_EQ(3u, b["0008,1110"][i].size());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	478 ASSERT_EQ(2u, b["0008,1110"][1 - i].size());
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	479 ASSERT_EQ(b["0008,1110"][i]["0010,0010"].asString(), "Hello");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	480 ASSERT_EQ(b["0008,1110"][i]["0010,0020"].asString(), "World");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	481 ASSERT_EQ(b["0008,1110"][i]["0008,1030"].asString(), "Toto");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	482 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0010"].asString(), "Hello2");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	483 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0020"].asString(), "World2");
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	484 }
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	485
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 b;
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	488 std::set<DicomTag> ignoreTagLength;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2401 diff changeset	489 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full,
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	490 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength);
2126 03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	491
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	492 Json::Value c;
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	493 ServerToolbox::SimplifyTags(c, b, DicomToJsonFormat_Human);
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	494
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	495 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	496 ASSERT_EQ(0, c["ReferencedStudySequence"].compare(a));
03b065778fc3 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	497 }
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	498 }
4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	499 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	500 }
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	501
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	502
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	503 TEST(ParsedDicomFile, InsertReplaceStrings)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	504 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	505 ParsedDicomFile f(true);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	506
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	507 f.Insert(DICOM_TAG_PATIENT_NAME, "World", false);
8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	508 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	509 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	510 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	511
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	512 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	513 ASSERT_FALSE(f.LookupTransferSyntax(s));
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	514
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	515 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	516 false, DicomReplaceMode_ThrowIfAbsent), OrthancException);
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("Accession"), false, DicomReplaceMode_IgnoreIfAbsent);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	518 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	519 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	520 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	521 ASSERT_EQ(s, "Accession");
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	522 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	523 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	524 ASSERT_EQ(s, "Accession2");
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	525 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	526 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	527 ASSERT_EQ(s, "Accession3");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	528
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	529 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	530 ASSERT_EQ(s, "World");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	531 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	532 ASSERT_EQ(s, "Toto");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	533 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	534 ASSERT_EQ(s, "Toto");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	535 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	536 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	537 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	538 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	539 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	540
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	541
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
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	544 TEST(ParsedDicomFile, InsertReplaceJson)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	545 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	546 ParsedDicomFile f(true);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	547
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	548 Json::Value a;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	549 CreateSampleJson(a);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	550
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	551 ASSERT_FALSE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	552 f.Remove(REFERENCED_STUDY_SEQUENCE); // No effect
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 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	556 f.Remove(REFERENCED_STUDY_SEQUENCE);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	557 ASSERT_FALSE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	558 f.Insert(REFERENCED_STUDY_SEQUENCE, a, true);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	559 ASSERT_TRUE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	560
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	561 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	562 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	563 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	564 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	565 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	566 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	567 ASSERT_TRUE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	568
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	569 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	570 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	571 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	572
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	573 Json::Value c;
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2117 diff changeset	574 ServerToolbox::SimplifyTags(c, b, DicomToJsonFormat_Human);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	575
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	576 ASSERT_EQ(0, c["ReferencedPatientSequence"].compare(a));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	577 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	578 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	579
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	580 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	581 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	582 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	583
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	584 std::string s;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	585 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	586 ASSERT_EQ(s, a.asString());
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	587 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	588 ASSERT_EQ(s, a.asString());
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	589 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	590 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	591 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	592 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	593 }
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
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	596 TEST(ParsedDicomFile, JsonEncoding)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	597 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	598 ParsedDicomFile f(true);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	599
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	600 for (unsigned int i = 0; i < testEncodingsCount; 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_Windows1251)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	603 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	604 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	605 f.SetEncoding(testEncodings[i]);
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	606
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	607 if (testEncodings[i] != Encoding_Ascii)
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 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	610 ASSERT_EQ(testEncodings[i], f.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	611 ASSERT_FALSE(hasCodeExtensions);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	612 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	613
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	614 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	615 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	616
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	617 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	618 f.DatasetToJson(v, DicomToJsonFormat_Human, DicomToJsonFlags_Default, 0);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	619 ASSERT_EQ(v["PatientName"].asString(), std::string(testEncodingsExpected[i]));
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	620 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	621 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	622 }
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	623
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	624
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	625 TEST(ParsedDicomFile, ToJsonFlags1)
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	626 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2107 diff changeset	627 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	628 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	629
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	630 ParsedDicomFile f(true);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	631 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	632 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	633 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	634
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	635 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	636 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_None, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	637 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	638 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	639 ASSERT_FALSE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	640 ASSERT_FALSE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	641 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	642 ASSERT_EQ(Json::stringValue, v["7050,1000"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	643 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	644
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	645 f.DatasetToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePrivateTags \| DicomToJsonFlags_ConvertBinaryToNull), 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	646 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	647 ASSERT_EQ(7u, v.getMemberNames().size());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	648 ASSERT_FALSE(v.isMember("7052,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	649 ASSERT_TRUE(v.isMember("7050,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	650 ASSERT_TRUE(v.isMember("7053,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	651 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	652 ASSERT_EQ(Json::nullValue, v["7053,1000"].type());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	653
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	654 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePrivateTags, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	655 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	656 ASSERT_EQ(7u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	657 ASSERT_FALSE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	658 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	659 ASSERT_TRUE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	660 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	661 std::string mime, content;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	662 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	663 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7053,1000"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	664 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	665 ASSERT_EQ("Some private tag", content);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	666
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	667 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	668 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	669 ASSERT_EQ(7u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	670 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	671 ASSERT_TRUE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	672 ASSERT_FALSE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	673 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	674 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	675
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	676 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	677 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	678 ASSERT_EQ(7u, v.getMemberNames().size());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	679 ASSERT_TRUE(v.isMember("7050,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	680 ASSERT_TRUE(v.isMember("7052,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	681 ASSERT_FALSE(v.isMember("7053,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	682 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	683 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	684 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7052,1000"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	685 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	686 ASSERT_EQ("Some unknown tag", content);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	687
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	688 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	689 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	690 ASSERT_EQ(8u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	691 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	692 ASSERT_TRUE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	693 ASSERT_TRUE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	694 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	695 ASSERT_EQ(Json::nullValue, v["7052,1000"].type());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	696 ASSERT_EQ(Json::nullValue, v["7053,1000"].type());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	697 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	698
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 TEST(ParsedDicomFile, ToJsonFlags2)
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	701 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	702 ParsedDicomFile f(true);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	703 f.Insert(DICOM_TAG_PIXEL_DATA, "Pixels", false);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	704
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	705 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	706 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_None, 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(5u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	709 ASSERT_FALSE(v.isMember("7fe0,0010"));
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	710
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	711 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	712 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	713 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	714 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	715 ASSERT_EQ(Json::nullValue, v["7fe0,0010"].type());
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	716
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	717 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	718 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	719 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	720 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	721 ASSERT_EQ(Json::stringValue, v["7fe0,0010"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	722 ASSERT_EQ("Pixels", v["7fe0,0010"].asString());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	723
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2126 diff changeset	724 f.DatasetToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePixelData, 0);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	725 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	726 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	727 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	728 ASSERT_EQ(Json::stringValue, v["7fe0,0010"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	729 std::string mime, content;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	730 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	731 ASSERT_EQ("application/octet-stream", mime);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	732 ASSERT_EQ("Pixels", content);
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	733 }
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 TEST(DicomFindAnswers, Basic)
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	737 {
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	738 DicomFindAnswers a(false);
1787 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 DicomMap m;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	742 m.SetValue(DICOM_TAG_PATIENT_ID, "hello", false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	743 a.Add(m);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	744 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	745
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	746 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	747 ParsedDicomFile d(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	748 d.ReplacePlainString(DICOM_TAG_PATIENT_ID, "my");
1789 bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	749 a.Add(d);
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	750 }
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	751
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	752 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	753 DicomMap m;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	754 m.SetValue(DICOM_TAG_PATIENT_ID, "world", false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	755 a.Add(m);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	756 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	757
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	758 Json::Value j;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	759 a.ToJson(j, true);
1789 bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	760 ASSERT_EQ(3u, j.size());
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	761
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	762 //std::cout << j;
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	763 }
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	764
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	765
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	766 TEST(ParsedDicomFile, FromJson)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	767 {
2117 87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	768 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	769 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7059, 0x1000), ValueRepresentation_OtherByte, "MyPrivateTag3", 1, 1, "");
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	770 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	771
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	772 Json::Value v;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	773 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	774
2117 87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	775 // Test the private creator
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	776 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	777 ASSERT_EQ("MyPrivateTag2", FromDcmtkBridge::GetTagName(DicomTag(0x7057, 0x1000), "ORTHANC"));
87b395a77c41 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	778
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	779 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	780 v["SOPClassUID"] = sopClassUid;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	781 v["SpecificCharacterSet"] = "ISO_IR 148"; // This is latin-5
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	782 v["PatientName"] = "Sébastien";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	783 v["7050-1000"] = "Some public tag"; // Even group => public tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	784 v["7052-1000"] = "Some unknown tag"; // Even group => public, unknown tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	785 v["7057-1000"] = "Some private tag"; // Odd group => private tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	786 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	787
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	788 std::string s;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	789 Toolbox::EncodeDataUriScheme(s, "application/octet-stream", "Sebastien");
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	790 v["StudyDescription"] = s;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	791
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	792 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	793 v["0040,0100"] = Json::arrayValue; // ScheduledProcedureStepSequence
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	794
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	795 Json::Value vv;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	796 vv["Modality"] = "MR";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	797 v["0040,0100"].append(vv);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	798
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	799 vv["Modality"] = "CT";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	800 v["0040,0100"].append(vv);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	801 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	802
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	803 const DicomToJsonFlags toJsonFlags = static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludeBinary \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	804 DicomToJsonFlags_IncludePixelData \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	805 DicomToJsonFlags_IncludePrivateTags \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	806 DicomToJsonFlags_IncludeUnknownTags \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	807 DicomToJsonFlags_ConvertBinaryToAscii);
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
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	810 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	811 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	812 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	813
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	814 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	815 dicom->DatasetToJson(vv, DicomToJsonFormat_Human, toJsonFlags, 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	816
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	817 ASSERT_EQ(vv["SOPClassUID"].asString(), sopClassUid);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	818 ASSERT_EQ(vv["MediaStorageSOPClassUID"].asString(), sopClassUid);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	819 ASSERT_TRUE(vv.isMember("SOPInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	820 ASSERT_TRUE(vv.isMember("SeriesInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	821 ASSERT_TRUE(vv.isMember("StudyInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	822 ASSERT_TRUE(vv.isMember("PatientID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	823 }
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
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	826 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	827 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	828 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	829
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	830 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	831 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	832
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	833 std::string mime, content;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	834 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, vv["PixelData"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	835 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	836 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	837 }
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
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	840 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	841 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	842 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_DecodeDataUriScheme)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	843
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	844 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	845 dicom->DatasetToJson(vv, DicomToJsonFormat_Short, toJsonFlags, 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	846
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	847 ASSERT_FALSE(vv.isMember("SOPInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	848 ASSERT_FALSE(vv.isMember("SeriesInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	849 ASSERT_FALSE(vv.isMember("StudyInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	850 ASSERT_FALSE(vv.isMember("PatientID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	851 ASSERT_EQ(2u, vv["0040,0100"].size());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	852 ASSERT_EQ("MR", vv["0040,0100"][0]["0008,0060"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	853 ASSERT_EQ("CT", vv["0040,0100"][1]["0008,0060"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	854 ASSERT_EQ("Some public tag", vv["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	855 ASSERT_EQ("Some unknown tag", vv["7052,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	856 ASSERT_EQ("Some private tag", vv["7057,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	857 ASSERT_EQ("Some private tag2", vv["7059,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	858 ASSERT_EQ("Sébastien", vv["0010,0010"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	859 ASSERT_EQ("Sebastien", vv["0008,1030"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	860 ASSERT_EQ("ISO_IR 148", vv["0008,0005"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	861 ASSERT_EQ("5", vv[DICOM_TAG_ROWS.Format()].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	862 ASSERT_EQ("5", vv[DICOM_TAG_COLUMNS.Format()].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	863 ASSERT_TRUE(vv[DICOM_TAG_PIXEL_DATA.Format()].asString().empty());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	864 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	865 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	866
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	867
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	868
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	869 TEST(TestImages, PatternGrayscale8)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	870 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	871 static const char* PATH = "UnitTestsResults/PatternGrayscale8.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	872
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	873 Orthanc::Image image(Orthanc::PixelFormat_Grayscale8, 256, 256, false);
1941 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 for (int y = 0; y < 256; 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 uint8_t p = reinterpret_cast<uint8_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	878 for (int x = 0; x < 256; x++, p++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	879 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	880 *p = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	881 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	882 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	883
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	884 Orthanc::ImageAccessor r;
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	885
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	886 image.GetRegion(r, 32, 32, 64, 192);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	887 Orthanc::ImageProcessing::Set(r, 0);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	888
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	889 image.GetRegion(r, 160, 32, 64, 192);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	890 Orthanc::ImageProcessing::Set(r, 255);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	891
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	892 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	893 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	894 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	895 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	896 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	897 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	898 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	899 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "Grayscale8");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	900 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	901
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	902 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	903 }
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 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	906 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	907 Orthanc::SystemToolbox::ReadFile(s, PATH);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	908 Orthanc::ParsedDicomFile f(s);
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 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	911 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	912 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	913 ASSERT_EQ(Orthanc::PixelFormat_Grayscale8, decoded->GetFormat());
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	914
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	915 for (int y = 0; y < 256; y++)
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 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	918 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	919 ASSERT_EQ(0, memcmp(a, b, 256));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	920 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	921 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	922 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	923
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	924
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	925 TEST(TestImages, PatternRGB)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	926 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	927 static const char* PATH = "UnitTestsResults/PatternRGB24.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	928
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	929 Orthanc::Image image(Orthanc::PixelFormat_RGB24, 384, 256, false);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	930
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	931 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	932 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	933 uint8_t p = reinterpret_cast<uint8_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	934 for (int x = 0; x < 128; x++, p += 3)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	935 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	936 p[0] = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	937 p[1] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	938 p[2] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	939 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	940 for (int x = 128; x < 128 * 2; x++, p += 3)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	941 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	942 p[0] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	943 p[1] = 255 - y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	944 p[2] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	945 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	946 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	947 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	948 p[0] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	949 p[1] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	950 p[2] = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	951 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	952 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	953
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	954 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	955 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	956 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	957 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	958 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	959 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	960 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	961 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "RGB24");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	962 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	963
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	964 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	965 }
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 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	968 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	969 Orthanc::SystemToolbox::ReadFile(s, PATH);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	970 Orthanc::ParsedDicomFile f(s);
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 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	973 ASSERT_EQ(384u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	974 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	975 ASSERT_EQ(Orthanc::PixelFormat_RGB24, decoded->GetFormat());
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	976
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	977 for (int y = 0; y < 256; y++)
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 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	980 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	981 ASSERT_EQ(0, memcmp(a, b, 3 * 384));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	982 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	983 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	984 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	985
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	986
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	987 TEST(TestImages, PatternUint16)
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	988 {
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	989 static const char* PATH = "UnitTestsResults/PatternGrayscale16.dcm";
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	990
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	991 Orthanc::Image image(Orthanc::PixelFormat_Grayscale16, 256, 256, false);
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	992
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	993 uint16_t v = 0;
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	994 for (int y = 0; y < 256; y++)
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 uint16_t p = reinterpret_cast<uint16_t>(image.GetRow(y));
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	997 for (int x = 0; x < 256; x++, v++, p++)
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	998 {
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	999 *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	1000 }
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	1001 }
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	1002
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1003 Orthanc::ImageAccessor r;
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1004
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1005 image.GetRegion(r, 32, 32, 64, 192);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1006 Orthanc::ImageProcessing::Set(r, 0);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1007
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1008 image.GetRegion(r, 160, 32, 64, 192);
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1009 Orthanc::ImageProcessing::Set(r, 65535);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1010
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1011 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1012 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1013 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	1014 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	1015 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	1016 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	1017 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	1018 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "Grayscale16");
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1019 f.EmbedImage(image);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1020
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1021 f.SaveToFile(PATH);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1022 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	1023
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1024 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1025 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	1026 Orthanc::SystemToolbox::ReadFile(s, PATH);
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1027 Orthanc::ParsedDicomFile f(s);
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 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	1030 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	1031 ASSERT_EQ(256u, decoded->GetHeight());
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1032 ASSERT_EQ(Orthanc::PixelFormat_Grayscale16, decoded->GetFormat());
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1033
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1034 for (int y = 0; y < 256; y++)
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1035 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1036 const void* a = image.GetConstRow(y);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1037 const void* b = decoded->GetConstRow(y);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1038 ASSERT_EQ(0, memcmp(a, b, 512));
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1039 }
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	1040 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	1041 }
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1042
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1043
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1044 TEST(TestImages, PatternInt16)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1045 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1046 static const char* PATH = "UnitTestsResults/PatternSignedGrayscale16.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1047
2107 88831c3edd8f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	1048 Orthanc::Image image(Orthanc::PixelFormat_SignedGrayscale16, 256, 256, false);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1049
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1050 int16_t v = -32768;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1051 for (int y = 0; y < 256; y++)
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 int16_t p = reinterpret_cast<int16_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1054 for (int x = 0; x < 256; x++, v++, p++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1055 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1056 *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	1057 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1058 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1059
2861 9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1060 Orthanc::ImageAccessor r;
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1061 image.GetRegion(r, 32, 32, 64, 192);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1062 Orthanc::ImageProcessing::Set(r, -32768);
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1063
9b4251721f22 ImageAccessor now non-copyable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1064 image.GetRegion(r, 160, 32, 64, 192);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1065 Orthanc::ImageProcessing::Set(r, 32767);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1066
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1067 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1068 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	1069 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	1070 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	1071 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	1072 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	1073 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	1074 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "SignedGrayscale16");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1075 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1076
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1077 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1078 }
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 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1081 std::string s;
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	1082 Orthanc::SystemToolbox::ReadFile(s, PATH);
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1083 Orthanc::ParsedDicomFile f(s);
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 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	1086 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	1087 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1088 ASSERT_EQ(Orthanc::PixelFormat_SignedGrayscale16, decoded->GetFormat());
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1089
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1090 for (int y = 0; y < 256; y++)
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 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1093 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1094 ASSERT_EQ(0, memcmp(a, b, 512));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1095 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1096 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	1097 }
2202 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
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1100
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1101 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	1102 Encoding expected)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1103 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1104 const char* value = NULL;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1105 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	1106
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1107 Encoding encoding;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1108 ASSERT_TRUE(GetDicomEncoding(encoding, value));
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1109 ASSERT_EQ(expected, encoding);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1110 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1111
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 TEST(ParsedDicomFile, DicomMapEncodings1)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1114 {
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1115 SetDefaultDicomEncoding(Encoding_Ascii);
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2326 diff changeset	1116 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	1117
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1118 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1119 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1120 ParsedDicomFile dicom(m);
2411 82d5e305fbd9 fix gcc warnings in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2409 diff changeset	1121 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	1122 CheckEncoding(dicom, Encoding_Ascii);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1123 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1124
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1125 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1126 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1127 ParsedDicomFile dicom(m, Encoding_Latin4);
2411 82d5e305fbd9 fix gcc warnings in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2409 diff changeset	1128 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	1129 CheckEncoding(dicom, Encoding_Latin4);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1130 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1131
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1132 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1133 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1134 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	1135 ParsedDicomFile dicom(m);
2411 82d5e305fbd9 fix gcc warnings in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2409 diff changeset	1136 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	1137 CheckEncoding(dicom, Encoding_Latin5);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1138 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1139
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1140 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1141 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1142 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	1143 ParsedDicomFile dicom(m, Encoding_Latin1);
2411 82d5e305fbd9 fix gcc warnings in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2409 diff changeset	1144 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	1145 CheckEncoding(dicom, Encoding_Latin5);
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 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1148
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 TEST(ParsedDicomFile, DicomMapEncodings2)
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 const char* utf8 = NULL;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1153 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	1154 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1155 if (testEncodings[i] == Encoding_Utf8)
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 utf8 = testEncodingsEncoded[i];
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1158 break;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1159 }
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
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1162 ASSERT_TRUE(utf8 != NULL);
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 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	1165 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1166 // 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	1167 if (testEncodings[i] != Encoding_Windows1251)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1168 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1169 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1170 // 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	1171 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	1172 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	1173 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	1174 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	1175
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1176 if (testEncodings[i] != Encoding_Chinese)
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1177 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1178 // 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	1179 // 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	1180
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1181 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	1182 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	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
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1186
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1187 Json::Value v;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1188
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 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1191 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	1192
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1193 ParsedDicomFile dicom(m, testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1194
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1195 const char* encoded = NULL;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1196 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	1197 ASSERT_STREQ(testEncodingsEncoded[i], encoded);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1198
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1199 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	1200
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1201 Encoding encoding;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1202 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	1203 ASSERT_EQ(encoding, testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1204 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	1205 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1206
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 {
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1209 DicomMap m;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1210 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	1211 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	1212
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1213 ParsedDicomFile dicom(m, testEncodings[i]);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1214
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1215 Json::Value v2;
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1216 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	1217
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1218 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	1219 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	1220 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1221 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1222 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	1223 }
2207 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
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1226 TEST(ParsedDicomFile, ChangeEncoding)
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 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	1229 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1230 // 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	1231 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	1232 {
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1233 DicomMap m;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1234 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	1235
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1236 std::string tag;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1237
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1238 ParsedDicomFile dicom(m, Encoding_Utf8);
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1239 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1240 ASSERT_EQ(Encoding_Utf8, dicom.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1241 ASSERT_FALSE(hasCodeExtensions);
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1242 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	1243 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	1244
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 Json::Value v;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1247 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	1248 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	1249 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	1250 }
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 dicom.ChangeEncoding(testEncodings[i]);
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1253
3217 cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1254 ASSERT_EQ(testEncodings[i], dicom.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1255 ASSERT_FALSE(hasCodeExtensions);
2207 6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1256
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1257 const char* c = NULL;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1258 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	1259 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	1260
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1261 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	1262 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	1263
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 Json::Value v;
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1266 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	1267 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	1268 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	1269 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1270 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1271 }
6dc3bdb4088b Fix handling of encodings in C-FIND for worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 2202 diff changeset	1272 }
2326 423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1273
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1274
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1275 TEST(Toolbox, CaseWithAccents)
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1276 {
423d3b692bb9 Upgrade to Boost 1.64.0, and Toolbox::ToUpperCaseWithAccents Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	1277 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	1278 }
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	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
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
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 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	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 {
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1285 // 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	1286 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	1287 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	1288
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 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	1290
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1291 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1292 ASSERT_EQ(Encoding_Latin3, d.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1293 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	1294 }
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
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 // 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	1298 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	1299 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	1300 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	1301
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 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	1303
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1304 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1305 ASSERT_EQ(Encoding_Japanese, d.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1306 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	1307 }
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
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 // 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	1311 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	1312 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	1313 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	1314
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 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	1316 }
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
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 // 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	1320 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	1321 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	1322 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	1323
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 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	1325 }
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
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 {
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 // 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	1329 // 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	1330 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	1331 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	1332 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	1333
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 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	1335
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1336 bool hasCodeExtensions;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1337 ASSERT_EQ(Encoding_Latin3, d.DetectEncoding(hasCodeExtensions));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1338 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	1339 }
6e5bc5c6d1a4 Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2411 diff changeset	1340 }
3217 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
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 TEST(Toolbox, RemoveIso2022EscapeSequences)
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1345 {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1346 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1347 // \| one-byte control messages \|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1348 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1349
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1350 static const uint8_t iso2022_cstr_oneByteControl[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1351 0x0f, 0x41,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1352 0x0e, 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1353 0x8e, 0x1b, 0x4e, 0x43,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1354 0x8f, 0x1b, 0x4f, 0x44,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1355 0x8e, 0x1b, 0x4a, 0x45,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1356 0x8f, 0x1b, 0x4a, 0x46,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1357 0x50, 0x51, 0x52, 0x00
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1358 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1359
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1360 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	1361 0x41,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1362 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1363 0x43,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1364 0x44,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1365 0x8e, 0x1b, 0x4a, 0x45,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1366 0x8f, 0x1b, 0x4a, 0x46,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1367 0x50, 0x51, 0x52, 0x00
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
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1370 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1371 // \| two-byte control messages \|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1372 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1373
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1374 static const uint8_t iso2022_cstr_twoByteControl[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1375 0x1b, 0x6e, 0x41,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1376 0x1b, 0x6f, 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1377 0x1b, 0x4e, 0x43,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1378 0x1b, 0x4f, 0x44,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1379 0x1b, 0x7e, 0x45,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1380 0x1b, 0x7d, 0x46,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1381 0x1b, 0x7c, 0x47, 0x00
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1382 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1383
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1384 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	1385 0x41,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1386 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1387 0x43,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1388 0x44,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1389 0x45,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1390 0x46,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1391 0x47, 0x00
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
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1394 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1395 // \| various-length escape sequences \|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1396 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1397
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1398 static const uint8_t iso2022_cstr_escapeSequence[] = {
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1399 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	1400 0x1b, 0x50, 0x42, // ditto
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1401 0x1b, 0x7f, 0x43, // ditto
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1402 0x1b, 0x21, 0x4a, 0x44, // this will match
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1403 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	1404 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	1405 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	1406 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1407
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1408 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	1409 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	1410 0x1b, 0x50, 0x42, // ditto
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1411 0x1b, 0x7f, 0x43, // ditto
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1412 0x44, // this will match
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1413 0x45, // this will match
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1414 0x46, // this will match too
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1415 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	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
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1419 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1420 // \| a real-world japanese sample \|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1421 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1422
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1423 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	1424 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	1425 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	1426 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	1427 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	1428 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	1429 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	1430 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	1431 };
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1432
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1433 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	1434 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	1435 0x3d,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1436 0x3b, 0x33, 0x45, 0x44,
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 0x42,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1439 0x40, 0x4f, 0x3a,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1440 0x3d,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1441 0x24, 0x64, 0x24, 0x5e, 0x24, 0x40,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1442 0x5e,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1443 0x24,
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1444 0x3f, 0x24, 0x6d, 0x24, 0x26, 0x00
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1445 };
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
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1449 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1450 // \| the actual test \|
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1451 // +----------------------------------+
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1452
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1453 std::string iso2022_str_oneByteControl(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1454 reinterpret_cast<const char*>(iso2022_cstr_oneByteControl));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1455 std::string iso2022_str_oneByteControl_ref(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1456 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	1457 std::string iso2022_str_twoByteControl(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1458 reinterpret_cast<const char*>(iso2022_cstr_twoByteControl));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1459 std::string iso2022_str_twoByteControl_ref(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1460 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	1461 std::string iso2022_str_escapeSequence(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1462 reinterpret_cast<const char*>(iso2022_cstr_escapeSequence));
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1463 std::string iso2022_str_escapeSequence_ref(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1464 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	1465 std::string iso2022_str_real_ir13(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1466 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	1467 std::string iso2022_str_real_ir13_ref(
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1468 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	1469
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1470 std::string dest;
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1471
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1472 Toolbox::RemoveIso2022EscapeSequences(dest, iso2022_str_oneByteControl);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1473 ASSERT_EQ(dest, iso2022_str_oneByteControl_ref);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1474
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1475 Toolbox::RemoveIso2022EscapeSequences(dest, iso2022_str_twoByteControl);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1476 ASSERT_EQ(dest, iso2022_str_twoByteControl_ref);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1477
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1478 Toolbox::RemoveIso2022EscapeSequences(dest, iso2022_str_escapeSequence);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1479 ASSERT_EQ(dest, iso2022_str_escapeSequence_ref);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1480
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1481 Toolbox::RemoveIso2022EscapeSequences(dest, iso2022_str_real_ir13);
cf8cbeb35f33 preliminary support of Korean character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	1482 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	1483 }
3221 4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1484
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1485
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1486
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1487 static std::string DecodeFromSpecification(const std::string& s)
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1488 {
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1489 std::vector<std::string> tokens;
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1490 Toolbox::TokenizeString(tokens, s, ' ');
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1491
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1492 std::string result;
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1493 result.resize(tokens.size());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1494
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1495 for (size_t i = 0; i < tokens.size(); i++)
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1496 {
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1497 std::vector<std::string> components;
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1498 Toolbox::TokenizeString(components, tokens[i], '/');
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1499
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1500 if (components.size() != 2)
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1501 {
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1502 throw;
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1503 }
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1504
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1505 int a = boost::lexical_cast<int>(components[0]);
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1506 int b = boost::lexical_cast<int>(components[1]);
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1507 if (a < 0 \|\| a > 15 \|\|
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1508 b < 0 \|\| b > 15)
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1509 {
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1510 throw;
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1511 }
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1512
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1513 result[i] = static_cast<uint8_t>(a * 16 + b);
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1514 }
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1515
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1516 return result;
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1517 }
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1518
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1519
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1520
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1521 TEST(Toolbox, EncodingsKorean)
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1522 {
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1523 // http://dicom.nema.org/MEDICAL/dicom/2017c/output/chtml/part05/sect_I.2.html
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1524
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1525 std::string korean = DecodeFromSpecification(
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1526 "04/08 06/15 06/14 06/07 05/14 04/07 06/09 06/12 06/04 06/15 06/14 06/07 03/13 "
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1527 "01/11 02/04 02/09 04/03 15/11 15/03 05/14 01/11 02/04 02/09 04/03 13/01 12/14 "
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1528 "13/04 13/07 03/13 01/11 02/04 02/09 04/03 12/08 10/11 05/14 01/11 02/04 02/09 "
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1529 "04/03 11/01 14/06 11/05 11/15");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1530
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1531 // This array can be re-generated using command-line:
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1532 // echo -n "Hong^Gildong=..." \| hexdump -v -e '14/1 "0x%02x, "' -e '"\n"'
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1533 static const uint8_t utf8raw[] = {
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1534 0x48, 0x6f, 0x6e, 0x67, 0x5e, 0x47, 0x69, 0x6c, 0x64, 0x6f, 0x6e, 0x67, 0x3d, 0xe6,
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1535 0xb4, 0xaa, 0x5e, 0xe5, 0x90, 0x89, 0xe6, 0xb4, 0x9e, 0x3d, 0xed, 0x99, 0x8d, 0x5e,
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1536 0xea, 0xb8, 0xb8, 0xeb, 0x8f, 0x99
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1537 };
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1538
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1539 std::string utf8(reinterpret_cast<const char*>(utf8raw), sizeof(utf8raw));
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1540
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1541 ParsedDicomFile dicom(false);
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1542 dicom.ReplacePlainString(DICOM_TAG_SPECIFIC_CHARACTER_SET, "\\ISO 2022 IR 149");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1543 ASSERT_TRUE(dicom.GetDcmtkObject().getDataset()->putAndInsertString
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1544 (DCM_PatientName, korean.c_str(), korean.size(), true).good());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1545
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1546 std::string value;
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1547 ASSERT_TRUE(dicom.GetTagValue(value, DICOM_TAG_PATIENT_NAME));
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1548 ASSERT_EQ(utf8, value);
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1549
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1550 DicomWebJsonVisitor visitor;
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1551 dicom.Apply(visitor);
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1552 ASSERT_EQ(utf8.substr(0, 12), visitor.GetResult()["00100010"]["Value"][0]["Alphabetic"].asString());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1553 ASSERT_EQ(utf8.substr(13, 10), visitor.GetResult()["00100010"]["Value"][0]["Ideographic"].asString());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1554 ASSERT_EQ(utf8.substr(24), visitor.GetResult()["00100010"]["Value"][0]["Phonetic"].asString());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1555
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1556 #if ORTHANC_ENABLE_PUGIXML == 1
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1557 // http://dicom.nema.org/medical/dicom/current/output/chtml/part18/sect_F.3.html#table_F.3.1-1
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1558 std::string xml;
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1559 visitor.FormatXml(xml);
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1560
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1561 pugi::xml_document doc;
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1562 doc.load_string(xml.c_str());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1563
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1564 pugi::xpath_node node = doc.select_single_node("//NativeDicomModel/DicomAttribute[@tag=\"00080005\"]/Value");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1565 ASSERT_STREQ("ISO_IR 192", node.node().text().as_string());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1566
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1567 node = doc.select_single_node("//NativeDicomModel/DicomAttribute[@tag=\"00080005\"]");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1568 ASSERT_STREQ("CS", node.node().attribute("vr").value());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1569
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1570 node = doc.select_single_node("//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1571 ASSERT_STREQ("PN", node.node().attribute("vr").value());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1572
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1573 node = doc.select_single_node("//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]/PersonName/Alphabetic/FamilyName");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1574 ASSERT_STREQ("Hong", node.node().text().as_string());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1575
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1576 node = doc.select_single_node("//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]/PersonName/Alphabetic/GivenName");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1577 ASSERT_STREQ("Gildong", node.node().text().as_string());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1578
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1579 node = doc.select_single_node("//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]/PersonName/Ideographic/FamilyName");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1580 ASSERT_EQ(utf8.substr(13, 3), node.node().text().as_string());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1581
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1582 node = doc.select_single_node("//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]/PersonName/Ideographic/GivenName");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1583 ASSERT_EQ(utf8.substr(17, 6), node.node().text().as_string());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1584
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1585 node = doc.select_single_node("//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]/PersonName/Phonetic/FamilyName");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1586 ASSERT_EQ(utf8.substr(24, 3), node.node().text().as_string());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1587
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1588 node = doc.select_single_node("//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]/PersonName/Phonetic/GivenName");
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1589 ASSERT_EQ(utf8.substr(28), node.node().text().as_string());
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1590 #endif
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1591 }
4be505c2ac56 Separation of ideographic and phonetic characters in DICOMweb JSON and XML Sebastien Jodogne <s.jodogne@gmail.com> parents: 3219 diff changeset	1592

Mercurial > hg > orthanc

annotate UnitTestsSources/FromDcmtkTests.cpp @ 3221:4be505c2ac56