orthanc: OrthancFramework/UnitTestsSources/DicomMapTests.cpp annotate

annotate OrthancFramework/UnitTestsSources/DicomMapTests.cpp @ 4093:3ea5d52757d7 framework

closing branch "framework"

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 30 Jun 2020 15:53:31 +0200
parents	e00f3d089991
children	bf7b9edf6b81

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
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	8 * modify it under the terms of the GNU General Public License as
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	10 * License, or (at your option) any later version.
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 * In addition, as a special exception, the copyright holders of this
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	13 * program give permission to link the code of its release with the
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	16 * the linked executables. You must obey the GNU General Public License
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	20 * you do not wish to do so, delete this exception statement from your
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	21 * version. If you delete this exception statement from all source files
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	22 * in the program, then also delete it here.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	23 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	24 * This program is distributed in the hope that it will be useful, but
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	27 * General Public License for more details.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	28 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	29 * You should have received a copy of the GNU General Public License
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	31 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	32
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	33
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	34 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	35 // 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	36 # include <OrthancFramework.h>
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	37 #endif
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	38
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	39 #if !defined(DCMTK_VERSION_NUMBER)
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	40 # error DCMTK_VERSION_NUMBER is not defined
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	41 #endif
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	42
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	43 #include <gtest/gtest.h>
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	45 #include "../Sources/Compatibility.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	46 #include "../Sources/OrthancException.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	47 #include "../Sources/DicomFormat/DicomMap.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	48 #include "../Sources/DicomParsing/FromDcmtkBridge.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	49 #include "../Sources/DicomParsing/ToDcmtkBridge.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	50 #include "../Sources/DicomParsing/ParsedDicomFile.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	51 #include "../Sources/DicomParsing/DicomWebJsonVisitor.h"
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 using namespace Orthanc;
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 TEST(DicomMap, MainTags)
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 {
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_PATIENT_ID, ResourceType_Patient));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 ASSERT_FALSE(DicomMap::IsMainDicomTag(DICOM_TAG_PATIENT_ID, ResourceType_Study));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_STUDY_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_ACCESSION_NUMBER));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_SERIES_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_SOP_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 std::set<DicomTag> s;
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 DicomMap::GetMainDicomTags(s);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_PATIENT_ID));
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_SERIES_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 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	74
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 DicomMap::GetMainDicomTags(s, ResourceType_Patient);
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 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	78
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 DicomMap::GetMainDicomTags(s, ResourceType_Study);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 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	81 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_ACCESSION_NUMBER));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_PATIENT_ID));
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 DicomMap::GetMainDicomTags(s, ResourceType_Series);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 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	86 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 DicomMap::GetMainDicomTags(s, ResourceType_Instance);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 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	90 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 }
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94 TEST(DicomMap, Tags)
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 {
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	96 std::set<DicomTag> s;
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	97
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 DicomMap m;
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	99 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	100 ASSERT_EQ(0u, s.size());
1360 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_NAME));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103 ASSERT_FALSE(m.HasTag(0x0010, 0x0010));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	104 m.SetValue(0x0010, 0x0010, "PatientName", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105 ASSERT_TRUE(m.HasTag(DICOM_TAG_PATIENT_NAME));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 ASSERT_TRUE(m.HasTag(0x0010, 0x0010));
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(1u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	110 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, *s.begin());
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	111
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112 ASSERT_FALSE(m.HasTag(DICOM_TAG_PATIENT_ID));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	113 m.SetValue(DICOM_TAG_PATIENT_ID, "PatientID", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114 ASSERT_TRUE(m.HasTag(0x0010, 0x0020));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	115 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	116 ASSERT_EQ("PatientID2", m.GetValue(0x0010, 0x0020).GetContent());
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	118 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	119 ASSERT_EQ(2u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	120
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 m.Remove(DICOM_TAG_PATIENT_ID);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 ASSERT_THROW(m.GetValue(0x0010, 0x0020), OrthancException);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	124 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	125 ASSERT_EQ(1u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	126 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, *s.begin());
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	127
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3694 diff changeset	128 std::unique_ptr<DicomMap> mm(m.Clone());
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	129 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	130
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	131 m.SetValue(DICOM_TAG_PATIENT_ID, "Hello", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 ASSERT_THROW(mm->GetValue(DICOM_TAG_PATIENT_ID), OrthancException);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133 mm->CopyTagIfExists(m, DICOM_TAG_PATIENT_ID);
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	134 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	135
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	136 DicomValue v;
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137 ASSERT_TRUE(v.IsNull());
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 }
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 TEST(DicomMap, FindTemplates)
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 {
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 DicomMap m;
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::SetupFindPatientTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 ASSERT_TRUE(m.HasTag(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 DicomMap::SetupFindStudyTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 ASSERT_TRUE(m.HasTag(DICOM_TAG_STUDY_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 ASSERT_TRUE(m.HasTag(DICOM_TAG_ACCESSION_NUMBER));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 DicomMap::SetupFindSeriesTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 ASSERT_TRUE(m.HasTag(DICOM_TAG_SERIES_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 DicomMap::SetupFindInstanceTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156 ASSERT_TRUE(m.HasTag(DICOM_TAG_SOP_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 }
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	158
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	159
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	160
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	161
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	162 static void TestModule(ResourceType level,
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	163 DicomModule module)
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	164 {
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	165 // REFERENCE: DICOM PS3.3 2015c - Information Object Definitions
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	166 // 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	167
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	168 std::set<DicomTag> moduleTags, main;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	169 DicomTag::AddTagsForModule(moduleTags, module);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	170 DicomMap::GetMainDicomTags(main, level);
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	171
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	172 // The main dicom tags are a subset of the module
1304 7b6925b0890d cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	173 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	174 {
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	175 bool ok = moduleTags.find(*it) != moduleTags.end();
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	176
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	177 // Exceptions for the Study level
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	178 if (level == ResourceType_Study &&
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	179 (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	180 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	181 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	182 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	183 ok = true;
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	184 }
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	185
1849 6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	186 // Exceptions for the Series level
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	187 if (level == ResourceType_Series &&
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	188 (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	189 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	190 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	191 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	192 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	193 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	194 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	195 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	196 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	197 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	198 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	199 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	200 {
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	201 ok = true;
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	202 }
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	203
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	204 // Exceptions for the Instance level
1704 d2268c7a7ede fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	205 if (level == ResourceType_Instance &&
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	206 (it == DicomTag(0x0020, 0x0012) \|\| / AccessionNumber, from General Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	207 it == DicomTag(0x0054, 0x1330) \|\| / ImageIndex, from PET Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	208 it == DicomTag(0x0020, 0x0100) \|\| / TemporalPositionIdentifier, from MR Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	209 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	210 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	211 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	212 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	213 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	214 ok = true;
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 if (!ok)
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	218 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	219 std::cout << it->Format() << ": " << FromDcmtkBridge::GetTagName(*it, "")
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	220 << " not expected at level " << EnumerationToString(level) << std::endl;
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	221 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	222
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	223 EXPECT_TRUE(ok);
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	224 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	225 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	226
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	227
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	228 TEST(DicomMap, Modules)
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	229 {
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	230 TestModule(ResourceType_Patient, DicomModule_Patient);
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	231 TestModule(ResourceType_Study, DicomModule_Study);
1849 6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	232 TestModule(ResourceType_Series, DicomModule_Series); // TODO
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	233 TestModule(ResourceType_Instance, DicomModule_Instance);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	234 }
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	235
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	236
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	237 TEST(DicomMap, Parse)
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 DicomMap m;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	240 float f;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	241 double d;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	242 int32_t i;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	243 int64_t j;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	244 uint32_t k;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	245 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	246 unsigned int ui;
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	247 std::string s;
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	248
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	249 m.SetValue(DICOM_TAG_PATIENT_NAME, " ", false); // Empty value
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	250 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	251 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	252 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	253 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	254 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	255 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	256
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	257 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	258 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	259 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	260 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	261 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	262 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	263 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	264
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	265 ASSERT_FALSE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	266 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	267 ASSERT_EQ("0", s);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	268
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	269
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	270 // 2**31-1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	271 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483647", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	272 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	273 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	274 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	275 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	276 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	277 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	278 ASSERT_FLOAT_EQ(2147483647.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	279 ASSERT_DOUBLE_EQ(2147483647.0, d);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	280 ASSERT_EQ(2147483647, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	281 ASSERT_EQ(2147483647ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	282 ASSERT_EQ(2147483647u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	283 ASSERT_EQ(2147483647ull, l);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	284
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	285 // Test shortcuts
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	286 m.SetValue(DICOM_TAG_PATIENT_NAME, "42", false);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	287 ASSERT_TRUE(m.ParseFloat(f, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	288 ASSERT_TRUE(m.ParseDouble(d, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	289 ASSERT_TRUE(m.ParseInteger32(i, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	290 ASSERT_TRUE(m.ParseInteger64(j, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	291 ASSERT_TRUE(m.ParseUnsignedInteger32(k, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	292 ASSERT_TRUE(m.ParseUnsignedInteger64(l, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	293 ASSERT_FLOAT_EQ(42.0f, f);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	294 ASSERT_DOUBLE_EQ(42.0, d);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	295 ASSERT_EQ(42, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	296 ASSERT_EQ(42ll, j);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	297 ASSERT_EQ(42u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	298 ASSERT_EQ(42ull, l);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	299
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	300 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	301 ASSERT_EQ("42", s);
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	302 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	303 ASSERT_EQ("42", s);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	304
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	305
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	306 // 2**31
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	307 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483648", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	308 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	309 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	310 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	311 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	312 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	313 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	314 ASSERT_FLOAT_EQ(2147483648.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	315 ASSERT_DOUBLE_EQ(2147483648.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	316 ASSERT_EQ(2147483648ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	317 ASSERT_EQ(2147483648u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	318 ASSERT_EQ(2147483648ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	319
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	320 // 2**32-1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	321 m.SetValue(DICOM_TAG_PATIENT_NAME, "4294967295", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	322 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	323 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	324 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	325 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	326 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	327 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	328 ASSERT_FLOAT_EQ(4294967295.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	329 ASSERT_DOUBLE_EQ(4294967295.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	330 ASSERT_EQ(4294967295ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	331 ASSERT_EQ(4294967295u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	332 ASSERT_EQ(4294967295ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	333
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	334 // 2**32
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	335 m.SetValue(DICOM_TAG_PATIENT_NAME, "4294967296", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	336 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	337 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	338 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	339 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	340 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	341 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	342 ASSERT_FLOAT_EQ(4294967296.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	343 ASSERT_DOUBLE_EQ(4294967296.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	344 ASSERT_EQ(4294967296ll, j);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	345 ASSERT_EQ(4294967296ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	346
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	347 m.SetValue(DICOM_TAG_PATIENT_NAME, "-1", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	348 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	349 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	350 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	351 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	352 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	353 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	354 ASSERT_FLOAT_EQ(-1.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	355 ASSERT_DOUBLE_EQ(-1.0, d);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	356 ASSERT_EQ(-1, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	357 ASSERT_EQ(-1ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	358
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	359 // -2**31
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	360 m.SetValue(DICOM_TAG_PATIENT_NAME, "-2147483648", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	361 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	362 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	363 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	364 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	365 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	366 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	367 ASSERT_FLOAT_EQ(-2147483648.0f, f);
2829 61fdb06e389a fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	368 ASSERT_DOUBLE_EQ(-2147483648.0, d);
61fdb06e389a fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	369 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	370 ASSERT_EQ(-2147483648ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	371
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	372 // -2**31 - 1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	373 m.SetValue(DICOM_TAG_PATIENT_NAME, "-2147483649", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	374 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	375 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	376 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	377 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	378 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	379 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	380 ASSERT_FLOAT_EQ(-2147483649.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	381 ASSERT_DOUBLE_EQ(-2147483649.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	382 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	383
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	384
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	385 // "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	386 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	387 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	388 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	389 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	390 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	391 ASSERT_EQ(800u, ui);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	392 }
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	393
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	394
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	395 TEST(DicomMap, Serialize)
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 Json::Value s;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	398
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	399 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	400 DicomMap m;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	401 m.SetValue(DICOM_TAG_PATIENT_NAME, "Hello", false);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	402 m.SetValue(DICOM_TAG_STUDY_DESCRIPTION, "Binary", true);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	403 m.SetNullValue(DICOM_TAG_SERIES_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	404 m.Serialize(s);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	405 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	406
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	407 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	408 DicomMap m;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	409 m.Unserialize(s);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	410
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	411 const DicomValue* v = m.TestAndGetValue(DICOM_TAG_ACCESSION_NUMBER);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	412 ASSERT_TRUE(v == NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	413
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	414 v = m.TestAndGetValue(DICOM_TAG_PATIENT_NAME);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	415 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	416 ASSERT_FALSE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	417 ASSERT_FALSE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	418 ASSERT_EQ("Hello", v->GetContent());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	419
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	420 v = m.TestAndGetValue(DICOM_TAG_STUDY_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	421 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	422 ASSERT_FALSE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	423 ASSERT_TRUE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	424 ASSERT_EQ("Binary", v->GetContent());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	425
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	426 v = m.TestAndGetValue(DICOM_TAG_SERIES_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	427 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	428 ASSERT_TRUE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	429 ASSERT_FALSE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	430 ASSERT_THROW(v->GetContent(), OrthancException);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	431 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	432 }
3005 8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	433
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	434
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	435
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	436 TEST(DicomMap, ExtractMainDicomTags)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	437 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	438 DicomMap b;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	439 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	440 ASSERT_TRUE(b.HasOnlyMainDicomTags());
3006 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 DicomMap a;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	444 a.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	445 a.SetValue(DICOM_TAG_STUDY_DESCRIPTION, "B", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	446 a.SetValue(DICOM_TAG_SERIES_DESCRIPTION, "C", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	447 a.SetValue(DICOM_TAG_NUMBER_OF_FRAMES, "D", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	448 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	449 ASSERT_FALSE(a.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	450 b.ExtractMainDicomTags(a);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	451 }
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 ASSERT_EQ(4u, b.GetSize());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	454 ASSERT_EQ("A", b.GetValue(DICOM_TAG_PATIENT_NAME).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	455 ASSERT_EQ("B", b.GetValue(DICOM_TAG_STUDY_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	456 ASSERT_EQ("C", b.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	457 ASSERT_EQ("D", b.GetValue(DICOM_TAG_NUMBER_OF_FRAMES).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	458 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	459 ASSERT_TRUE(b.HasOnlyMainDicomTags());
3006 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 b.SetValue(DICOM_TAG_PATIENT_NAME, "G", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	462
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	463 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	464 DicomMap a;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	465 a.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	466 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	467 ASSERT_FALSE(a.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	468 b.Merge(a);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	469 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	470
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	471 ASSERT_EQ(5u, b.GetSize());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	472 ASSERT_EQ("G", b.GetValue(DICOM_TAG_PATIENT_NAME).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	473 ASSERT_EQ("B", b.GetValue(DICOM_TAG_STUDY_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	474 ASSERT_EQ("C", b.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	475 ASSERT_EQ("D", b.GetValue(DICOM_TAG_NUMBER_OF_FRAMES).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	476 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	477 ASSERT_FALSE(b.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	478 }
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	479
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	480
3551 173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	481 TEST(DicomMap, RemoveBinary)
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	482 {
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	483 DicomMap b;
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	484 b.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	485 b.SetValue(DICOM_TAG_PATIENT_ID, "B", true);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	486 b.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, DicomValue()); // NULL
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	487 b.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, DicomValue("C", false));
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	488 b.SetValue(DICOM_TAG_SOP_INSTANCE_UID, DicomValue("D", true));
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	489
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	490 b.RemoveBinaryTags();
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	491
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	492 std::string s;
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	493 ASSERT_EQ(2u, b.GetSize());
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	494 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	495 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	496 }
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	497
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	498
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	499
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	500 TEST(DicomWebJson, Multiplicity)
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 // 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	503
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	504 ParsedDicomFile dicom(false);
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	505 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	506 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	507 dicom.ReplacePlainString(DICOM_TAG_IMAGE_POSITION_PATIENT, "");
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	508
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	509 DicomWebJsonVisitor visitor;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	510 dicom.Apply(visitor);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	511
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	512 {
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	513 const Json::Value& tag = visitor.GetResult() ["00200037"]; // ImageOrientationPatient
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	514 const Json::Value& value = tag["Value"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	515
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	516 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	517 ASSERT_EQ(2u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	518 ASSERT_EQ(3u, value.size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	519 ASSERT_EQ(Json::realValue, value[1].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	520 ASSERT_FLOAT_EQ(1.0f, value[0].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	521 ASSERT_FLOAT_EQ(2.3f, value[1].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	522 ASSERT_FLOAT_EQ(4.0f, value[2].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	523 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	524
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	525 {
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	526 const Json::Value& tag = visitor.GetResult() ["00200032"]; // ImagePositionPatient
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	527 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	528 ASSERT_EQ(1u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	529 }
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	530
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	531 std::string xml;
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	532 visitor.FormatXml(xml);
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	533
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	534 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	535 DicomMap m;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	536 m.FromDicomWeb(visitor.GetResult());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	537 ASSERT_EQ(3u, m.GetSize());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	538
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	539 std::string s;
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	540 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	541 ASSERT_EQ("SB1^SB2^SB3^SB4^SB5", s);
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	542 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	543 ASSERT_TRUE(s.empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	544
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	545 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	546
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	547 std::vector<std::string> v;
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	548 Toolbox::TokenizeString(v, s, '\\');
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	549 ASSERT_FLOAT_EQ(1.0f, boost::lexical_cast<float>(v[0]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	550 ASSERT_FLOAT_EQ(2.3f, boost::lexical_cast<float>(v[1]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	551 ASSERT_FLOAT_EQ(4.0f, boost::lexical_cast<float>(v[2]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	552 }
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	553 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	554
3198 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 TEST(DicomWebJson, NullValue)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	557 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	558 // 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	559
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	560 ParsedDicomFile dicom(false);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	561 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	562
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	563 DicomWebJsonVisitor visitor;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	564 dicom.Apply(visitor);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	565
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	566 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	567 const Json::Value& tag = visitor.GetResult() ["00200037"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	568 const Json::Value& value = tag["Value"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	569
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	570 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	571 ASSERT_EQ(2u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	572 ASSERT_EQ(4u, value.size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	573 ASSERT_EQ(Json::realValue, value[0].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	574 ASSERT_EQ(Json::nullValue, value[1].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	575 ASSERT_EQ(Json::nullValue, value[2].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	576 ASSERT_EQ(Json::realValue, value[3].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	577 ASSERT_FLOAT_EQ(1.5f, value[0].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	578 ASSERT_FLOAT_EQ(2.5f, value[3].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	579 }
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	580
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	581 std::string xml;
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	582 visitor.FormatXml(xml);
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	583
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	584 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	585 DicomMap m;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	586 m.FromDicomWeb(visitor.GetResult());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	587 ASSERT_EQ(1u, m.GetSize());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	588
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	589 std::string s;
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	590 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	591
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	592 std::vector<std::string> v;
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	593 Toolbox::TokenizeString(v, s, '\\');
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	594 ASSERT_FLOAT_EQ(1.5f, boost::lexical_cast<float>(v[0]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	595 ASSERT_TRUE(v[1].empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	596 ASSERT_TRUE(v[2].empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	597 ASSERT_FLOAT_EQ(2.5f, boost::lexical_cast<float>(v[3]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	598 }
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	599 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	600
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	601
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	602 TEST(DicomWebJson, PixelSpacing)
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	603 {
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	604 // 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	605 // correctly handled (dot "." vs comma ",")
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	606 ParsedDicomFile source(false);
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	607 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	608
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	609 DicomWebJsonVisitor visitor;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	610 source.Apply(visitor);
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	611
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	612 DicomMap target;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	613 target.FromDicomWeb(visitor.GetResult());
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	614
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	615 ASSERT_EQ("DS", visitor.GetResult() ["00280030"]["vr"].asString());
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	616 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	617 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	618
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	619 std::string s;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	620 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	621 ASSERT_EQ(s, "1.5\\1.3");
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	622 }
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	623
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	624
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	625 TEST(DicomMap, MainTagNames)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	626 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	627 ASSERT_EQ(3, ResourceType_Instance - ResourceType_Patient);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	628
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	629 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	630 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	631 ResourceType level = static_cast<ResourceType>(i);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	632
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	633 std::set<DicomTag> tags;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	634 DicomMap::GetMainDicomTags(tags, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	635
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	636 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	637 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	638 DicomMap a;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	639 a.SetValue(*it, "TEST", false);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	640
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	641 Json::Value json;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	642 a.DumpMainDicomTags(json, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	643
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	644 ASSERT_EQ(Json::objectValue, json.type());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	645 ASSERT_EQ(1u, json.getMemberNames().size());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	646
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	647 std::string name = json.getMemberNames() [0];
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	648 EXPECT_EQ(name, FromDcmtkBridge::GetTagName(*it, ""));
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	649
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	650 DicomMap b;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	651 b.ParseMainDicomTags(json, level);
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 ASSERT_EQ(1u, b.GetSize());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	654 ASSERT_EQ("TEST", b.GetStringValue(*it, "", false));
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	655
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	656 std::string main = it->GetMainTagsName();
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	657 if (!main.empty())
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	658 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	659 ASSERT_EQ(main, name);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	660 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	661 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	662 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	663 }

Mercurial > hg > orthanc

annotate OrthancFramework/UnitTestsSources/DicomMapTests.cpp @ 4093:3ea5d52757d7 framework