orthanc: UnitTestsSources/FromDcmtkTests.cpp annotate

annotate UnitTestsSources/FromDcmtkTests.cpp @ 1982:b5d4f9c156ad

Modification of instances can now replace PixelData

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 22 Apr 2016 10:28:55 +0200
parents	4b545a8b1f95
children	6301bbcbcaed

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
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	5 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	6 * 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	7 * 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	8 * 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	9 * License, or (at your option) any later version.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	10 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	11 * 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	12 * 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	13 * 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	14 * 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	15 * 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	16 * 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	17 * 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	18 * 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	19 * 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	20 * 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	21 * in the program, then also delete it here.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	22 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	23 * 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	24 * 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	25 * 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	26 * General Public License for more details.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	27 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 809 diff changeset	28 * 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	29 * 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	30 **/
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
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 827 diff changeset	33 #include "PrecompiledHeadersUnitTests.h"
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "gtest/gtest.h"
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include "../OrthancServer/FromDcmtkBridge.h"
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #include "../OrthancServer/OrthancInitialization.h"
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 785 diff changeset	38 #include "../OrthancServer/DicomModification.h"
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	39 #include "../OrthancServer/ServerToolbox.h"
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	40 #include "../Core/OrthancException.h"
1612 96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	41 #include "../Core/Images/ImageBuffer.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	42 #include "../Core/Images/PngReader.h"
96582230ddcb Core/ImageFormats folder renamed as Core/Images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	43 #include "../Core/Images/PngWriter.h"
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	44 #include "../Core/Images/Image.h"
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	45 #include "../Core/Images/ImageProcessing.h"
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	46 #include "../Core/Uuid.h"
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	47 #include "../Core/Endianness.h"
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	48 #include "../Resources/EncodingTests.h"
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	49 #include "../OrthancServer/DicomProtocol/DicomFindAnswers.h"
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	50 #include "../OrthancServer/Internals/DicomImageDecoder.h"
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	52 #include <dcmtk/dcmdata/dcelem.h>
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	53
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 using namespace Orthanc;
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 TEST(DicomFormat, Tag)
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 {
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 ASSERT_EQ("PatientName", FromDcmtkBridge::GetName(DicomTag(0x0010, 0x0010)));
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 DicomTag t = FromDcmtkBridge::ParseTag("SeriesDescription");
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 ASSERT_EQ(0x0008, t.GetGroup());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 ASSERT_EQ(0x103E, t.GetElement());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 t = FromDcmtkBridge::ParseTag("0020-e040");
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 ASSERT_EQ(0x0020, t.GetGroup());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 ASSERT_EQ(0xe040, t.GetElement());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 // Test ==() and !=() operators
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 ASSERT_TRUE(DICOM_TAG_PATIENT_ID == DicomTag(0x0010, 0x0020));
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 ASSERT_FALSE(DICOM_TAG_PATIENT_ID != DicomTag(0x0010, 0x0020));
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 }
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	74 TEST(DicomModification, Basic)
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	75 {
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	76 DicomModification m;
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	77 m.SetupAnonymization();
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	78 //m.SetLevel(DicomRootLevel_Study);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	79 //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	80 //m.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "coucou");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	81
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	82 ParsedDicomFile o(true);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	83 o.SaveToFile("UnitTestsResults/anon.dcm");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	84
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	85 for (int i = 0; i < 10; i++)
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	86 {
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	87 char b[1024];
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	88 sprintf(b, "UnitTestsResults/anon%06d.dcm", i);
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	89 std::auto_ptr<ParsedDicomFile> f(o.Clone());
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	90 if (i > 4)
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	91 o.ReplacePlainString(DICOM_TAG_SERIES_INSTANCE_UID, "coucou");
784 efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	92 m.Apply(*f);
efd0215736d9 start of anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	93 f->SaveToFile(b);
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 }
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	96
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	97
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	98 TEST(DicomModification, Anonymization)
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	99 {
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	100 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	101
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	102 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	103 const DicomTag privateTag2(FromDcmtkBridge::ParseTag("0031-1020"));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	104 ASSERT_TRUE(privateTag.IsPrivate());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	105 ASSERT_TRUE(privateTag2.IsPrivate());
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	106 ASSERT_EQ(0x0031, privateTag2.GetGroup());
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	107 ASSERT_EQ(0x1020, privateTag2.GetElement());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	108
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	109 std::string s;
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	110 ParsedDicomFile o(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	111 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	112 ASSERT_FALSE(o.GetTagValue(s, privateTag));
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	113 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	114 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	115 ASSERT_STREQ("private tag", s.c_str());
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 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	118 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	119 ASSERT_FALSE(o.GetTagValue(s, privateTag2));
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	120 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	121 ASSERT_FALSE(o.GetTagValue(s, privateTag2));
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	122 o.Replace(privateTag2, std::string("hello"), false, DicomReplaceMode_InsertIfAbsent);
1307 f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	123 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	124 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	125 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	126 ASSERT_TRUE(o.GetTagValue(s, privateTag2));
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	127 ASSERT_STREQ("hello world", s.c_str());
f796207e3df1 Fix replacement and insertion of private DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	128
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	129 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	130 ASSERT_FALSE(Toolbox::IsUuid(s));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	131
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	132 DicomModification m;
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	133 m.SetupAnonymization();
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	134 m.Keep(privateTag);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	135
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	136 m.Apply(o);
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	137
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	138 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	139 ASSERT_TRUE(Toolbox::IsUuid(s));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	140 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	141 ASSERT_STREQ("private tag", s.c_str());
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	142
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	143 m.SetupAnonymization();
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 ASSERT_FALSE(o.GetTagValue(s, privateTag));
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	146 }
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	147
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	148
802 82b07ab959f4 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 800 diff changeset	149 #include <dcmtk/dcmdata/dcuid.h>
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	150
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	151 TEST(DicomModification, Png)
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	152 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	153 // 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	154 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	155
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1612 diff changeset	156 std::string m, cc;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	157 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	158
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	159 ASSERT_EQ("image/png", m);
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 PngReader reader;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	162 reader.ReadFromMemory(cc);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	163
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1417 diff changeset	164 ASSERT_EQ(5u, reader.GetHeight());
9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1417 diff changeset	165 ASSERT_EQ(5u, reader.GetWidth());
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	166 ASSERT_EQ(PixelFormat_RGBA32, reader.GetFormat());
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	167
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	168 ParsedDicomFile o(true);
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	169 o.EmbedContent(s);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	170 o.SaveToFile("UnitTestsResults/png1.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	171
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	172 // Red dot, without alpha channel
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	173 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	174 o.EmbedContent(s);
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	175 o.SaveToFile("UnitTestsResults/png2.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	176
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	177 // Check box in Graylevel8
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	178 s = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gUGDDcB53FulQAAAElJREFUGNNtj0sSAEEEQ1+U+185s1CtmRkblQ9CZldsKHJDk6DLGLJa6chjh0ooQmpjXMM86zPwydGEj6Ed/UGykkEM8X+p3u8/8LcOJIWLGeMAAAAASUVORK5CYII=";
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	179 o.EmbedContent(s);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	180 //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	181 o.SaveToFile("UnitTestsResults/png3.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	182
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	183
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 // Gradient in Graylevel16
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	186
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	187 ImageBuffer img;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	188 img.SetWidth(256);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	189 img.SetHeight(256);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	190 img.SetFormat(PixelFormat_Grayscale16);
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	191
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	192 uint16_t v = 0;
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	193 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	194 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	195 uint16_t p = reinterpret_cast<uint16_t>(img.GetAccessor().GetRow(y));
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	196 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	197 {
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	198 *p = v;
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	199 }
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	200 }
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	201
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	202 o.EmbedImage(img.GetAccessor());
803 4689e400e0fa directory to store the results of the unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 802 diff changeset	203 o.SaveToFile("UnitTestsResults/png4.dcm");
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	204 }
ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	205 }
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	206
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	207
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	208 TEST(FromDcmtkBridge, Encodings1)
1088 6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	209 {
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	210 for (unsigned int i = 0; i < testEncodingsCount; i++)
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	211 {
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	212 std::string source(testEncodingsEncoded[i]);
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	213 std::string expected(testEncodingsExpected[i]);
6fd4434c1bcf unit tests for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	214 std::string s = Toolbox::ConvertToUtf8(source, testEncodings[i]);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	215 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
1089 5ea0b56e850d logging in test jodogne parents: 1088 diff changeset	216 EXPECT_EQ(expected, s);
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
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	220
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	221 TEST(FromDcmtkBridge, Enumerations)
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	222 {
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	223 // 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	224 Encoding e;
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	225
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	226 ASSERT_FALSE(GetDicomEncoding(e, ""));
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	227 ASSERT_TRUE(GetDicomEncoding(e, "ISO_IR 6")); ASSERT_EQ(Encoding_Utf8, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	228
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	229 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#table_C.12-2
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	230 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	231 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	232 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	233 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	234 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	235 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	236 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	237 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	238 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	239 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	240 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	241
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	242 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#table_C.12-3
5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	243 ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 6")); ASSERT_EQ(Encoding_Utf8, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	244 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	245 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	246 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	247 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	248 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	249 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	250 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	251 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	252 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	253 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	254 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	255
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	256 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#table_C.12-4
5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	257 ASSERT_FALSE(GetDicomEncoding(e, "ISO 2022 IR 87")); //ASSERT_EQ(Encoding_JapaneseKanji, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	258 ASSERT_FALSE(GetDicomEncoding(e, "ISO 2022 IR 159")); //ASSERT_EQ(Encoding_JapaneseKanjiSupplementary, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	259 ASSERT_FALSE(GetDicomEncoding(e, "ISO 2022 IR 149")); //ASSERT_EQ(Encoding_Korean, e);
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	260
1908 5096681efce6 direct hyperlinks to the DICOM standard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	261 // 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	262 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	263 ASSERT_TRUE(GetDicomEncoding(e, "GB18030")); ASSERT_EQ(Encoding_Chinese, e);
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	264 }
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	265
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	266
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	267 TEST(FromDcmtkBridge, Encodings3)
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	268 {
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	269 for (unsigned int i = 0; i < testEncodingsCount; i++)
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	270 {
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	271 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	272 std::string dicom;
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	273
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	274 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	275 ParsedDicomFile f(true);
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	276 f.SetEncoding(testEncodings[i]);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	277
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	278 std::string s = Toolbox::ConvertToUtf8(testEncodingsEncoded[i], testEncodings[i]);
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	279 f.Insert(DICOM_TAG_PATIENT_NAME, s, false);
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	280 f.SaveToMemoryBuffer(dicom);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	281 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	282
1347 60cc0ee61edb fix issue 32 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1334 diff changeset	283 if (testEncodings[i] != Encoding_Windows1251)
1091 a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	284 {
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	285 ParsedDicomFile g(dicom);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	286
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	287 if (testEncodings[i] != Encoding_Ascii)
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	288 {
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	289 ASSERT_EQ(testEncodings[i], g.GetEncoding());
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	290 }
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	291
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	292 std::string tag;
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	293 ASSERT_TRUE(g.GetTagValue(tag, DICOM_TAG_PATIENT_NAME));
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	294 ASSERT_EQ(std::string(testEncodingsExpected[i]), tag);
a66224eec125 encoding tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1090 diff changeset	295 }
1090 e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	296 }
e494ceb8d763 support more encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1089 diff changeset	297 }
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	298
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	299
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	300 TEST(FromDcmtkBridge, ValueRepresentation)
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	301 {
1417 8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	302 ASSERT_EQ(ValueRepresentation_PatientName,
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	303 FromDcmtkBridge::GetValueRepresentation(DICOM_TAG_PATIENT_NAME));
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	304 ASSERT_EQ(ValueRepresentation_Date,
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	305 FromDcmtkBridge::GetValueRepresentation(DicomTag(0x0008, 0x0020) /* StudyDate */));
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	306 ASSERT_EQ(ValueRepresentation_Time,
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	307 FromDcmtkBridge::GetValueRepresentation(DicomTag(0x0008, 0x0030) /* StudyTime */));
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	308 ASSERT_EQ(ValueRepresentation_DateTime,
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	309 FromDcmtkBridge::GetValueRepresentation(DicomTag(0x0008, 0x002a) /* AcquisitionDateTime */));
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	310 ASSERT_EQ(ValueRepresentation_Other,
8e23f16a198d fix issues 35 and 37 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	311 FromDcmtkBridge::GetValueRepresentation(DICOM_TAG_PATIENT_ID));
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1347 diff changeset	312 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	313
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	314
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	315
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	316 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	317 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	318
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	319 static void CreateSampleJson(Json::Value& a)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	320 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	321 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	322 Json::Value b = Json::objectValue;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	323 b["PatientName"] = "Hello";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	324 b["PatientID"] = "World";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	325 b["StudyDescription"] = "Toto";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	326 a.append(b);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	327 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	328
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	329 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	330 Json::Value b = Json::objectValue;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	331 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	332 b["PatientID"] = "World2";
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	333 a.append(b);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	334 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	335 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	336
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	337
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	338 TEST(FromDcmtkBridge, FromJson)
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	339 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	340 std::auto_ptr<DcmElement> element;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	341
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	342 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	343 Json::Value a;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	344 a = "Hello";
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	345 element.reset(FromDcmtkBridge::FromJson(DICOM_TAG_PATIENT_NAME, a, false, Encoding_Utf8));
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	346
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	347 Json::Value b;
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	348 FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0, Encoding_Ascii);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	349 ASSERT_EQ("Hello", b["0010,0010"].asString());
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	350 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	351
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	352 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	353 Json::Value a;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	354 a = "Hello";
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	355 // Cannot assign a string to a sequence
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	356 ASSERT_THROW(element.reset(FromDcmtkBridge::FromJson(REFERENCED_STUDY_SEQUENCE, a, false, Encoding_Utf8)), OrthancException);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	357 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	358
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	359 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	360 Json::Value a = Json::arrayValue;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	361 a.append("Hello");
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	362 // Cannot assign an array to a string
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	363 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	364 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	365
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	366 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	367 Json::Value a;
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	368 a = "data:application/octet-stream;base64,SGVsbG8="; // echo -n "Hello" \| base64
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	369 element.reset(FromDcmtkBridge::FromJson(DICOM_TAG_PATIENT_NAME, a, true, Encoding_Utf8));
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	370
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	371 Json::Value b;
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	372 FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0, Encoding_Ascii);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	373 ASSERT_EQ("Hello", b["0010,0010"].asString());
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	374 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	375
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	376 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	377 Json::Value a = Json::arrayValue;
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	378 CreateSampleJson(a);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	379 element.reset(FromDcmtkBridge::FromJson(REFERENCED_STUDY_SEQUENCE, a, true, Encoding_Utf8));
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	380
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	381 {
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	382 Json::Value b;
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	383 FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0, Encoding_Ascii);
1691 e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	384 ASSERT_EQ(Json::arrayValue, b["0008,1110"].type());
1970 a1c1c606ce98 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1941 diff changeset	385 ASSERT_EQ(2u, b["0008,1110"].size());
1691 e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	386
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	387 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	388
1970 a1c1c606ce98 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1941 diff changeset	389 ASSERT_EQ(3u, b["0008,1110"][i].size());
a1c1c606ce98 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1941 diff changeset	390 ASSERT_EQ(2u, b["0008,1110"][1 - i].size());
1691 e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	391 ASSERT_EQ(b["0008,1110"][i]["0010,0010"].asString(), "Hello");
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	392 ASSERT_EQ(b["0008,1110"][i]["0010,0020"].asString(), "World");
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	393 ASSERT_EQ(b["0008,1110"][i]["0008,1030"].asString(), "Toto");
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	394 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0010"].asString(), "Hello2");
e447f3cb8b30 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1690 diff changeset	395 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0020"].asString(), "World2");
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	396 }
ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	397
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	398 {
4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	399 Json::Value b;
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	400 FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0, Encoding_Ascii);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	401
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	402 Json::Value c;
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	403 Toolbox::SimplifyTags(c, b, DicomToJsonFormat_Human);
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	404
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	405 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding
1692 4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	406 ASSERT_EQ(0, c["ReferencedStudySequence"].compare(a));
4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	407 }
4eaf164dd574 test SimplifyTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1691 diff changeset	408 }
1690 ae09132e4237 FromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1654 diff changeset	409 }
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	410
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	411
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	412
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	413 TEST(ParsedDicomFile, InsertReplaceStrings)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	414 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	415 ParsedDicomFile f(true);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	416
1699 8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	417 f.Insert(DICOM_TAG_PATIENT_NAME, "World", false);
8ca0e89798b2 "/modify" can insert/modify sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	418 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	419 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	420 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	421
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	422 std::string s;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	423
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	424 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	425 false, DicomReplaceMode_ThrowIfAbsent), OrthancException);
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	426 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	427 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	428 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	429 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	430 ASSERT_EQ(s, "Accession");
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	431 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	432 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	433 ASSERT_EQ(s, "Accession2");
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	434 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	435 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	436 ASSERT_EQ(s, "Accession3");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	437
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	438 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	439 ASSERT_EQ(s, "World");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	440 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	441 ASSERT_EQ(s, "Toto");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	442 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	443 ASSERT_EQ(s, "Toto");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	444 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	445 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	446 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	447 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	448 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	449
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	450
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	451
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	452
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	453 TEST(ParsedDicomFile, InsertReplaceJson)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	454 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	455 ParsedDicomFile f(true);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	456
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	457 Json::Value a;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	458 CreateSampleJson(a);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	459
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	460 ASSERT_FALSE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	461 f.Remove(REFERENCED_STUDY_SEQUENCE); // No effect
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	462 f.Insert(REFERENCED_STUDY_SEQUENCE, a, true);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	463 ASSERT_TRUE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	464 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	465 f.Remove(REFERENCED_STUDY_SEQUENCE);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	466 ASSERT_FALSE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	467 f.Insert(REFERENCED_STUDY_SEQUENCE, a, true);
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	468 ASSERT_TRUE(f.HasTag(REFERENCED_STUDY_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	469
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	470 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	471 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	472 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	473 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	474 ASSERT_FALSE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	475 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	476 ASSERT_TRUE(f.HasTag(REFERENCED_PATIENT_SEQUENCE));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	477
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	478 {
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	479 Json::Value b;
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	480 f.ToJson(b, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 0);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	481
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	482 Json::Value c;
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	483 Toolbox::SimplifyTags(c, b, DicomToJsonFormat_Human);
1693 558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	484
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	485 ASSERT_EQ(0, c["ReferencedPatientSequence"].compare(a));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	486 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	487 }
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	488
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	489 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	490 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	491 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	492
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	493 std::string s;
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	494 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_SOP_INSTANCE_UID));
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	495 ASSERT_EQ(s, a.asString());
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	496 ASSERT_TRUE(f.GetTagValue(s, DICOM_TAG_MEDIA_STORAGE_SOP_INSTANCE_UID)); // Implicitly modified by (*)
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	497 ASSERT_EQ(s, a.asString());
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	498 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	499 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	500 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	501 ASSERT_EQ(s, "Tata");
558b25228a23 creation of tag hierarchy from json Sebastien Jodogne <s.jodogne@gmail.com> parents: 1692 diff changeset	502 }
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	503
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	504
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	505 TEST(ParsedDicomFile, JsonEncoding)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	506 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	507 ParsedDicomFile f(true);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	508
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	509 for (unsigned int i = 0; i < testEncodingsCount; i++)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	510 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	511 if (testEncodings[i] != Encoding_Windows1251)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	512 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	513 //std::cout << EnumerationToString(testEncodings[i]) << std::endl;
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	514 f.SetEncoding(testEncodings[i]);
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	515
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	516 if (testEncodings[i] != Encoding_Ascii)
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	517 {
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	518 ASSERT_EQ(testEncodings[i], f.GetEncoding());
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	519 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	520
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	521 Json::Value s = Toolbox::ConvertToUtf8(testEncodingsEncoded[i], testEncodings[i]);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	522 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	523
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	524 Json::Value v;
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	525 f.ToJson(v, DicomToJsonFormat_Human, DicomToJsonFlags_Default, 0);
1695 18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	526 ASSERT_EQ(v["PatientName"].asString(), std::string(testEncodingsExpected[i]));
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	527 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	528 }
18c02c6987d5 fix for encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1693 diff changeset	529 }
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	530
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	531
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	532 TEST(ParsedDicomFile, ToJsonFlags1)
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	533 {
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	534 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7053, 0x1000), EVR_PN, "MyPrivateTag", 1, 1);
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	535 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7050, 0x1000), EVR_PN, "Declared public tag", 1, 1);
b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	536
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	537 ParsedDicomFile f(true);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	538 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	539 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	540 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	541
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	542 Json::Value v;
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	543 f.ToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_None, 0);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	544 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	545 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	546 ASSERT_FALSE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	547 ASSERT_FALSE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	548 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	549 ASSERT_EQ(Json::stringValue, v["7050,1000"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	550 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	551
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	552 f.ToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePrivateTags \| DicomToJsonFlags_ConvertBinaryToNull), 0);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	553 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	554 ASSERT_EQ(7u, v.getMemberNames().size());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	555 ASSERT_FALSE(v.isMember("7052,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	556 ASSERT_TRUE(v.isMember("7050,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	557 ASSERT_TRUE(v.isMember("7053,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	558 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	559 ASSERT_EQ(Json::nullValue, v["7053,1000"].type());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	560
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	561 f.ToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePrivateTags, 0);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	562 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	563 ASSERT_EQ(7u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	564 ASSERT_FALSE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	565 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	566 ASSERT_TRUE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	567 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	568 std::string mime, content;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	569 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	570 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7053,1000"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	571 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	572 ASSERT_EQ("Some private tag", content);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	573
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	574 f.ToJson(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	575 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	576 ASSERT_EQ(7u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	577 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	578 ASSERT_TRUE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	579 ASSERT_FALSE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	580 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	581 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	582
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	583 f.ToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludeUnknownTags), 0);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	584 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	585 ASSERT_EQ(7u, v.getMemberNames().size());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	586 ASSERT_TRUE(v.isMember("7050,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	587 ASSERT_TRUE(v.isMember("7052,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	588 ASSERT_FALSE(v.isMember("7053,1000"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	589 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	590 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	591 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, v["7052,1000"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	592 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	593 ASSERT_EQ("Some unknown tag", content);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	594
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	595 f.ToJson(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	596 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	597 ASSERT_EQ(8u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	598 ASSERT_TRUE(v.isMember("7050,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	599 ASSERT_TRUE(v.isMember("7052,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	600 ASSERT_TRUE(v.isMember("7053,1000"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	601 ASSERT_EQ("Some public tag", v["7050,1000"].asString());
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	602 ASSERT_EQ(Json::nullValue, v["7052,1000"].type());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	603 ASSERT_EQ(Json::nullValue, v["7053,1000"].type());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	604 }
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	605
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	606
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	607 TEST(ParsedDicomFile, ToJsonFlags2)
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	608 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	609 ParsedDicomFile f(true);
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	610 f.Insert(DICOM_TAG_PIXEL_DATA, "Pixels", false);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	611
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	612 Json::Value v;
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	613 f.ToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_None, 0);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	614 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	615 ASSERT_EQ(5u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	616 ASSERT_FALSE(v.isMember("7fe0,0010"));
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	617
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	618 f.ToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePixelData \| DicomToJsonFlags_ConvertBinaryToNull), 0);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	619 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	620 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	621 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	622 ASSERT_EQ(Json::nullValue, v["7fe0,0010"].type());
1736 b953c6eef28d ToJson: IncludePrivateTags and IncludeUnknownTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1735 diff changeset	623
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	624 f.ToJson(v, DicomToJsonFormat_Short, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePixelData \| DicomToJsonFlags_ConvertBinaryToAscii), 0);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	625 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	626 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	627 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	628 ASSERT_EQ(Json::stringValue, v["7fe0,0010"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	629 ASSERT_EQ("Pixels", v["7fe0,0010"].asString());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	630
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	631 f.ToJson(v, DicomToJsonFormat_Short, DicomToJsonFlags_IncludePixelData, 0);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	632 ASSERT_EQ(Json::objectValue, v.type());
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	633 ASSERT_EQ(6u, v.getMemberNames().size());
1739 df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	634 ASSERT_TRUE(v.isMember("7fe0,0010"));
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	635 ASSERT_EQ(Json::stringValue, v["7fe0,0010"].type());
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	636 std::string mime, content;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	637 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	638 ASSERT_EQ("application/octet-stream", mime);
df331354cea2 include binary in ToJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1736 diff changeset	639 ASSERT_EQ("Pixels", content);
1735 a001f6226c7c primitives for flags in dicom-to-json conversions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	640 }
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	641
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	642
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	643 TEST(DicomFindAnswers, Basic)
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	644 {
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	645 DicomFindAnswers a;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	646
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	647 {
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	648 DicomMap m;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	649 m.SetValue(DICOM_TAG_PATIENT_ID, "hello");
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	650 a.Add(m);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	651 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	652
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	653 {
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1789 diff changeset	654 ParsedDicomFile d(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	655 d.ReplacePlainString(DICOM_TAG_PATIENT_ID, "my");
1789 bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	656 a.Add(d);
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	657 }
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	658
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	659 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	660 DicomMap m;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	661 m.SetValue(DICOM_TAG_PATIENT_ID, "world");
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	662 a.Add(m);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	663 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	664
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	665 Json::Value j;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	666 a.ToJson(j, true);
1789 bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	667 ASSERT_EQ(3u, j.size());
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	668
bdcc1dba4a53 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	669 //std::cout << j;
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1739 diff changeset	670 }
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	671
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	672
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	673 TEST(ParsedDicomFile, FromJson)
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	674 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	675 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7057, 0x1000), EVR_OB, "MyPrivateTag", 1, 1);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	676 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7059, 0x1000), EVR_OB, "MyPrivateTag", 1, 1);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	677 FromDcmtkBridge::RegisterDictionaryTag(DicomTag(0x7050, 0x1000), EVR_PN, "Declared public tag", 1, 1);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	678
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	679 Json::Value v;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	680 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	681
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	682 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	683 v["SOPClassUID"] = sopClassUid;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	684 v["SpecificCharacterSet"] = "ISO_IR 148"; // This is latin-5
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	685 v["PatientName"] = "Sébastien";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	686 v["7050-1000"] = "Some public tag"; // Even group => public tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	687 v["7052-1000"] = "Some unknown tag"; // Even group => public, unknown tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	688 v["7057-1000"] = "Some private tag"; // Odd group => private tag
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	689 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	690
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	691 std::string s;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	692 Toolbox::EncodeDataUriScheme(s, "application/octet-stream", "Sebastien");
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	693 v["StudyDescription"] = s;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	694
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	695 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	696 v["0040,0100"] = Json::arrayValue; // ScheduledProcedureStepSequence
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	697
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	698 Json::Value vv;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	699 vv["Modality"] = "MR";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	700 v["0040,0100"].append(vv);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	701
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	702 vv["Modality"] = "CT";
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	703 v["0040,0100"].append(vv);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	704 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	705
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	706 const DicomToJsonFlags toJsonFlags = static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludeBinary \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	707 DicomToJsonFlags_IncludePixelData \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	708 DicomToJsonFlags_IncludePrivateTags \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	709 DicomToJsonFlags_IncludeUnknownTags \|
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	710 DicomToJsonFlags_ConvertBinaryToAscii);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	711
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	712
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	713 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	714 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	715 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	716
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	717 Json::Value vv;
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	718 dicom->ToJson(vv, DicomToJsonFormat_Human, toJsonFlags, 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	719
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	720 ASSERT_EQ(vv["SOPClassUID"].asString(), sopClassUid);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	721 ASSERT_EQ(vv["MediaStorageSOPClassUID"].asString(), sopClassUid);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	722 ASSERT_TRUE(vv.isMember("SOPInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	723 ASSERT_TRUE(vv.isMember("SeriesInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	724 ASSERT_TRUE(vv.isMember("StudyInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	725 ASSERT_TRUE(vv.isMember("PatientID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	726 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	727
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	728
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	729 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	730 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	731 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_GenerateIdentifiers)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	732
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	733 Json::Value vv;
1860 c7d70f659190 DicomToJsonFormat_Simple -> DicomToJsonFormat_Human Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	734 dicom->ToJson(vv, DicomToJsonFormat_Human, static_cast<DicomToJsonFlags>(DicomToJsonFlags_IncludePixelData), 0);
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	735
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	736 std::string mime, content;
1981 4b545a8b1f95 return code in Toolbox::DecodeDataUriScheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1971 diff changeset	737 ASSERT_TRUE(Toolbox::DecodeDataUriScheme(mime, content, vv["PixelData"].asString()));
1818 1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	738 ASSERT_EQ("application/octet-stream", mime);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	739 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	740 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	741
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	742
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	743 {
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	744 std::auto_ptr<ParsedDicomFile> dicom
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	745 (ParsedDicomFile::CreateFromJson(v, static_cast<DicomFromJsonFlags>(DicomFromJsonFlags_DecodeDataUriScheme)));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	746
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	747 Json::Value vv;
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	748 dicom->ToJson(vv, DicomToJsonFormat_Short, toJsonFlags, 0);
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	749
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	750 ASSERT_FALSE(vv.isMember("SOPInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	751 ASSERT_FALSE(vv.isMember("SeriesInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	752 ASSERT_FALSE(vv.isMember("StudyInstanceUID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	753 ASSERT_FALSE(vv.isMember("PatientID"));
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	754 ASSERT_EQ(2u, vv["0040,0100"].size());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	755 ASSERT_EQ("MR", vv["0040,0100"][0]["0008,0060"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	756 ASSERT_EQ("CT", vv["0040,0100"][1]["0008,0060"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	757 ASSERT_EQ("Some public tag", vv["7050,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	758 ASSERT_EQ("Some unknown tag", vv["7052,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	759 ASSERT_EQ("Some private tag", vv["7057,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	760 ASSERT_EQ("Some private tag2", vv["7059,1000"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	761 ASSERT_EQ("Sébastien", vv["0010,0010"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	762 ASSERT_EQ("Sebastien", vv["0008,1030"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	763 ASSERT_EQ("ISO_IR 148", vv["0008,0005"].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	764 ASSERT_EQ("5", vv[DICOM_TAG_ROWS.Format()].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	765 ASSERT_EQ("5", vv[DICOM_TAG_COLUMNS.Format()].asString());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	766 ASSERT_TRUE(vv[DICOM_TAG_PIXEL_DATA.Format()].asString().empty());
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	767 }
1065401501fb ParsedDicomFile::CreateFromJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	768 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	769
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	770
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	771
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	772 TEST(TestImages, PatternGrayscale8)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	773 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	774 static const char* PATH = "UnitTestsResults/PatternGrayscale8.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	775
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	776 Orthanc::Image image(Orthanc::PixelFormat_Grayscale8, 256, 256);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	777
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	778 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	779 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	780 uint8_t p = reinterpret_cast<uint8_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	781 for (int x = 0; x < 256; x++, p++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	782 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	783 *p = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	784 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	785 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	786
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	787 Orthanc::ImageAccessor r = image.GetRegion(32, 32, 64, 192);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	788 Orthanc::ImageProcessing::Set(r, 0);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	789 r = image.GetRegion(160, 32, 64, 192);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	790 Orthanc::ImageProcessing::Set(r, 255);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	791
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	792 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	793 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	794 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	795 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	796 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	797 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	798 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	799 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "Grayscale8");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	800 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	801
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	802 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	803 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	804
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	805 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	806 std::string s;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	807 Orthanc::Toolbox::ReadFile(s, PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	808 Orthanc::ParsedDicomFile f(s);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	809
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	810 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	811 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	812 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	813 ASSERT_EQ(Orthanc::PixelFormat_Grayscale8, decoded->GetFormat());
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	814
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	815 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	816 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	817 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	818 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	819 ASSERT_EQ(0, memcmp(a, b, 256));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	820 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	821 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	822 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	823
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	824
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	825 TEST(TestImages, PatternRGB)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	826 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	827 static const char* PATH = "UnitTestsResults/PatternRGB24.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	828
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	829 Orthanc::Image image(Orthanc::PixelFormat_RGB24, 384, 256);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	830
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	831 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	832 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	833 uint8_t p = reinterpret_cast<uint8_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	834 for (int x = 0; x < 128; x++, p += 3)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	835 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	836 p[0] = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	837 p[1] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	838 p[2] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	839 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	840 for (int x = 128; x < 128 * 2; x++, p += 3)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	841 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	842 p[0] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	843 p[1] = 255 - y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	844 p[2] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	845 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	846 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	847 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	848 p[0] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	849 p[1] = 0;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	850 p[2] = y;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	851 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	852 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	853
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	854 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	855 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	856 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	857 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	858 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	859 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	860 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	861 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "RGB24");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	862 f.EmbedImage(image);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	863
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	864 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	865 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	866
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	867 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	868 std::string s;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	869 Orthanc::Toolbox::ReadFile(s, PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	870 Orthanc::ParsedDicomFile f(s);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	871
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	872 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	873 ASSERT_EQ(384u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	874 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	875 ASSERT_EQ(Orthanc::PixelFormat_RGB24, decoded->GetFormat());
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 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	878 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	879 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	880 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	881 ASSERT_EQ(0, memcmp(a, b, 3 * 384));
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 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	884 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	885
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	886
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	887 TEST(TestImages, PatternUint16)
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	888 {
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	889 static const char* PATH = "UnitTestsResults/PatternGrayscale16.dcm";
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	890
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	891 Orthanc::Image image(Orthanc::PixelFormat_Grayscale16, 256, 256);
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	892
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	893 uint16_t v = 0;
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	894 for (int y = 0; y < 256; y++)
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	895 {
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	896 uint16_t p = reinterpret_cast<uint16_t>(image.GetRow(y));
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	897 for (int x = 0; x < 256; x++, v++, p++)
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	898 {
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	899 *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	900 }
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	901 }
3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	902
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	903 Orthanc::ImageAccessor r = image.GetRegion(32, 32, 64, 192);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	904 Orthanc::ImageProcessing::Set(r, 0);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	905 r = image.GetRegion(160, 32, 64, 192);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	906 Orthanc::ImageProcessing::Set(r, 65535);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	907
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	908 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	909 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	910 f.ReplacePlainString(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.7");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	911 f.ReplacePlainString(DICOM_TAG_STUDY_INSTANCE_UID, "1.2.276.0.7230010.3.1.2.2831176407.321.1458901422.884998");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	912 f.ReplacePlainString(DICOM_TAG_PATIENT_ID, "ORTHANC");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	913 f.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "Orthanc");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	914 f.ReplacePlainString(DICOM_TAG_STUDY_DESCRIPTION, "Patterns");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	915 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "Grayscale16");
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	916 f.EmbedImage(image);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	917
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	918 f.SaveToFile(PATH);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	919 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	920
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	921 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	922 std::string s;
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	923 Orthanc::Toolbox::ReadFile(s, PATH);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	924 Orthanc::ParsedDicomFile f(s);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	925
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	926 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0));
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	927 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	928 ASSERT_EQ(256u, decoded->GetHeight());
1940 5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	929 ASSERT_EQ(Orthanc::PixelFormat_Grayscale16, decoded->GetFormat());
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	930
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	931 for (int y = 0; y < 256; y++)
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	932 {
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	933 const void* a = image.GetConstRow(y);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	934 const void* b = decoded->GetConstRow(y);
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	935 ASSERT_EQ(0, memcmp(a, b, 512));
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	936 }
5514d37176b4 PatternUint16 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1937 diff changeset	937 }
1937 3756bedaaa36 test pattern Sebastien Jodogne <s.jodogne@gmail.com> parents: 1908 diff changeset	938 }
1941 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
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	941 TEST(TestImages, PatternInt16)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	942 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	943 static const char* PATH = "UnitTestsResults/PatternSignedGrayscale16.dcm";
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	944
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	945 Orthanc::Image image(Orthanc::PixelFormat_SignedGrayscale16, 256, 256);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	946
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	947 int16_t v = -32768;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	948 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	949 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	950 int16_t p = reinterpret_cast<int16_t>(image.GetRow(y));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	951 for (int x = 0; x < 256; x++, v++, p++)
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 *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	954 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	955 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	956
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	957 Orthanc::ImageAccessor r = image.GetRegion(32, 32, 64, 192);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	958 Orthanc::ImageProcessing::Set(r, -32768);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	959 r = image.GetRegion(160, 32, 64, 192);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	960 Orthanc::ImageProcessing::Set(r, 32767);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	961
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	962 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	963 ParsedDicomFile f(true);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	964 f.ReplacePlainString(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.7");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	965 f.ReplacePlainString(DICOM_TAG_STUDY_INSTANCE_UID, "1.2.276.0.7230010.3.1.2.2831176407.321.1458901422.884998");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	966 f.ReplacePlainString(DICOM_TAG_PATIENT_ID, "ORTHANC");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	967 f.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "Orthanc");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	968 f.ReplacePlainString(DICOM_TAG_STUDY_DESCRIPTION, "Patterns");
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1981 diff changeset	969 f.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, "SignedGrayscale16");
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	970 f.EmbedImage(image);
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 f.SaveToFile(PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	973 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	974
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	975 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	976 std::string s;
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	977 Orthanc::Toolbox::ReadFile(s, PATH);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	978 Orthanc::ParsedDicomFile f(s);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	979
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	980 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0));
1971 869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	981 ASSERT_EQ(256u, decoded->GetWidth());
869a87c08673 fix for mingw <= 4.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1970 diff changeset	982 ASSERT_EQ(256u, decoded->GetHeight());
1941 d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	983 ASSERT_EQ(Orthanc::PixelFormat_SignedGrayscale16, decoded->GetFormat());
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 for (int y = 0; y < 256; y++)
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	986 {
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	987 const void* a = image.GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	988 const void* b = decoded->GetConstRow(y);
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	989 ASSERT_EQ(0, memcmp(a, b, 512));
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	990 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	991 }
d7b176f7dd1b test dicom patterns Sebastien Jodogne <s.jodogne@gmail.com> parents: 1940 diff changeset	992 }

Mercurial > hg > orthanc

annotate UnitTestsSources/FromDcmtkTests.cpp @ 1982:b5d4f9c156ad