orthanc: OrthancFramework/UnitTestsSources/DicomMapTests.cpp annotate

annotate OrthancFramework/UnitTestsSources/DicomMapTests.cpp @ 4294:0923247e69f6

log categories: rest -> http + added lua & jobs

author	Alain Mazy <alain@mazy.be>
date	Thu, 05 Nov 2020 11:43:32 +0100
parents	3d6f14a05db1
children	50b0c69b653a

rev	line source
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1 /**
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1850 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	4 * Department, University Hospital of Liege, Belgium
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3581 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	6 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	7 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	8 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	9 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	10 * the License, or (at your option) any later version.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	11 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	12 * 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: 711 diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	15 * Lesser General Public License for more details.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	16 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	17 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	18 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	19 * <http://www.gnu.org/licenses/>.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	20 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	21
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	22
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	23 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	24 // Must be the first to be sure to use the Orthanc framework shared library
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	25 # include <OrthancFramework.h>
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	26 #endif
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	27
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	28 #if !defined(DCMTK_VERSION_NUMBER)
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	29 # error DCMTK_VERSION_NUMBER is not defined
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	30 #endif
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	31
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	32 #include <gtest/gtest.h>
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	34 #include "../Sources/Compatibility.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	35 #include "../Sources/OrthancException.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	36 #include "../Sources/DicomFormat/DicomMap.h"
4220 92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	37 #include "../Sources/DicomFormat/DicomStreamReader.h"
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	38 #include "../Sources/DicomParsing/FromDcmtkBridge.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	39 #include "../Sources/DicomParsing/ToDcmtkBridge.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	40 #include "../Sources/DicomParsing/ParsedDicomFile.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	41 #include "../Sources/DicomParsing/DicomWebJsonVisitor.h"
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 using namespace Orthanc;
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 TEST(DicomMap, MainTags)
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 {
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_PATIENT_ID, ResourceType_Patient));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 ASSERT_FALSE(DicomMap::IsMainDicomTag(DICOM_TAG_PATIENT_ID, ResourceType_Study));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_STUDY_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_ACCESSION_NUMBER));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_SERIES_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_SOP_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 std::set<DicomTag> s;
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 DicomMap::GetMainDicomTags(s);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_STUDY_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_ACCESSION_NUMBER));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_SERIES_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_SOP_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 DicomMap::GetMainDicomTags(s, ResourceType_Patient);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_STUDY_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 DicomMap::GetMainDicomTags(s, ResourceType_Study);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_STUDY_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_ACCESSION_NUMBER));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 DicomMap::GetMainDicomTags(s, ResourceType_Series);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_SERIES_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 DicomMap::GetMainDicomTags(s, ResourceType_Instance);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_SOP_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 }
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 TEST(DicomMap, Tags)
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 {
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	86 std::set<DicomTag> s;
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	87
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 DicomMap m;
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	89 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	90 ASSERT_EQ(0u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	91
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 ASSERT_FALSE(m.HasTag(DICOM_TAG_PATIENT_NAME));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 ASSERT_FALSE(m.HasTag(0x0010, 0x0010));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	94 m.SetValue(0x0010, 0x0010, "PatientName", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 ASSERT_TRUE(m.HasTag(DICOM_TAG_PATIENT_NAME));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 ASSERT_TRUE(m.HasTag(0x0010, 0x0010));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	98 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	99 ASSERT_EQ(1u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	100 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, *s.begin());
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	101
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102 ASSERT_FALSE(m.HasTag(DICOM_TAG_PATIENT_ID));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	103 m.SetValue(DICOM_TAG_PATIENT_ID, "PatientID", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104 ASSERT_TRUE(m.HasTag(0x0010, 0x0020));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	105 m.SetValue(DICOM_TAG_PATIENT_ID, "PatientID2", false);
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	106 ASSERT_EQ("PatientID2", m.GetValue(0x0010, 0x0020).GetContent());
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	108 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	109 ASSERT_EQ(2u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	110
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 m.Remove(DICOM_TAG_PATIENT_ID);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112 ASSERT_THROW(m.GetValue(0x0010, 0x0020), OrthancException);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	114 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	115 ASSERT_EQ(1u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	116 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, *s.begin());
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	117
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3694 diff changeset	118 std::unique_ptr<DicomMap> mm(m.Clone());
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	119 ASSERT_EQ("PatientName", mm->GetValue(DICOM_TAG_PATIENT_NAME).GetContent());
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	121 m.SetValue(DICOM_TAG_PATIENT_ID, "Hello", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 ASSERT_THROW(mm->GetValue(DICOM_TAG_PATIENT_ID), OrthancException);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 mm->CopyTagIfExists(m, DICOM_TAG_PATIENT_ID);
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	124 ASSERT_EQ("Hello", mm->GetValue(DICOM_TAG_PATIENT_ID).GetContent());
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	126 DicomValue v;
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 ASSERT_TRUE(v.IsNull());
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 }
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 TEST(DicomMap, FindTemplates)
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 {
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133 DicomMap m;
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 DicomMap::SetupFindPatientTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 ASSERT_TRUE(m.HasTag(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 DicomMap::SetupFindStudyTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 ASSERT_TRUE(m.HasTag(DICOM_TAG_STUDY_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 ASSERT_TRUE(m.HasTag(DICOM_TAG_ACCESSION_NUMBER));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 DicomMap::SetupFindSeriesTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 ASSERT_TRUE(m.HasTag(DICOM_TAG_SERIES_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 DicomMap::SetupFindInstanceTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 ASSERT_TRUE(m.HasTag(DICOM_TAG_SOP_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 }
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	148
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	149
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	150
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	151
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	152 static void TestModule(ResourceType level,
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	153 DicomModule module)
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	154 {
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	155 // REFERENCE: DICOM PS3.3 2015c - Information Object Definitions
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	156 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	157
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	158 std::set<DicomTag> moduleTags, main;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	159 DicomTag::AddTagsForModule(moduleTags, module);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	160 DicomMap::GetMainDicomTags(main, level);
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	161
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	162 // The main dicom tags are a subset of the module
1304 7b6925b0890d cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	163 for (std::set<DicomTag>::const_iterator it = main.begin(); it != main.end(); ++it)
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	164 {
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	165 bool ok = moduleTags.find(*it) != moduleTags.end();
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	166
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	167 // Exceptions for the Study level
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	168 if (level == ResourceType_Study &&
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	169 (it == DicomTag(0x0008, 0x0080) \|\| / InstitutionName, from Visit identification module, related to Visit */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	170 it == DicomTag(0x0032, 0x1032) \|\| / RequestingPhysician, from Imaging Service Request module, related to Study */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	171 it == DicomTag(0x0032, 0x1060))) / RequestedProcedureDescription, from Requested Procedure module, related to Study */
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	172 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	173 ok = true;
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	174 }
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	175
1849 6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	176 // Exceptions for the Series level
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	177 if (level == ResourceType_Series &&
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	178 (it == DicomTag(0x0008, 0x0070) \|\| / Manufacturer, from General Equipment Module */
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	179 it == DicomTag(0x0008, 0x1010) \|\| / StationName, from General Equipment Module */
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	180 it == DicomTag(0x0018, 0x0024) \|\| / SequenceName, from MR Image Module (SIMPLIFICATION => Series) */
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	181 it == DicomTag(0x0018, 0x1090) \|\| / CardiacNumberOfImages, from MR Image Module (SIMPLIFICATION => Series) */
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	182 it == DicomTag(0x0020, 0x0037) \|\| / ImageOrientationPatient, from Image Plane Module (SIMPLIFICATION => Series) */
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	183 it == DicomTag(0x0020, 0x0105) \|\| / NumberOfTemporalPositions, from MR Image Module (SIMPLIFICATION => Series) */
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	184 it == DicomTag(0x0020, 0x1002) \|\| / ImagesInAcquisition, from General Image Module (SIMPLIFICATION => Series) */
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	185 it == DicomTag(0x0054, 0x0081) \|\| / NumberOfSlices, from PET Series module */
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	186 it == DicomTag(0x0054, 0x0101) \|\| / NumberOfTimeSlices, from PET Series module */
1850 68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1849 diff changeset	187 it == DicomTag(0x0054, 0x1000) \|\| / SeriesType, from PET Series module */
68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1849 diff changeset	188 it == DicomTag(0x0018, 0x1400) \|\| / AcquisitionDeviceProcessingDescription, from CR/X-Ray/DX/WholeSlideMicro Image (SIMPLIFICATION => Series) */
68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1849 diff changeset	189 it == DicomTag(0x0018, 0x0010))) / ContrastBolusAgent, from Contrast/Bolus module (SIMPLIFICATION => Series) */
1849 6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	190 {
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	191 ok = true;
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	192 }
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	193
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	194 // Exceptions for the Instance level
1704 d2268c7a7ede fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	195 if (level == ResourceType_Instance &&
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	196 (it == DicomTag(0x0020, 0x0012) \|\| / AccessionNumber, from General Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	197 it == DicomTag(0x0054, 0x1330) \|\| / ImageIndex, from PET Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	198 it == DicomTag(0x0020, 0x0100) \|\| / TemporalPositionIdentifier, from MR Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	199 it == DicomTag(0x0028, 0x0008) \|\| / NumberOfFrames, from Multi-frame module attributes, related to Image */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	200 it == DicomTag(0x0020, 0x0032) \|\| / ImagePositionPatient, from Image Plan module, related to Image */
2804 d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	201 it == DicomTag(0x0020, 0x0037) \|\| / ImageOrientationPatient, from Image Plane Module (Orthanc 1.4.2) */
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	202 it == DicomTag(0x0020, 0x4000))) / ImageComments, from General Image module */
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	203 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	204 ok = true;
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	205 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	206
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	207 if (!ok)
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	208 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	209 std::cout << it->Format() << ": " << FromDcmtkBridge::GetTagName(*it, "")
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	210 << " not expected at level " << EnumerationToString(level) << std::endl;
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	211 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	212
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	213 EXPECT_TRUE(ok);
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	214 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	215 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	216
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	217
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	218 TEST(DicomMap, Modules)
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	219 {
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	220 TestModule(ResourceType_Patient, DicomModule_Patient);
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	221 TestModule(ResourceType_Study, DicomModule_Study);
1849 6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	222 TestModule(ResourceType_Series, DicomModule_Series); // TODO
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	223 TestModule(ResourceType_Instance, DicomModule_Instance);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	224 }
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	225
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	226
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	227 TEST(DicomMap, Parse)
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	228 {
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	229 DicomMap m;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	230 float f;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	231 double d;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	232 int32_t i;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	233 int64_t j;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	234 uint32_t k;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	235 uint64_t l;
3519 fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	236 unsigned int ui;
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	237 std::string s;
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	238
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	239 m.SetValue(DICOM_TAG_PATIENT_NAME, " ", false); // Empty value
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	240 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseFloat(f));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	241 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseDouble(d));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	242 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	243 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	244 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	245 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	246
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	247 m.SetValue(DICOM_TAG_PATIENT_NAME, "0", true); // Binary value
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	248 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseFloat(f));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	249 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseDouble(d));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	250 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	251 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	252 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	253 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	254
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	255 ASSERT_FALSE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	256 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, true));
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	257 ASSERT_EQ("0", s);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	258
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	259
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	260 // 2**31-1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	261 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483647", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	262 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseFloat(f));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	263 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseDouble(d));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	264 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	265 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	266 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	267 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	268 ASSERT_FLOAT_EQ(2147483647.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	269 ASSERT_DOUBLE_EQ(2147483647.0, d);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	270 ASSERT_EQ(2147483647, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	271 ASSERT_EQ(2147483647ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	272 ASSERT_EQ(2147483647u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	273 ASSERT_EQ(2147483647ull, l);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	274
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	275 // Test shortcuts
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	276 m.SetValue(DICOM_TAG_PATIENT_NAME, "42", false);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	277 ASSERT_TRUE(m.ParseFloat(f, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	278 ASSERT_TRUE(m.ParseDouble(d, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	279 ASSERT_TRUE(m.ParseInteger32(i, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	280 ASSERT_TRUE(m.ParseInteger64(j, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	281 ASSERT_TRUE(m.ParseUnsignedInteger32(k, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	282 ASSERT_TRUE(m.ParseUnsignedInteger64(l, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	283 ASSERT_FLOAT_EQ(42.0f, f);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	284 ASSERT_DOUBLE_EQ(42.0, d);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	285 ASSERT_EQ(42, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	286 ASSERT_EQ(42ll, j);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	287 ASSERT_EQ(42u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	288 ASSERT_EQ(42ull, l);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	289
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	290 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	291 ASSERT_EQ("42", s);
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	292 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, true));
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	293 ASSERT_EQ("42", s);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	294
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	295
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	296 // 2**31
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	297 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483648", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	298 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseFloat(f));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	299 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseDouble(d));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	300 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	301 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	302 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	303 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	304 ASSERT_FLOAT_EQ(2147483648.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	305 ASSERT_DOUBLE_EQ(2147483648.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	306 ASSERT_EQ(2147483648ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	307 ASSERT_EQ(2147483648u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	308 ASSERT_EQ(2147483648ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	309
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	310 // 2**32-1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	311 m.SetValue(DICOM_TAG_PATIENT_NAME, "4294967295", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	312 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseFloat(f));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	313 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseDouble(d));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	314 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	315 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	316 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	317 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	318 ASSERT_FLOAT_EQ(4294967295.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	319 ASSERT_DOUBLE_EQ(4294967295.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	320 ASSERT_EQ(4294967295ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	321 ASSERT_EQ(4294967295u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	322 ASSERT_EQ(4294967295ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	323
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	324 // 2**32
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	325 m.SetValue(DICOM_TAG_PATIENT_NAME, "4294967296", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	326 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseFloat(f));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	327 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseDouble(d));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	328 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	329 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	330 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	331 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	332 ASSERT_FLOAT_EQ(4294967296.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	333 ASSERT_DOUBLE_EQ(4294967296.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	334 ASSERT_EQ(4294967296ll, j);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	335 ASSERT_EQ(4294967296ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	336
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	337 m.SetValue(DICOM_TAG_PATIENT_NAME, "-1", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	338 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseFloat(f));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	339 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseDouble(d));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	340 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	341 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	342 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	343 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	344 ASSERT_FLOAT_EQ(-1.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	345 ASSERT_DOUBLE_EQ(-1.0, d);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	346 ASSERT_EQ(-1, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	347 ASSERT_EQ(-1ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	348
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	349 // -2**31
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	350 m.SetValue(DICOM_TAG_PATIENT_NAME, "-2147483648", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	351 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseFloat(f));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	352 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseDouble(d));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	353 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	354 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	355 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	356 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	357 ASSERT_FLOAT_EQ(-2147483648.0f, f);
2829 61fdb06e389a fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	358 ASSERT_DOUBLE_EQ(-2147483648.0, d);
61fdb06e389a fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	359 ASSERT_EQ(static_cast<int32_t>(-2147483648ll), i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	360 ASSERT_EQ(-2147483648ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	361
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	362 // -2**31 - 1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	363 m.SetValue(DICOM_TAG_PATIENT_NAME, "-2147483649", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	364 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseFloat(f));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	365 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseDouble(d));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	366 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger32(i));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	367 ASSERT_TRUE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseInteger64(j));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	368 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger32(k));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	369 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).ParseUnsignedInteger64(l));
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	370 ASSERT_FLOAT_EQ(-2147483649.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	371 ASSERT_DOUBLE_EQ(-2147483649.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	372 ASSERT_EQ(-2147483649ll, j);
3519 fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	373
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	374
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	375 // "800\0" in US COLMUNS tag
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	376 m.SetValue(DICOM_TAG_COLUMNS, "800\0", false);
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	377 ASSERT_TRUE(m.GetValue(DICOM_TAG_COLUMNS).ParseFirstUnsignedInteger(ui));
3541 4beabcea3a5c Orthanc-1.5.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3520 diff changeset	378 ASSERT_EQ(800u, ui);
3519 fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	379 m.SetValue(DICOM_TAG_COLUMNS, "800", false);
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	380 ASSERT_TRUE(m.GetValue(DICOM_TAG_COLUMNS).ParseFirstUnsignedInteger(ui));
3541 4beabcea3a5c Orthanc-1.5.8 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3520 diff changeset	381 ASSERT_EQ(800u, ui);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	382 }
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	383
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	384
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	385 TEST(DicomMap, Serialize)
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	386 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	387 Json::Value s;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	388
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	389 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	390 DicomMap m;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	391 m.SetValue(DICOM_TAG_PATIENT_NAME, "Hello", false);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	392 m.SetValue(DICOM_TAG_STUDY_DESCRIPTION, "Binary", true);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	393 m.SetNullValue(DICOM_TAG_SERIES_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	394 m.Serialize(s);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	395 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	396
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	397 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	398 DicomMap m;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	399 m.Unserialize(s);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	400
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	401 const DicomValue* v = m.TestAndGetValue(DICOM_TAG_ACCESSION_NUMBER);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	402 ASSERT_TRUE(v == NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	403
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	404 v = m.TestAndGetValue(DICOM_TAG_PATIENT_NAME);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	405 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	406 ASSERT_FALSE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	407 ASSERT_FALSE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	408 ASSERT_EQ("Hello", v->GetContent());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	409
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	410 v = m.TestAndGetValue(DICOM_TAG_STUDY_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	411 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	412 ASSERT_FALSE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	413 ASSERT_TRUE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	414 ASSERT_EQ("Binary", v->GetContent());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	415
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	416 v = m.TestAndGetValue(DICOM_TAG_SERIES_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	417 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	418 ASSERT_TRUE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	419 ASSERT_FALSE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	420 ASSERT_THROW(v->GetContent(), OrthancException);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	421 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	422 }
3005 8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	423
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	424
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	425
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	426 TEST(DicomMap, ExtractMainDicomTags)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	427 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	428 DicomMap b;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	429 b.SetValue(DICOM_TAG_PATIENT_NAME, "E", false);
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	430 ASSERT_TRUE(b.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	431
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	432 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	433 DicomMap a;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	434 a.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	435 a.SetValue(DICOM_TAG_STUDY_DESCRIPTION, "B", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	436 a.SetValue(DICOM_TAG_SERIES_DESCRIPTION, "C", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	437 a.SetValue(DICOM_TAG_NUMBER_OF_FRAMES, "D", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	438 a.SetValue(DICOM_TAG_SLICE_THICKNESS, "F", false);
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	439 ASSERT_FALSE(a.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	440 b.ExtractMainDicomTags(a);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	441 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	442
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	443 ASSERT_EQ(4u, b.GetSize());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	444 ASSERT_EQ("A", b.GetValue(DICOM_TAG_PATIENT_NAME).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	445 ASSERT_EQ("B", b.GetValue(DICOM_TAG_STUDY_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	446 ASSERT_EQ("C", b.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	447 ASSERT_EQ("D", b.GetValue(DICOM_TAG_NUMBER_OF_FRAMES).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	448 ASSERT_FALSE(b.HasTag(DICOM_TAG_SLICE_THICKNESS));
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	449 ASSERT_TRUE(b.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	450
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	451 b.SetValue(DICOM_TAG_PATIENT_NAME, "G", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	452
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	453 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	454 DicomMap a;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	455 a.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	456 a.SetValue(DICOM_TAG_SLICE_THICKNESS, "F", false);
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	457 ASSERT_FALSE(a.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	458 b.Merge(a);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	459 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	460
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	461 ASSERT_EQ(5u, b.GetSize());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	462 ASSERT_EQ("G", b.GetValue(DICOM_TAG_PATIENT_NAME).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	463 ASSERT_EQ("B", b.GetValue(DICOM_TAG_STUDY_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	464 ASSERT_EQ("C", b.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	465 ASSERT_EQ("D", b.GetValue(DICOM_TAG_NUMBER_OF_FRAMES).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	466 ASSERT_EQ("F", b.GetValue(DICOM_TAG_SLICE_THICKNESS).GetContent());
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	467 ASSERT_FALSE(b.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	468 }
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	469
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	470
3551 173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	471 TEST(DicomMap, RemoveBinary)
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	472 {
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	473 DicomMap b;
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	474 b.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	475 b.SetValue(DICOM_TAG_PATIENT_ID, "B", true);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	476 b.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, DicomValue()); // NULL
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	477 b.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, DicomValue("C", false));
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	478 b.SetValue(DICOM_TAG_SOP_INSTANCE_UID, DicomValue("D", true));
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	479
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	480 b.RemoveBinaryTags();
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	481
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	482 std::string s;
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	483 ASSERT_EQ(2u, b.GetSize());
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	484 ASSERT_TRUE(b.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false)); ASSERT_EQ("A", s);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	485 ASSERT_TRUE(b.LookupStringValue(s, DICOM_TAG_SERIES_INSTANCE_UID, false)); ASSERT_EQ("C", s);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	486 }
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	487
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	488
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	489
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	490 TEST(DicomWebJson, Multiplicity)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	491 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	492 // http://dicom.nema.org/medical/dicom/current/output/chtml/part18/sect_F.2.4.html
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	493
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	494 ParsedDicomFile dicom(false);
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	495 dicom.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "SB1^SB2^SB3^SB4^SB5");
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	496 dicom.ReplacePlainString(DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "1\\2.3\\4");
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	497 dicom.ReplacePlainString(DICOM_TAG_IMAGE_POSITION_PATIENT, "");
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	498
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	499 DicomWebJsonVisitor visitor;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	500 dicom.Apply(visitor);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	501
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	502 {
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	503 const Json::Value& tag = visitor.GetResult() ["00200037"]; // ImageOrientationPatient
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	504 const Json::Value& value = tag["Value"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	505
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	506 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	507 ASSERT_EQ(2u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	508 ASSERT_EQ(3u, value.size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	509 ASSERT_EQ(Json::realValue, value[1].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	510 ASSERT_FLOAT_EQ(1.0f, value[0].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	511 ASSERT_FLOAT_EQ(2.3f, value[1].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	512 ASSERT_FLOAT_EQ(4.0f, value[2].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	513 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	514
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	515 {
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	516 const Json::Value& tag = visitor.GetResult() ["00200032"]; // ImagePositionPatient
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	517 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	518 ASSERT_EQ(1u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	519 }
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	520
3203 810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3202 diff changeset	521 std::string xml;
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	522 visitor.FormatXml(xml);
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	523
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	524 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	525 DicomMap m;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	526 m.FromDicomWeb(visitor.GetResult());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	527 ASSERT_EQ(3u, m.GetSize());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	528
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	529 std::string s;
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	530 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	531 ASSERT_EQ("SB1^SB2^SB3^SB4^SB5", s);
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	532 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_IMAGE_POSITION_PATIENT, false));
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	533 ASSERT_TRUE(s.empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	534
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	535 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_IMAGE_ORIENTATION_PATIENT, false));
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	536
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	537 std::vector<std::string> v;
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	538 Toolbox::TokenizeString(v, s, '\\');
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	539 ASSERT_FLOAT_EQ(1.0f, boost::lexical_cast<float>(v[0]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	540 ASSERT_FLOAT_EQ(2.3f, boost::lexical_cast<float>(v[1]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	541 ASSERT_FLOAT_EQ(4.0f, boost::lexical_cast<float>(v[2]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	542 }
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	543 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	544
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	545
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	546 TEST(DicomWebJson, NullValue)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	547 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	548 // http://dicom.nema.org/medical/dicom/current/output/chtml/part18/sect_F.2.5.html
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	549
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	550 ParsedDicomFile dicom(false);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	551 dicom.ReplacePlainString(DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "1.5\\\\\\2.5");
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	552
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	553 DicomWebJsonVisitor visitor;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	554 dicom.Apply(visitor);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	555
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	556 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	557 const Json::Value& tag = visitor.GetResult() ["00200037"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	558 const Json::Value& value = tag["Value"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	559
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	560 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	561 ASSERT_EQ(2u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	562 ASSERT_EQ(4u, value.size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	563 ASSERT_EQ(Json::realValue, value[0].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	564 ASSERT_EQ(Json::nullValue, value[1].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	565 ASSERT_EQ(Json::nullValue, value[2].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	566 ASSERT_EQ(Json::realValue, value[3].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	567 ASSERT_FLOAT_EQ(1.5f, value[0].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	568 ASSERT_FLOAT_EQ(2.5f, value[3].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	569 }
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	570
3203 810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3202 diff changeset	571 std::string xml;
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	572 visitor.FormatXml(xml);
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	573
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	574 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	575 DicomMap m;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	576 m.FromDicomWeb(visitor.GetResult());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	577 ASSERT_EQ(1u, m.GetSize());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	578
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	579 std::string s;
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	580 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_IMAGE_ORIENTATION_PATIENT, false));
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	581
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	582 std::vector<std::string> v;
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	583 Toolbox::TokenizeString(v, s, '\\');
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	584 ASSERT_FLOAT_EQ(1.5f, boost::lexical_cast<float>(v[0]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	585 ASSERT_TRUE(v[1].empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	586 ASSERT_TRUE(v[2].empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	587 ASSERT_FLOAT_EQ(2.5f, boost::lexical_cast<float>(v[3]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	588 }
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	589 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	590
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	591
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	592 TEST(DicomWebJson, PixelSpacing)
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	593 {
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	594 // Test related to locales: Make sure that decimal separator is
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	595 // correctly handled (dot "." vs comma ",")
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	596 ParsedDicomFile source(false);
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	597 source.ReplacePlainString(DICOM_TAG_PIXEL_SPACING, "1.5\\1.3");
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	598
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	599 DicomWebJsonVisitor visitor;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	600 source.Apply(visitor);
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	601
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	602 DicomMap target;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	603 target.FromDicomWeb(visitor.GetResult());
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	604
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	605 ASSERT_EQ("DS", visitor.GetResult() ["00280030"]["vr"].asString());
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	606 ASSERT_FLOAT_EQ(1.5f, visitor.GetResult() ["00280030"]["Value"][0].asFloat());
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	607 ASSERT_FLOAT_EQ(1.3f, visitor.GetResult() ["00280030"]["Value"][1].asFloat());
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	608
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	609 std::string s;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	610 ASSERT_TRUE(target.LookupStringValue(s, DICOM_TAG_PIXEL_SPACING, false));
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	611 ASSERT_EQ(s, "1.5\\1.3");
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	612 }
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	613
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	614
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	615 TEST(DicomMap, MainTagNames)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	616 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	617 ASSERT_EQ(3, ResourceType_Instance - ResourceType_Patient);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	618
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	619 for (int i = ResourceType_Patient; i <= ResourceType_Instance; i++)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	620 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	621 ResourceType level = static_cast<ResourceType>(i);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	622
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	623 std::set<DicomTag> tags;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	624 DicomMap::GetMainDicomTags(tags, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	625
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	626 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	627 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	628 DicomMap a;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	629 a.SetValue(*it, "TEST", false);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	630
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	631 Json::Value json;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	632 a.DumpMainDicomTags(json, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	633
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	634 ASSERT_EQ(Json::objectValue, json.type());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	635 ASSERT_EQ(1u, json.getMemberNames().size());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	636
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	637 std::string name = json.getMemberNames() [0];
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	638 EXPECT_EQ(name, FromDcmtkBridge::GetTagName(*it, ""));
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	639
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	640 DicomMap b;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	641 b.ParseMainDicomTags(json, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	642
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	643 ASSERT_EQ(1u, b.GetSize());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	644 ASSERT_EQ("TEST", b.GetStringValue(*it, "", false));
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	645
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	646 std::string main = it->GetMainTagsName();
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	647 if (!main.empty())
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	648 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	649 ASSERT_EQ(main, name);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	650 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	651 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	652 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	653 }
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	654
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	655
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	656
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	657 TEST(DicomTag, Comparisons)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	658 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	659 DicomTag a(0x0000, 0x0000);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	660 DicomTag b(0x0010, 0x0010);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	661 DicomTag c(0x0010, 0x0020);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	662 DicomTag d(0x0020, 0x0000);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	663
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	664 // operator==()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	665 ASSERT_TRUE(a == a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	666 ASSERT_FALSE(a == b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	667
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	668 // operator!=()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	669 ASSERT_FALSE(a != a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	670 ASSERT_TRUE(a != b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	671
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	672 // operator<=()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	673 ASSERT_TRUE(a <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	674 ASSERT_TRUE(a <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	675 ASSERT_TRUE(a <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	676 ASSERT_TRUE(a <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	677
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	678 ASSERT_FALSE(b <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	679 ASSERT_TRUE(b <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	680 ASSERT_TRUE(b <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	681 ASSERT_TRUE(b <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	682
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	683 ASSERT_FALSE(c <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	684 ASSERT_FALSE(c <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	685 ASSERT_TRUE(c <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	686 ASSERT_TRUE(c <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	687
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	688 ASSERT_FALSE(d <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	689 ASSERT_FALSE(d <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	690 ASSERT_FALSE(d <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	691 ASSERT_TRUE(d <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	692
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	693 // operator<()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	694 ASSERT_FALSE(a < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	695 ASSERT_TRUE(a < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	696 ASSERT_TRUE(a < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	697 ASSERT_TRUE(a < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	698
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	699 ASSERT_FALSE(b < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	700 ASSERT_FALSE(b < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	701 ASSERT_TRUE(b < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	702 ASSERT_TRUE(b < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	703
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	704 ASSERT_FALSE(c < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	705 ASSERT_FALSE(c < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	706 ASSERT_FALSE(c < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	707 ASSERT_TRUE(c < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	708
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	709 ASSERT_FALSE(d < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	710 ASSERT_FALSE(d < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	711 ASSERT_FALSE(d < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	712 ASSERT_FALSE(d < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	713
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	714 // operator>=()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	715 ASSERT_TRUE(a >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	716 ASSERT_FALSE(a >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	717 ASSERT_FALSE(a >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	718 ASSERT_FALSE(a >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	719
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	720 ASSERT_TRUE(b >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	721 ASSERT_TRUE(b >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	722 ASSERT_FALSE(b >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	723 ASSERT_FALSE(b >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	724
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	725 ASSERT_TRUE(c >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	726 ASSERT_TRUE(c >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	727 ASSERT_TRUE(c >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	728 ASSERT_FALSE(c >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	729
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	730 ASSERT_TRUE(d >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	731 ASSERT_TRUE(d >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	732 ASSERT_TRUE(d >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	733 ASSERT_TRUE(d >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	734
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	735 // operator>()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	736 ASSERT_FALSE(a > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	737 ASSERT_FALSE(a > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	738 ASSERT_FALSE(a > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	739 ASSERT_FALSE(a > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	740
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	741 ASSERT_TRUE(b > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	742 ASSERT_FALSE(b > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	743 ASSERT_FALSE(b > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	744 ASSERT_FALSE(b > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	745
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	746 ASSERT_TRUE(c > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	747 ASSERT_TRUE(c > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	748 ASSERT_FALSE(c > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	749 ASSERT_FALSE(c > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	750
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	751 ASSERT_TRUE(d > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	752 ASSERT_TRUE(d > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	753 ASSERT_TRUE(d > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	754 ASSERT_FALSE(d > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	755 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	756
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	757
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	758
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	759 #include "../Sources/SystemToolbox.h"
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	760
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	761 TEST(DicomMap, DISABLED_ParseDicomMetaInformation)
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	762 {
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	763 static const std::string PATH = "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/";
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	764
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	765 std::map<std::string, DicomTransferSyntax> f;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	766 f.insert(std::make_pair(PATH + "../ColorTestMalaterre.dcm", DicomTransferSyntax_LittleEndianImplicit)); // 1.2.840.10008.1.2
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	767 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.1.dcm", DicomTransferSyntax_LittleEndianExplicit));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	768 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.2.dcm", DicomTransferSyntax_BigEndianExplicit));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	769 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.50.dcm", DicomTransferSyntax_JPEGProcess1));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	770 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.51.dcm", DicomTransferSyntax_JPEGProcess2_4));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	771 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.57.dcm", DicomTransferSyntax_JPEGProcess14));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	772 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.70.dcm", DicomTransferSyntax_JPEGProcess14SV1));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	773 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.80.dcm", DicomTransferSyntax_JPEGLSLossless));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	774 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.81.dcm", DicomTransferSyntax_JPEGLSLossy));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	775 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.90.dcm", DicomTransferSyntax_JPEG2000LosslessOnly));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	776 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.91.dcm", DicomTransferSyntax_JPEG2000));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	777 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.5.dcm", DicomTransferSyntax_RLELossless));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	778
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	779 for (std::map<std::string, DicomTransferSyntax>::const_iterator it = f.begin(); it != f.end(); ++it)
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	780 {
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	781 printf("\n== %s ==\n\n", it->first.c_str());
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	782
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	783 std::string dicom;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	784 SystemToolbox::ReadFile(dicom, it->first, false);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	785
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	786 DicomMap d;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	787 ASSERT_TRUE(DicomMap::ParseDicomMetaInformation(d, dicom.c_str(), dicom.size()));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	788 d.Print(stdout);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	789
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	790 std::string s;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	791 ASSERT_TRUE(d.LookupStringValue(s, DICOM_TAG_TRANSFER_SYNTAX_UID, false));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	792
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	793 DicomTransferSyntax ts;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	794 ASSERT_TRUE(LookupTransferSyntax(ts, s));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	795 ASSERT_EQ(ts, it->second);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	796 }
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	797 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	798
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	799
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	800 namespace
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	801 {
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	802 class V : public DicomStreamReader::IVisitor
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	803 {
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	804 private:
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	805 DicomMap map_;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	806
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	807 public:
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	808 const DicomMap& GetDicomMap() const
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	809 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	810 return map_;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	811 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	812
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	813 virtual void VisitMetaHeaderTag(const DicomTag& tag,
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	814 const ValueRepresentation& vr,
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	815 const std::string& value) ORTHANC_OVERRIDE
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	816 {
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	817 std::cout << "Header: " << tag.Format() << " [" << Toolbox::ConvertToAscii(value).c_str() << "] (" << value.size() << ")" << std::endl;
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	818 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	819
4220 92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	820 virtual void VisitTransferSyntax(DicomTransferSyntax transferSyntax) ORTHANC_OVERRIDE
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	821 {
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	822 printf("TRANSFER SYNTAX: %s\n", GetTransferSyntaxUid(transferSyntax));
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	823 }
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	824
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	825 virtual bool VisitDatasetTag(const DicomTag& tag,
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	826 const ValueRepresentation& vr,
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	827 const std::string& value,
28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	828 bool isLittleEndian) ORTHANC_OVERRIDE
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	829 {
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	830 if (!isLittleEndian)
28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	831 printf("** ");
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	832 if (tag.GetGroup() < 0x7f00)
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	833 {
4216 61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	834 std::cout << "Dataset: " << tag.Format() << " " << EnumerationToString(vr)
61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	835 << " [" << Toolbox::ConvertToAscii(value).c_str() << "] (" << value.size() << ")" << std::endl;
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	836 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	837 else
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	838 {
4216 61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	839 std::cout << "Dataset: " << tag.Format() << " " << EnumerationToString(vr)
61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	840 << " [PIXEL] (" << value.size() << ")" << std::endl;
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	841 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	842
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	843 map_.SetValue(tag, value, Toolbox::IsAsciiString(value));
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	844
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	845 return true;
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	846 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	847 };
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	848 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	849
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	850
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	851
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	852 TEST(DicomStreamReader, DISABLED_Tutu)
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	853 {
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	854 static const std::string PATH = "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/";
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	855
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	856 std::string dicom;
4216 61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	857 SystemToolbox::ReadFile(dicom, PATH + "../ColorTestMalaterre.dcm", false);
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	858 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.1.dcm", false);
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	859 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.2.dcm", false); // Big Endian
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	860 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.4.50.dcm", false);
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	861 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.4.51.dcm", false);
28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	862 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.4.57.dcm", false);
28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	863 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.4.70.dcm", false);
28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	864 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.4.80.dcm", false);
28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	865 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.4.81.dcm", false);
28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	866 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.4.90.dcm", false);
28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	867 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.4.91.dcm", false);
4216 61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	868 //SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.5.dcm", false);
61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	869
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	870 std::stringstream stream;
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	871 size_t pos = 0;
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	872
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	873 DicomStreamReader r(stream);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	874 V visitor;
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	875
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	876 while (pos < dicom.size() &&
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	877 !r.IsDone())
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	878 {
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	879 //printf(".");
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	880 //printf("%d\n", pos);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	881 r.Consume(visitor);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	882 stream.clear();
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	883 stream.put(dicom[pos++]);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	884 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	885
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	886 r.Consume(visitor);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	887
4223 3d6f14a05db1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4220 diff changeset	888 printf(">> %d\n", static_cast<int>(r.GetProcessedBytes()));
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	889 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	890
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	891 TEST(DicomStreamReader, DISABLED_Tutu2)
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	892 {
4223 3d6f14a05db1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4220 diff changeset	893 //static const std::string PATH = "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/";
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	894
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	895 //const std::string path = PATH + "1.2.840.10008.1.2.4.50.dcm";
4217 78c8b4a18619 fix for c++98 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4216 diff changeset	896 //const std::string path = PATH + "1.2.840.10008.1.2.2.dcm";
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	897 const std::string path = "/home/jodogne/Subversion/orthanc-tests/Database/HierarchicalAnonymization/RTH/RT.dcm";
4217 78c8b4a18619 fix for c++98 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4216 diff changeset	898
78c8b4a18619 fix for c++98 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4216 diff changeset	899 std::ifstream stream(path.c_str());
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	900
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	901 DicomStreamReader r(stream);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	902 V visitor;
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	903
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	904 r.Consume(visitor);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	905
4223 3d6f14a05db1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4220 diff changeset	906 printf(">> %d\n", static_cast<int>(r.GetProcessedBytes()));
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	907 }
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	908
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	909
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	910 #include <boost/filesystem.hpp>
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	911
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	912 TEST(DicomStreamReader, DISABLED_Tutu3)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	913 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	914 static const std::string PATH = "/home/jodogne/Subversion/orthanc-tests/Database/";
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	915
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	916 std::set<std::string> errors;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	917 unsigned int success = 0;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	918
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	919 for (boost::filesystem::recursive_directory_iterator current(PATH), end;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	920 current != end ; ++current)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	921 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	922 if (SystemToolbox::IsRegularFile(current->path().string()))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	923 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	924 try
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	925 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	926 if (current->path().extension() == ".dcm")
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	927 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	928 const std::string path = current->path().string();
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	929 printf("[%s]\n", path.c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	930
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	931 DicomMap m1;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	932
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	933 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	934 std::ifstream stream(path.c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	935
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	936 DicomStreamReader r(stream);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	937 V visitor;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	938
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	939 try
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	940 {
4220 92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	941 r.Consume(visitor, DICOM_TAG_PIXEL_DATA);
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	942 //r.Consume(visitor);
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	943 success++;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	944 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	945 catch (OrthancException& e)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	946 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	947 errors.insert(path);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	948 continue;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	949 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	950
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	951 m1.Assign(visitor.GetDicomMap());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	952 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	953
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	954 m1.SetValue(DICOM_TAG_PIXEL_DATA, "", true);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	955
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	956
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	957 DicomMap m2;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	958
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	959 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	960 std::string dicom;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	961 SystemToolbox::ReadFile(dicom, path);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	962
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	963 ParsedDicomFile f(dicom);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	964 f.ExtractDicomSummary(m2, 256);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	965 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	966
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	967 std::set<DicomTag> tags;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	968 m2.GetTags(tags);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	969
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	970 bool first = true;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	971 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	972 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	973 if (!m1.HasTag(*it))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	974 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	975 if (first)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	976 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	977 fprintf(stderr, "[%s]\n", path.c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	978 first = false;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	979 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	980
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	981 std::cerr << "ERROR: " << it->Format() << std::endl;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	982 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	983 else if (!m2.GetValue(*it).IsNull() &&
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	984 !m2.GetValue(*it).IsBinary() &&
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	985 Toolbox::IsAsciiString(m1.GetValue(*it).GetContent()))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	986 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	987 const std::string& v1 = m1.GetValue(*it).GetContent();
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	988 const std::string& v2 = m2.GetValue(*it).GetContent();
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	989
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	990 if (v1 != v2 &&
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	991 (v1.size() != v2.size() + 1 \|\|
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	992 v1.substr(0, v2.size()) != v2))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	993 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	994 std::cerr << "ERROR: [" << v1 << "] [" << v2 << "]" << std::endl;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	995 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	996 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	997 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	998 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	999 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1000 catch (boost::filesystem::filesystem_error&)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1001 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1002 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1003 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1004 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1005
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1006
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1007 printf("\n== ERRORS ==\n");
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1008 for (std::set<std::string>::const_iterator
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1009 it = errors.begin(); it != errors.end(); ++it)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1010 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1011 printf("[%s]\n", it->c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1012 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1013
4223 3d6f14a05db1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4220 diff changeset	1014 printf("\n== SUCCESSES: %u ==\n\n", success);
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1015 }

Mercurial > hg > orthanc

annotate OrthancFramework/UnitTestsSources/DicomMapTests.cpp @ 4294:0923247e69f6