orthanc: OrthancFramework/UnitTestsSources/DicomMapTests.cpp annotate

annotate OrthancFramework/UnitTestsSources/DicomMapTests.cpp @ 5795:9990b4140c1c find-refactoring

fix unit tests

author	Alain Mazy <am@orthanc.team>
date	Wed, 18 Sep 2024 15:45:18 +0200
parents	a8055aebc6cb
children

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
5640 f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
5485 48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	8 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	9 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	10 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	11 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	12 * the License, or (at your option) any later version.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	13 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	14 * 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	15 * 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	16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	17 * Lesser General Public License for more details.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	18 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	19 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	20 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	21 * <http://www.gnu.org/licenses/>.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	22 **/
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
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	25 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	26 // 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	27 # include <OrthancFramework.h>
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	28 #endif
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	29
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	30 #if !defined(DCMTK_VERSION_NUMBER)
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	31 # error DCMTK_VERSION_NUMBER is not defined
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	32 #endif
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	33
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	34 #include <gtest/gtest.h>
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	36 #include "../Sources/Compatibility.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	37 #include "../Sources/OrthancException.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	38 #include "../Sources/DicomFormat/DicomMap.h"
4220 92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	39 #include "../Sources/DicomFormat/DicomStreamReader.h"
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	40 #include "../Sources/DicomParsing/FromDcmtkBridge.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	41 #include "../Sources/DicomParsing/ToDcmtkBridge.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	42 #include "../Sources/DicomParsing/ParsedDicomFile.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	43 #include "../Sources/DicomParsing/DicomWebJsonVisitor.h"
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
4304 50b0c69b653a continued abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4223 diff changeset	45 #include <boost/lexical_cast.hpp>
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	46 #include <boost/tuple/tuple.hpp>
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 using namespace Orthanc;
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	50
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	51 namespace Orthanc
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 {
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	53 // The namespace is necessary because of FRIEND_TEST
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	54 // http://code.google.com/p/googletest/wiki/AdvancedGuide#Private_Class_Members
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	55
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	56 class DicomMapMainTagsTests : public ::testing::Test
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	57 {
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	58 public:
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	59 DicomMapMainTagsTests()
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	60 {
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	61 }
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	62
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	63 virtual void SetUp() ORTHANC_OVERRIDE
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	64 {
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	65 DicomMap::ResetDefaultMainDicomTags();
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	66 }
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	68 virtual void TearDown() ORTHANC_OVERRIDE
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	69 {
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	70 DicomMap::ResetDefaultMainDicomTags();
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	71 }
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	72 };
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	73
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	74 TEST_F(DicomMapMainTagsTests, MainTags)
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	75 {
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	76 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_PATIENT_ID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	77 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_PATIENT_ID, ResourceType_Patient));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	78 ASSERT_FALSE(DicomMap::IsMainDicomTag(DICOM_TAG_PATIENT_ID, ResourceType_Study));
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	80 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_STUDY_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	81 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_ACCESSION_NUMBER));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	82 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_SERIES_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	83 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_SOP_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	84
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	85 {
5176 6d8647122ef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 5175 diff changeset	86 std::set<DicomTag> s;
6d8647122ef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 5175 diff changeset	87 DicomMap::GetAllMainDicomTags(s);
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	88 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_PATIENT_ID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	89 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_STUDY_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	90 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_ACCESSION_NUMBER));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	91 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_SERIES_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	92 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_SOP_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	93 }
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	95 {
5175 48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	96 std::set<DicomTag> s;
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	97 DicomMap::GetMainDicomTags(s, ResourceType_Patient);
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	98 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_PATIENT_ID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	99 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_STUDY_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	100 }
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	102 {
5175 48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	103 std::set<DicomTag> s;
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	104 DicomMap::GetMainDicomTags(s, ResourceType_Study);
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	105 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_STUDY_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	106 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_ACCESSION_NUMBER));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	107 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_PATIENT_ID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	108 }
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	109
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	110 {
5175 48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	111 std::set<DicomTag> s;
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	112 DicomMap::GetMainDicomTags(s, ResourceType_Series);
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	113 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_SERIES_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	114 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_PATIENT_ID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	115 }
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	117 {
5175 48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	118 std::set<DicomTag> s;
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	119 DicomMap::GetMainDicomTags(s, ResourceType_Instance);
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	120 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_SOP_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	121 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_PATIENT_ID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	122 }
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	123 }
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	124
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	125 TEST_F(DicomMapMainTagsTests, AddMainTags)
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	126 {
5040 1c08cd68250a removed the 'name' of MainDicomTags to simplify code -> DicomMap::ParseMainDicomTags has been deprecated and one should use DicomMap::FromDicomAsJson on 'full' formatted tags Alain Mazy <am@osimis.io> parents: 5036 diff changeset	127 DicomMap::AddMainDicomTag(DICOM_TAG_BITS_ALLOCATED, ResourceType_Instance);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	129 {
5175 48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	130 std::set<DicomTag> s;
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	131 DicomMap::GetMainDicomTags(s, ResourceType_Instance);
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	132 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_BITS_ALLOCATED));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	133 ASSERT_TRUE(s.end() != s.find(DICOM_TAG_SOP_INSTANCE_UID));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	134 }
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	135 {
5175 48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	136 std::set<DicomTag> s;
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	137 DicomMap::GetMainDicomTags(s, ResourceType_Series);
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	138 ASSERT_TRUE(s.end() == s.find(DICOM_TAG_BITS_ALLOCATED));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	139 }
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	140
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	141 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_BITS_ALLOCATED));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	142 ASSERT_TRUE(DicomMap::IsMainDicomTag(DICOM_TAG_BITS_ALLOCATED, ResourceType_Instance));
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	143
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	144 // adding the same tag should throw
5040 1c08cd68250a removed the 'name' of MainDicomTags to simplify code -> DicomMap::ParseMainDicomTags has been deprecated and one should use DicomMap::FromDicomAsJson on 'full' formatted tags Alain Mazy <am@osimis.io> parents: 5036 diff changeset	145 ASSERT_THROW(DicomMap::AddMainDicomTag(DICOM_TAG_BITS_ALLOCATED, ResourceType_Instance), OrthancException);
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	146
b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	147 }
4933 312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	148
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	149 TEST_F(DicomMapMainTagsTests, Signatures)
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	150 {
5795 9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	151 std::string defaultPatientSignature = DicomMap::GetDefaultMainDicomTagsSignatureFrom1_11(ResourceType_Patient);
9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	152 std::string defaultStudySignature = DicomMap::GetDefaultMainDicomTagsSignatureFrom1_11(ResourceType_Study);
9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	153 std::string defaultSeriesSignature = DicomMap::GetDefaultMainDicomTagsSignatureFrom1_11(ResourceType_Series);
9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	154 std::string defaultInstanceSignature = DicomMap::GetDefaultMainDicomTagsSignatureFrom1_11(ResourceType_Instance);
4933 312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	155
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	156 ASSERT_NE(defaultInstanceSignature, defaultPatientSignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	157 ASSERT_NE(defaultSeriesSignature, defaultStudySignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	158 ASSERT_NE(defaultSeriesSignature, defaultPatientSignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	159
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	160 std::string patientSignature = DicomMap::GetMainDicomTagsSignature(ResourceType_Patient);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	161 std::string studySignature = DicomMap::GetMainDicomTagsSignature(ResourceType_Study);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	162 std::string seriesSignature = DicomMap::GetMainDicomTagsSignature(ResourceType_Series);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	163 std::string instanceSignature = DicomMap::GetMainDicomTagsSignature(ResourceType_Instance);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	164
5795 9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	165 // // at start, default and current signature should be equal !! This is not true anymore since we have added new MainDicomTags in 1.12.5
9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	166 // ASSERT_EQ(defaultPatientSignature, patientSignature);
9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	167 // ASSERT_EQ(defaultStudySignature, studySignature);
9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	168 // ASSERT_EQ(defaultSeriesSignature, seriesSignature);
9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	169 // ASSERT_EQ(defaultInstanceSignature, instanceSignature);
4933 312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	170
5040 1c08cd68250a removed the 'name' of MainDicomTags to simplify code -> DicomMap::ParseMainDicomTags has been deprecated and one should use DicomMap::FromDicomAsJson on 'full' formatted tags Alain Mazy <am@osimis.io> parents: 5036 diff changeset	171 DicomMap::AddMainDicomTag(DICOM_TAG_BITS_ALLOCATED, ResourceType_Instance);
4933 312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	172 instanceSignature = DicomMap::GetMainDicomTagsSignature(ResourceType_Instance);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	173
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	174 ASSERT_NE(defaultInstanceSignature, instanceSignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	175 }
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	176
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 }
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4944 diff changeset	179
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180 TEST(DicomMap, Tags)
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181 {
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	182 std::set<DicomTag> s;
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	183
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184 DicomMap m;
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	185 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	186 ASSERT_EQ(0u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	187
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 ASSERT_FALSE(m.HasTag(DICOM_TAG_PATIENT_NAME));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 ASSERT_FALSE(m.HasTag(0x0010, 0x0010));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	190 m.SetValue(0x0010, 0x0010, "PatientName", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 ASSERT_TRUE(m.HasTag(DICOM_TAG_PATIENT_NAME));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192 ASSERT_TRUE(m.HasTag(0x0010, 0x0010));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	194 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	195 ASSERT_EQ(1u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	196 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, *s.begin());
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	197
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 ASSERT_FALSE(m.HasTag(DICOM_TAG_PATIENT_ID));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	199 m.SetValue(DICOM_TAG_PATIENT_ID, "PatientID", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200 ASSERT_TRUE(m.HasTag(0x0010, 0x0020));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	201 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	202 ASSERT_EQ("PatientID2", m.GetValue(0x0010, 0x0020).GetContent());
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	204 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	205 ASSERT_EQ(2u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	206
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 m.Remove(DICOM_TAG_PATIENT_ID);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 ASSERT_THROW(m.GetValue(0x0010, 0x0020), OrthancException);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	210 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	211 ASSERT_EQ(1u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	212 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, *s.begin());
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	213
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3694 diff changeset	214 std::unique_ptr<DicomMap> mm(m.Clone());
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	215 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	216
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	217 m.SetValue(DICOM_TAG_PATIENT_ID, "Hello", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 ASSERT_THROW(mm->GetValue(DICOM_TAG_PATIENT_ID), OrthancException);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 mm->CopyTagIfExists(m, DICOM_TAG_PATIENT_ID);
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	220 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	221
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	222 DicomValue v;
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 ASSERT_TRUE(v.IsNull());
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 }
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 TEST(DicomMap, FindTemplates)
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 {
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 DicomMap m;
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231 DicomMap::SetupFindPatientTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 ASSERT_TRUE(m.HasTag(DICOM_TAG_PATIENT_ID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 DicomMap::SetupFindStudyTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 ASSERT_TRUE(m.HasTag(DICOM_TAG_STUDY_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 ASSERT_TRUE(m.HasTag(DICOM_TAG_ACCESSION_NUMBER));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 DicomMap::SetupFindSeriesTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 ASSERT_TRUE(m.HasTag(DICOM_TAG_SERIES_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 DicomMap::SetupFindInstanceTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 ASSERT_TRUE(m.HasTag(DICOM_TAG_SOP_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 }
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	244
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	245
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	246
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	247
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	248 static void TestModule(ResourceType level,
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	249 DicomModule module)
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	250 {
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	251 // REFERENCE: DICOM PS3.3 2015c - Information Object Definitions
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	252 // 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	253
5175 48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	254 std::set<DicomTag> main;
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	255 DicomMap::GetMainDicomTags(main, level);
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	256
4932 b7ce2bb6b881 refactored the list of MainDicomTags to be able to change it dynamicaly. Unit tests and Integration tests ok Alain Mazy <am@osimis.io> parents: 4870 diff changeset	257 std::set<DicomTag> moduleTags;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	258 DicomTag::AddTagsForModule(moduleTags, module);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	259
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	260 // The main dicom tags are a subset of the module
1304 7b6925b0890d cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	261 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	262 {
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	263 bool ok = moduleTags.find(*it) != moduleTags.end();
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	264
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	265 // Exceptions for the Study level
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	266 if (level == ResourceType_Study &&
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	267 (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	268 it == DicomTag(0x0032, 0x1032) \|\| / RequestingPhysician, from Imaging Service Request module, related to Study */
5795 9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	269 it == DicomTag(0x0008, 0x0201) \|\| / TimezoneOffsetFromUTC */
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	270 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	271 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	272 ok = true;
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	273 }
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	274
1849 6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	275 // Exceptions for the Series level
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	276 if (level == ResourceType_Series &&
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	277 (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	278 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	279 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	280 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	281 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	282 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	283 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	284 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	285 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	286 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	287 it == DicomTag(0x0018, 0x1400) \|\| / AcquisitionDeviceProcessingDescription, from CR/X-Ray/DX/WholeSlideMicro Image (SIMPLIFICATION => Series) */
5795 9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5793 diff changeset	288 it == DicomTag(0x0008, 0x0201) \|\| / TimezoneOffsetFromUTC */
1850 68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1849 diff changeset	289 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	290 {
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	291 ok = true;
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	292 }
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	293
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	294 // Exceptions for the Instance level
1704 d2268c7a7ede fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	295 if (level == ResourceType_Instance &&
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	296 (it == DicomTag(0x0020, 0x0012) \|\| / AccessionNumber, from General Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	297 it == DicomTag(0x0054, 0x1330) \|\| / ImageIndex, from PET Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	298 it == DicomTag(0x0020, 0x0100) \|\| / TemporalPositionIdentifier, from MR Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	299 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	300 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	301 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	302 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	303 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	304 ok = true;
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	305 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	306
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	307 if (!ok)
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	308 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	309 std::cout << it->Format() << ": " << FromDcmtkBridge::GetTagName(*it, "")
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	310 << " not expected at level " << EnumerationToString(level) << std::endl;
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	311 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	312
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	313 EXPECT_TRUE(ok);
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	314 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	315 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	316
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	317
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	318 TEST(DicomMap, Modules)
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	319 {
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	320 TestModule(ResourceType_Patient, DicomModule_Patient);
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	321 TestModule(ResourceType_Study, DicomModule_Study);
1849 6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	322 TestModule(ResourceType_Series, DicomModule_Series); // TODO
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	323 TestModule(ResourceType_Instance, DicomModule_Instance);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	324 }
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	325
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	326
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	327 TEST(DicomMap, Parse)
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	328 {
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	329 DicomMap m;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	330 float f;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	331 double d;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	332 int32_t i;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	333 int64_t j;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	334 uint32_t k;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	335 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	336 unsigned int ui;
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	337 std::string s;
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	338
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	339 m.SetValue(DICOM_TAG_PATIENT_NAME, " ", false); // Empty value
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	340 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	341 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	342 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	343 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	344 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	345 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	346
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	347 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	348 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	349 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	350 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	351 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	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
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	355 ASSERT_FALSE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	356 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	357 ASSERT_EQ("0", s);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	358
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	359
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	360 // 2**31-1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	361 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483647", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	362 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	363 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	364 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	365 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	366 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	367 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	368 ASSERT_FLOAT_EQ(2147483647.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	369 ASSERT_DOUBLE_EQ(2147483647.0, d);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	370 ASSERT_EQ(2147483647, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	371 ASSERT_EQ(2147483647ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	372 ASSERT_EQ(2147483647u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	373 ASSERT_EQ(2147483647ull, l);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	374
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	375 // Test shortcuts
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	376 m.SetValue(DICOM_TAG_PATIENT_NAME, "42", false);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	377 ASSERT_TRUE(m.ParseFloat(f, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	378 ASSERT_TRUE(m.ParseDouble(d, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	379 ASSERT_TRUE(m.ParseInteger32(i, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	380 ASSERT_TRUE(m.ParseInteger64(j, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	381 ASSERT_TRUE(m.ParseUnsignedInteger32(k, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	382 ASSERT_TRUE(m.ParseUnsignedInteger64(l, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	383 ASSERT_FLOAT_EQ(42.0f, f);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	384 ASSERT_DOUBLE_EQ(42.0, d);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	385 ASSERT_EQ(42, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	386 ASSERT_EQ(42ll, j);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	387 ASSERT_EQ(42u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	388 ASSERT_EQ(42ull, l);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	389
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	390 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	391 ASSERT_EQ("42", s);
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	392 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	393 ASSERT_EQ("42", s);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	394
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	395
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	396 // 2**31
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	397 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483648", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	398 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	399 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	400 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	401 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	402 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	403 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	404 ASSERT_FLOAT_EQ(2147483648.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	405 ASSERT_DOUBLE_EQ(2147483648.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	406 ASSERT_EQ(2147483648ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	407 ASSERT_EQ(2147483648u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	408 ASSERT_EQ(2147483648ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	409
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	410 // 2**32-1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	411 m.SetValue(DICOM_TAG_PATIENT_NAME, "4294967295", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	412 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	413 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	414 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	415 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	416 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	417 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	418 ASSERT_FLOAT_EQ(4294967295.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	419 ASSERT_DOUBLE_EQ(4294967295.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	420 ASSERT_EQ(4294967295ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	421 ASSERT_EQ(4294967295u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	422 ASSERT_EQ(4294967295ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	423
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	424 // 2**32
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	425 m.SetValue(DICOM_TAG_PATIENT_NAME, "4294967296", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	426 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	427 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	428 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	429 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	430 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	431 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	432 ASSERT_FLOAT_EQ(4294967296.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	433 ASSERT_DOUBLE_EQ(4294967296.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	434 ASSERT_EQ(4294967296ll, j);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	435 ASSERT_EQ(4294967296ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	436
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	437 m.SetValue(DICOM_TAG_PATIENT_NAME, "-1", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	438 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	439 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	440 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	441 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	442 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	443 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	444 ASSERT_FLOAT_EQ(-1.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	445 ASSERT_DOUBLE_EQ(-1.0, d);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	446 ASSERT_EQ(-1, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	447 ASSERT_EQ(-1ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	448
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	449 // -2**31
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	450 m.SetValue(DICOM_TAG_PATIENT_NAME, "-2147483648", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	451 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	452 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	453 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	454 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	455 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	456 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	457 ASSERT_FLOAT_EQ(-2147483648.0f, f);
2829 61fdb06e389a fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	458 ASSERT_DOUBLE_EQ(-2147483648.0, d);
61fdb06e389a fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	459 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	460 ASSERT_EQ(-2147483648ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	461
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	462 // -2**31 - 1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	463 m.SetValue(DICOM_TAG_PATIENT_NAME, "-2147483649", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	464 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	465 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	466 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	467 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	468 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	469 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	470 ASSERT_FLOAT_EQ(-2147483649.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	471 ASSERT_DOUBLE_EQ(-2147483649.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	472 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	473
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	474
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	475 // "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	476 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	477 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	478 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	479 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	480 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	481 ASSERT_EQ(800u, ui);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	482 }
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	483
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	484
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	485 TEST(DicomMap, Serialize)
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	486 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	487 Json::Value s;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	488
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	489 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	490 DicomMap m;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	491 m.SetValue(DICOM_TAG_PATIENT_NAME, "Hello", false);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	492 m.SetValue(DICOM_TAG_STUDY_DESCRIPTION, "Binary", true);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	493 m.SetNullValue(DICOM_TAG_SERIES_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	494 m.Serialize(s);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	495 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	496
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	497 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	498 DicomMap m;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	499 m.Unserialize(s);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	500
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	501 const DicomValue* v = m.TestAndGetValue(DICOM_TAG_ACCESSION_NUMBER);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	502 ASSERT_TRUE(v == NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	503
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	504 v = m.TestAndGetValue(DICOM_TAG_PATIENT_NAME);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	505 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	506 ASSERT_FALSE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	507 ASSERT_FALSE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	508 ASSERT_EQ("Hello", v->GetContent());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	509
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	510 v = m.TestAndGetValue(DICOM_TAG_STUDY_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	511 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	512 ASSERT_FALSE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	513 ASSERT_TRUE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	514 ASSERT_EQ("Binary", v->GetContent());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	515
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	516 v = m.TestAndGetValue(DICOM_TAG_SERIES_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	517 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	518 ASSERT_TRUE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	519 ASSERT_FALSE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	520 ASSERT_THROW(v->GetContent(), OrthancException);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	521 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	522 }
3005 8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	523
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	524
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	525
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	526 TEST(DicomMap, ExtractMainDicomTags)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	527 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	528 DicomMap b;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	529 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	530 ASSERT_TRUE(b.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	531
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	532 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	533 DicomMap a;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	534 a.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	535 a.SetValue(DICOM_TAG_STUDY_DESCRIPTION, "B", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	536 a.SetValue(DICOM_TAG_SERIES_DESCRIPTION, "C", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	537 a.SetValue(DICOM_TAG_NUMBER_OF_FRAMES, "D", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	538 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	539 ASSERT_FALSE(a.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	540 b.ExtractMainDicomTags(a);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	541 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	542
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	543 ASSERT_EQ(4u, b.GetSize());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	544 ASSERT_EQ("A", b.GetValue(DICOM_TAG_PATIENT_NAME).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	545 ASSERT_EQ("B", b.GetValue(DICOM_TAG_STUDY_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	546 ASSERT_EQ("C", b.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	547 ASSERT_EQ("D", b.GetValue(DICOM_TAG_NUMBER_OF_FRAMES).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	548 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	549 ASSERT_TRUE(b.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	550
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	551 b.SetValue(DICOM_TAG_PATIENT_NAME, "G", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	552
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	553 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	554 DicomMap a;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	555 a.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	556 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	557 ASSERT_FALSE(a.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	558 b.Merge(a);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	559 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	560
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	561 ASSERT_EQ(5u, b.GetSize());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	562 ASSERT_EQ("G", b.GetValue(DICOM_TAG_PATIENT_NAME).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	563 ASSERT_EQ("B", b.GetValue(DICOM_TAG_STUDY_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	564 ASSERT_EQ("C", b.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	565 ASSERT_EQ("D", b.GetValue(DICOM_TAG_NUMBER_OF_FRAMES).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	566 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	567 ASSERT_FALSE(b.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	568 }
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	569
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	570
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	571 TEST(DicomMap, ComputedTags)
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	572 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	573 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	574 std::set<DicomTag> tags;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	575
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	576 ASSERT_FALSE(DicomMap::HasOnlyComputedTags(tags));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	577 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Instance));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	578 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Series));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	579 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Study));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	580 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Patient));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	581 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	582
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	583 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	584 std::set<DicomTag> tags;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	585 tags.insert(DICOM_TAG_ACCESSION_NUMBER);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	586
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	587 ASSERT_FALSE(DicomMap::HasOnlyComputedTags(tags));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	588 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Instance));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	589 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Series));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	590 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Study));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	591 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Patient));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	592 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	593
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	594 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	595 std::set<DicomTag> tags;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	596 tags.insert(DICOM_TAG_MODALITIES_IN_STUDY);
4944 f377d5643538 new Warnings configuration + InstanceAvailability tag Alain Mazy <am@osimis.io> parents: 4940 diff changeset	597 tags.insert(DICOM_TAG_RETRIEVE_URL);
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	598
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	599 ASSERT_TRUE(DicomMap::HasOnlyComputedTags(tags));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	600 ASSERT_TRUE(DicomMap::HasComputedTags(tags, ResourceType_Study));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	601 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Patient));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	602 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Series));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	603 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Instance));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	604 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	605
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	606 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	607 std::set<DicomTag> tags;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	608 tags.insert(DICOM_TAG_ACCESSION_NUMBER);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	609 tags.insert(DICOM_TAG_MODALITIES_IN_STUDY);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	610
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	611 ASSERT_FALSE(DicomMap::HasOnlyComputedTags(tags));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	612 ASSERT_TRUE(DicomMap::HasComputedTags(tags, ResourceType_Study));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	613 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Patient));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	614 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Series));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	615 ASSERT_FALSE(DicomMap::HasComputedTags(tags, ResourceType_Instance));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	616 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	617
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	618 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4933 diff changeset	619
3551 173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	620 TEST(DicomMap, RemoveBinary)
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	621 {
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	622 DicomMap b;
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	623 b.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	624 b.SetValue(DICOM_TAG_PATIENT_ID, "B", true);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	625 b.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, DicomValue()); // NULL
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	626 b.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, DicomValue("C", false));
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	627 b.SetValue(DICOM_TAG_SOP_INSTANCE_UID, DicomValue("D", true));
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	628
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	629 b.RemoveBinaryTags();
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	630
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	631 std::string s;
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	632 ASSERT_EQ(2u, b.GetSize());
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	633 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	634 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	635 }
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	636
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	637
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	638 TEST(DicomMap, FromDicomAsJsonAndSequences)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	639 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	640 DicomMap m;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	641 std::string jsonFullString = "{"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	642 "\"0008,1090\" : "
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	643 "{"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	644 "\"Name\" : \"ManufacturerModelName\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	645 "\"Type\" : \"String\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	646 "\"Value\" : \"MyModel\""
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	647 "},"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	648 "\"0008,1111\" : "
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	649 "{"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	650 "\"Name\" : \"ReferencedPerformedProcedureStepSequence\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	651 "\"Type\" : \"Sequence\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	652 "\"Value\" : "
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	653 "["
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	654 "{"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	655 "\"0008,1150\" : "
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	656 "{"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	657 "\"Name\" : \"ReferencedSOPClassUID\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	658 "\"Type\" : \"String\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	659 "\"Value\" : \"1.2.4\""
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	660 "},"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	661 "\"0008,1155\" : "
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	662 "{"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	663 "\"Name\" : \"ReferencedSOPInstanceUID\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	664 "\"Type\" : \"String\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	665 "\"Value\" : \"1.2.3\""
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	666 "}"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	667 "}"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	668 "]"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	669 "}}";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	670
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	671 Json::Value parsedJson;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	672 bool ret = Toolbox::ReadJson(parsedJson, jsonFullString);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	673
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	674 m.FromDicomAsJson(parsedJson, false /* append /, true / parseSequences*/);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	675 ASSERT_TRUE(ret);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	676
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	677 ASSERT_TRUE(m.HasTag(DicomTag(0x0008, 0x1090)));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	678 ASSERT_EQ("MyModel", m.GetValue(0x0008,0x1090).GetContent());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	679
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	680 ASSERT_TRUE(m.HasTag(DicomTag(0x0008, 0x1111)));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	681 const Json::Value& jsonSequence = m.GetValue(0x0008, 0x1111).GetSequenceContent();
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	682 ASSERT_EQ("ReferencedSOPClassUID", jsonSequence[0]["0008,1150"]["Name"].asString());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	683
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	684 {// serialize to human dicomAsJson
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	685 Json::Value dicomAsJson = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	686 FromDcmtkBridge::ToJson(dicomAsJson, m, DicomToJsonFormat_Human);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	687 // printf("%s", dicomAsJson.toStyledString().c_str());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	688
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	689 ASSERT_TRUE(dicomAsJson.isMember("ManufacturerModelName"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	690 ASSERT_TRUE(dicomAsJson.isMember("ReferencedPerformedProcedureStepSequence"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	691 ASSERT_TRUE(dicomAsJson["ReferencedPerformedProcedureStepSequence"][0].isMember("ReferencedSOPClassUID"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	692 ASSERT_EQ("1.2.4", dicomAsJson["ReferencedPerformedProcedureStepSequence"][0]["ReferencedSOPClassUID"].asString());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	693 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	694
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	695 {// serialize to full dicomAsJson
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	696 Json::Value dicomAsJson = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	697 FromDcmtkBridge::ToJson(dicomAsJson, m, DicomToJsonFormat_Full);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	698 // printf("%s", dicomAsJson.toStyledString().c_str());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	699
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	700 ASSERT_TRUE(dicomAsJson.isMember("0008,1090"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	701 ASSERT_TRUE(dicomAsJson.isMember("0008,1111"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	702 ASSERT_TRUE(dicomAsJson["0008,1111"]["Value"][0].isMember("0008,1150"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	703 ASSERT_EQ("1.2.4", dicomAsJson["0008,1111"]["Value"][0]["0008,1150"]["Value"].asString());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	704 ASSERT_EQ("MyModel", dicomAsJson["0008,1090"]["Value"].asString());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	705 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	706
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	707 {// serialize to short dicomAsJson
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	708 Json::Value dicomAsJson = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	709 FromDcmtkBridge::ToJson(dicomAsJson, m, DicomToJsonFormat_Short);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	710 // printf("%s", dicomAsJson.toStyledString().c_str());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	711
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	712 ASSERT_TRUE(dicomAsJson.isMember("0008,1090"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	713 ASSERT_TRUE(dicomAsJson.isMember("0008,1111"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	714 ASSERT_TRUE(dicomAsJson["0008,1111"][0].isMember("0008,1150"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	715 ASSERT_EQ("1.2.4", dicomAsJson["0008,1111"][0]["0008,1150"].asString());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	716 ASSERT_EQ("MyModel", dicomAsJson["0008,1090"].asString());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	717 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	718
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	719 {// extract sequence
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	720 DicomMap sequencesOnly;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	721 m.ExtractSequences(sequencesOnly);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	722
5230 887df8c45838 fix warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	723 ASSERT_EQ(1u, sequencesOnly.GetSize());
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	724 ASSERT_TRUE(sequencesOnly.HasTag(0x0008, 0x1111));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	725 ASSERT_TRUE(sequencesOnly.GetValue(0x0008, 0x1111).GetSequenceContent()[0].isMember("0008,1150"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	726
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	727 // copy sequence
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	728 DicomMap sequencesCopy;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	729 sequencesCopy.SetValue(0x0008, 0x1111, sequencesOnly.GetValue(0x0008, 0x1111));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	730
5230 887df8c45838 fix warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	731 ASSERT_EQ(1u, sequencesCopy.GetSize());
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	732 ASSERT_TRUE(sequencesCopy.HasTag(0x0008, 0x1111));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	733 ASSERT_TRUE(sequencesCopy.GetValue(0x0008, 0x1111).GetSequenceContent()[0].isMember("0008,1150"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	734 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	735 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	736
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	737 TEST(DicomMap, ExtractSummary)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	738 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	739 Json::Value v = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	740 v["PatientName"] = "Hello";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	741 v["ReferencedSOPClassUID"] = "1.2.840.10008.5.1.4.1.1.4";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	742
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	743 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	744 Json::Value a = Json::arrayValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	745
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	746 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	747 Json::Value item = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	748 item["ReferencedSOPClassUID"] = "1.2.840.10008.5.1.4.1.1.4";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	749 item["ReferencedSOPInstanceUID"] = "1.2.840.113619.2.176.2025.1499492.7040.1171286241.719";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	750 a.append(item);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	751 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	752
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	753 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	754 Json::Value item = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	755 item["ReferencedSOPClassUID"] = "1.2.840.10008.5.1.4.1.1.4"; // ReferencedSOPClassUID
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	756 item["ReferencedSOPInstanceUID"] = "1.2.840.113619.2.176.2025.1499492.7040.1171286241.726";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	757 a.append(item);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	758 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	759
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	760 v["ReferencedImageSequence"] = a;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	761 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	762
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	763 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	764 Json::Value a = Json::arrayValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	765
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	766 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	767 Json::Value item = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	768 item["StudyInstanceUID"] = "1.2.840.113704.1.111.7016.1342451220.40";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	769
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	770 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	771 Json::Value b = Json::arrayValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	772
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	773 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	774 Json::Value c = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	775 c["CodeValue"] = "122403";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	776 c["0008,103e"] = "WORLD"; // Series description
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	777 b.append(c);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	778 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	779
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	780 item["PurposeOfReferenceCodeSequence"] = b;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	781 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	782
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	783 a.append(item);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	784 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	785
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	786 v["RelatedSeriesSequence"] = a;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	787 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	788
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	789 std::unique_ptr<ParsedDicomFile> dicom(ParsedDicomFile::CreateFromJson(v, DicomFromJsonFlags_None, ""));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	790
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	791 DicomMap summary;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	792 std::set<DicomTag> ignoreTagLength;
5045 a9ca92ecbbc2 fix build Alain Mazy <am@osimis.io> parents: 5044 diff changeset	793 dicom->ExtractDicomSummary(summary, 256, ignoreTagLength);
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	794
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	795 ASSERT_TRUE(summary.HasTag(0x0008, 0x1140));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	796 ASSERT_EQ("1.2.840.10008.5.1.4.1.1.4", summary.GetValue(0x0008, 0x1140).GetSequenceContent()[0]["0008,1150"]["Value"].asString());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	797 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	798
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	799
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	800
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	801 TEST(DicomWebJson, Multiplicity)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	802 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	803 // 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	804
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	805 ParsedDicomFile dicom(false);
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	806 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	807 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	808 dicom.ReplacePlainString(DICOM_TAG_IMAGE_POSITION_PATIENT, "");
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	809
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	810 DicomWebJsonVisitor visitor;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	811 dicom.Apply(visitor);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	812
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	813 {
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	814 const Json::Value& tag = visitor.GetResult() ["00200037"]; // ImageOrientationPatient
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	815 const Json::Value& value = tag["Value"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	816
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	817 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	818 ASSERT_EQ(2u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	819 ASSERT_EQ(3u, value.size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	820 ASSERT_EQ(Json::realValue, value[1].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	821 ASSERT_FLOAT_EQ(1.0f, value[0].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	822 ASSERT_FLOAT_EQ(2.3f, value[1].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	823 ASSERT_FLOAT_EQ(4.0f, value[2].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	824 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	825
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	826 {
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	827 const Json::Value& tag = visitor.GetResult() ["00200032"]; // ImagePositionPatient
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	828 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	829 ASSERT_EQ(1u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	830 }
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	831
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	832 std::string xml;
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	833 visitor.FormatXml(xml);
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	834
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	835 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	836 DicomMap m;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	837 m.FromDicomWeb(visitor.GetResult());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	838 ASSERT_EQ(3u, m.GetSize());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	839
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	840 std::string s;
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	841 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	842 ASSERT_EQ("SB1^SB2^SB3^SB4^SB5", s);
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	843 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	844 ASSERT_TRUE(s.empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	845
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	846 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	847
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	848 std::vector<std::string> v;
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	849 Toolbox::TokenizeString(v, s, '\\');
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	850 ASSERT_FLOAT_EQ(1.0f, boost::lexical_cast<float>(v[0]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	851 ASSERT_FLOAT_EQ(2.3f, boost::lexical_cast<float>(v[1]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	852 ASSERT_FLOAT_EQ(4.0f, boost::lexical_cast<float>(v[2]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	853 }
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	854 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	855
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	856
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	857 TEST(DicomWebJson, NullValue)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	858 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	859 // 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	860
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	861 ParsedDicomFile dicom(false);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	862 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	863
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	864 DicomWebJsonVisitor visitor;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	865 dicom.Apply(visitor);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	866
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	867 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	868 const Json::Value& tag = visitor.GetResult() ["00200037"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	869 const Json::Value& value = tag["Value"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	870
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	871 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	872 ASSERT_EQ(2u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	873 ASSERT_EQ(4u, value.size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	874 ASSERT_EQ(Json::realValue, value[0].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	875 ASSERT_EQ(Json::nullValue, value[1].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	876 ASSERT_EQ(Json::nullValue, value[2].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	877 ASSERT_EQ(Json::realValue, value[3].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	878 ASSERT_FLOAT_EQ(1.5f, value[0].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	879 ASSERT_FLOAT_EQ(2.5f, value[3].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	880 }
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	881
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	882 std::string xml;
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	883 visitor.FormatXml(xml);
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	884
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	885 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	886 DicomMap m;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	887 m.FromDicomWeb(visitor.GetResult());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	888 ASSERT_EQ(1u, m.GetSize());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	889
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	890 std::string s;
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	891 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	892
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	893 std::vector<std::string> v;
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	894 Toolbox::TokenizeString(v, s, '\\');
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	895 ASSERT_FLOAT_EQ(1.5f, boost::lexical_cast<float>(v[0]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	896 ASSERT_TRUE(v[1].empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	897 ASSERT_TRUE(v[2].empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	898 ASSERT_FLOAT_EQ(2.5f, boost::lexical_cast<float>(v[3]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	899 }
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	900 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	901
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	902
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	903 TEST(DicomWebJson, PixelSpacing)
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	904 {
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	905 // 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	906 // correctly handled (dot "." vs comma ",")
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	907 ParsedDicomFile source(false);
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	908 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	909
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	910 DicomWebJsonVisitor visitor;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	911 source.Apply(visitor);
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	912
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	913 DicomMap target;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	914 target.FromDicomWeb(visitor.GetResult());
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	915
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	916 ASSERT_EQ("DS", visitor.GetResult() ["00280030"]["vr"].asString());
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	917 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	918 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	919
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	920 std::string s;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	921 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	922 ASSERT_EQ(s, "1.5\\1.3");
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	923 }
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	924
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	925
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	926 TEST(DicomMap, MainTagNames)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	927 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	928 ASSERT_EQ(3, ResourceType_Instance - ResourceType_Patient);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	929
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	930 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	931 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	932 ResourceType level = static_cast<ResourceType>(i);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	933
5175 48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	934 std::set<DicomTag> tags;
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5045 diff changeset	935 DicomMap::GetMainDicomTags(tags, level);
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	936
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	937 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	938 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	939 DicomMap a;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	940 a.SetValue(*it, "TEST", false);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	941
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	942 Json::Value json;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	943 a.DumpMainDicomTags(json, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	944
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	945 ASSERT_EQ(Json::objectValue, json.type());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	946 ASSERT_EQ(1u, json.getMemberNames().size());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	947
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	948 std::string name = json.getMemberNames() [0];
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	949 EXPECT_EQ(name, FromDcmtkBridge::GetTagName(*it, ""));
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	950
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4494 diff changeset	951 std::string main = FromDcmtkBridge::GetTagName(*it, "");
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	952 if (!main.empty())
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	953 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	954 ASSERT_EQ(main, name);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	955 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	956 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	957 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	958 }
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	959
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	960
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	961
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	962 TEST(DicomTag, Comparisons)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	963 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	964 DicomTag a(0x0000, 0x0000);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	965 DicomTag b(0x0010, 0x0010);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	966 DicomTag c(0x0010, 0x0020);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	967 DicomTag d(0x0020, 0x0000);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	968
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	969 // operator==()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	970 ASSERT_TRUE(a == a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	971 ASSERT_FALSE(a == b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	972
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	973 // operator!=()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	974 ASSERT_FALSE(a != a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	975 ASSERT_TRUE(a != b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	976
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	977 // operator<=()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	978 ASSERT_TRUE(a <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	979 ASSERT_TRUE(a <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	980 ASSERT_TRUE(a <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	981 ASSERT_TRUE(a <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	982
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	983 ASSERT_FALSE(b <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	984 ASSERT_TRUE(b <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	985 ASSERT_TRUE(b <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	986 ASSERT_TRUE(b <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	987
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	988 ASSERT_FALSE(c <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	989 ASSERT_FALSE(c <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	990 ASSERT_TRUE(c <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	991 ASSERT_TRUE(c <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	992
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	993 ASSERT_FALSE(d <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	994 ASSERT_FALSE(d <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	995 ASSERT_FALSE(d <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	996 ASSERT_TRUE(d <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	997
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	998 // operator<()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	999 ASSERT_FALSE(a < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1000 ASSERT_TRUE(a < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1001 ASSERT_TRUE(a < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1002 ASSERT_TRUE(a < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1003
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1004 ASSERT_FALSE(b < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1005 ASSERT_FALSE(b < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1006 ASSERT_TRUE(b < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1007 ASSERT_TRUE(b < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1008
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1009 ASSERT_FALSE(c < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1010 ASSERT_FALSE(c < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1011 ASSERT_FALSE(c < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1012 ASSERT_TRUE(c < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1013
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1014 ASSERT_FALSE(d < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1015 ASSERT_FALSE(d < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1016 ASSERT_FALSE(d < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1017 ASSERT_FALSE(d < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1018
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1019 // operator>=()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1020 ASSERT_TRUE(a >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1021 ASSERT_FALSE(a >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1022 ASSERT_FALSE(a >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1023 ASSERT_FALSE(a >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1024
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1025 ASSERT_TRUE(b >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1026 ASSERT_TRUE(b >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1027 ASSERT_FALSE(b >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1028 ASSERT_FALSE(b >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1029
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1030 ASSERT_TRUE(c >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1031 ASSERT_TRUE(c >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1032 ASSERT_TRUE(c >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1033 ASSERT_FALSE(c >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1034
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1035 ASSERT_TRUE(d >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1036 ASSERT_TRUE(d >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1037 ASSERT_TRUE(d >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1038 ASSERT_TRUE(d >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1039
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1040 // operator>()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1041 ASSERT_FALSE(a > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1042 ASSERT_FALSE(a > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1043 ASSERT_FALSE(a > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1044 ASSERT_FALSE(a > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1045
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1046 ASSERT_TRUE(b > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1047 ASSERT_FALSE(b > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1048 ASSERT_FALSE(b > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1049 ASSERT_FALSE(b > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1050
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1051 ASSERT_TRUE(c > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1052 ASSERT_TRUE(c > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1053 ASSERT_FALSE(c > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1054 ASSERT_FALSE(c > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1055
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1056 ASSERT_TRUE(d > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1057 ASSERT_TRUE(d > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1058 ASSERT_TRUE(d > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1059 ASSERT_FALSE(d > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1060 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1061
4845 02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1062 TEST(ParsedDicomFile, canIncludeXsVrTags)
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1063 {
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1064 Json::Value tags;
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1065 tags["0028,0034"] = "1\\1"; // PixelAspectRatio
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1066 tags["0028,1101"] = "256\\0\\16"; // RedPaletteColorLookupTableDescriptor which is declared as xs VR in dicom.dic
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1067
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1068 std::unique_ptr<ParsedDicomFile> dicom(ParsedDicomFile::CreateFromJson(tags, DicomFromJsonFlags_DecodeDataUriScheme, ""));
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1069 // simply make sure it does not throw !
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1070 }
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1071
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1072
5179 1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1073 TEST(DicomMap, SetupFindTemplates)
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1074 {
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1075 /**
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1076 * The templates for C-FIND must be common to all the Orthanc
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1077 * servers, and must not be altered by the "ExtraMainDicomTags"
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1078 * configuration option that was introduced in Orthanc 1.11.0.
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1079 **/
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1080
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1081 {
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1082 DicomMap m;
5180 d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1083 m.SetValue(DICOM_TAG_ENCAPSULATED_DOCUMENT, "nope", false);
d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1084 m.SetValue(DICOM_TAG_PATIENT_ID, "patient_id", false);
d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1085
5179 1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1086 DicomMap::SetupFindPatientTemplate(m);
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1087 std::set<DicomTag> tags;
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1088 m.GetTags(tags);
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1089
5793 a8055aebc6cb added standard MainDicomTags that are used in QIDO-RS Alain Mazy <am@orthanc.team> parents: 5640 diff changeset	1090 // This corresponds to the values of DEFAULT_1_11_PATIENT_MAIN_DICOM_TAGS
5179 1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1091 ASSERT_EQ(5u, tags.size());
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1092 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PATIENT_ID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1093
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1094 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_OTHER_PATIENT_IDS, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1095 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PATIENT_BIRTH_DATE, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1096 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PATIENT_NAME, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1097 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PATIENT_SEX, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1098 }
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1099
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1100 {
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1101 DicomMap m;
5180 d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1102 m.SetValue(DICOM_TAG_ENCAPSULATED_DOCUMENT, "nope", false);
d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1103 m.SetValue(DICOM_TAG_PATIENT_ID, "patient_id", false);
d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1104
5179 1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1105 DicomMap::SetupFindStudyTemplate(m);
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1106 std::set<DicomTag> tags;
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1107 m.GetTags(tags);
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1108
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1109 // This corresponds to the values of DEFAULT_STUDY_MAIN_DICOM_TAGS
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1110 ASSERT_EQ(8u, tags.size());
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1111 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PATIENT_ID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1112 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_ACCESSION_NUMBER, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1113 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_STUDY_INSTANCE_UID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1114
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1115 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_REFERRING_PHYSICIAN_NAME, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1116 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_STUDY_DATE, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1117 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_STUDY_DESCRIPTION, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1118 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_STUDY_ID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1119 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_STUDY_TIME, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1120 }
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1121
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1122 {
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1123 DicomMap m;
5180 d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1124 m.SetValue(DICOM_TAG_ENCAPSULATED_DOCUMENT, "nope", false);
d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1125 m.SetValue(DICOM_TAG_PATIENT_ID, "patient_id", false);
d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1126
5179 1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1127 DicomMap::SetupFindSeriesTemplate(m);
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1128 std::set<DicomTag> tags;
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1129 m.GetTags(tags);
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1130
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1131 // This corresponds to the values of DEFAULT_SERIES_MAIN_DICOM_TAGS
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1132 ASSERT_EQ(13u, tags.size());
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1133 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PATIENT_ID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1134 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_ACCESSION_NUMBER, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1135 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_STUDY_INSTANCE_UID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1136 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_SERIES_INSTANCE_UID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1137
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1138 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_BODY_PART_EXAMINED, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1139 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_MODALITY, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1140 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_OPERATOR_NAME, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1141 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PERFORMED_PROCEDURE_STEP_DESCRIPTION, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1142 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PROTOCOL_NAME, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1143 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_SERIES_DATE, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1144 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_SERIES_DESCRIPTION, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1145 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_SERIES_NUMBER, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1146 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_SERIES_TIME, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1147 }
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1148
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1149 {
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1150 DicomMap m;
5180 d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1151 m.SetValue(DICOM_TAG_ENCAPSULATED_DOCUMENT, "nope", false);
d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1152 m.SetValue(DICOM_TAG_PATIENT_ID, "patient_id", false);
d2626a062809 fix DicomMap::SetupFindXXXTemplate() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 5179 diff changeset	1153
5179 1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1154 DicomMap::SetupFindInstanceTemplate(m);
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1155 std::set<DicomTag> tags;
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1156 m.GetTags(tags);
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1157
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1158 // This corresponds to the values of DEFAULT_INSTANCE_MAIN_DICOM_TAGS
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1159 ASSERT_EQ(15u, tags.size());
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1160 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_PATIENT_ID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1161 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_ACCESSION_NUMBER, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1162 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_STUDY_INSTANCE_UID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1163 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_SERIES_INSTANCE_UID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1164 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_SOP_INSTANCE_UID, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1165
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1166 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_ACQUISITION_NUMBER, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1167 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_IMAGE_COMMENTS, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1168 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_IMAGE_INDEX, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1169 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1170 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_IMAGE_POSITION_PATIENT, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1171 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_INSTANCE_CREATION_DATE, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1172 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_INSTANCE_CREATION_TIME, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1173 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_INSTANCE_NUMBER, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1174 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_NUMBER_OF_FRAMES, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1175 ASSERT_EQ("", m.GetStringValue(DICOM_TAG_TEMPORAL_POSITION_IDENTIFIER, "nope", false));
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1176 }
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1177 }
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1178
1e406c23b352 added unit test DicomMap.SetupFindTemplates Sebastien Jodogne <s.jodogne@gmail.com> parents: 5176 diff changeset	1179
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4304 diff changeset	1180 #if ORTHANC_SANDBOXED != 1
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4304 diff changeset	1181
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1182 #include "../Sources/SystemToolbox.h"
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1183
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1184 TEST(DicomMap, DISABLED_ParseDicomMetaInformation)
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1185 {
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1186 static const std::string PATH = "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/";
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1187
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1188 std::map<std::string, DicomTransferSyntax> f;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1189 f.insert(std::make_pair(PATH + "../ColorTestMalaterre.dcm", DicomTransferSyntax_LittleEndianImplicit)); // 1.2.840.10008.1.2
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1190 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.1.dcm", DicomTransferSyntax_LittleEndianExplicit));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1191 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.2.dcm", DicomTransferSyntax_BigEndianExplicit));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1192 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.50.dcm", DicomTransferSyntax_JPEGProcess1));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1193 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.51.dcm", DicomTransferSyntax_JPEGProcess2_4));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1194 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.57.dcm", DicomTransferSyntax_JPEGProcess14));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1195 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.70.dcm", DicomTransferSyntax_JPEGProcess14SV1));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1196 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.80.dcm", DicomTransferSyntax_JPEGLSLossless));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1197 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.81.dcm", DicomTransferSyntax_JPEGLSLossy));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1198 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.90.dcm", DicomTransferSyntax_JPEG2000LosslessOnly));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1199 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.4.91.dcm", DicomTransferSyntax_JPEG2000));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1200 f.insert(std::make_pair(PATH + "1.2.840.10008.1.2.5.dcm", DicomTransferSyntax_RLELossless));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1201
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1202 for (std::map<std::string, DicomTransferSyntax>::const_iterator it = f.begin(); it != f.end(); ++it)
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1203 {
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1204 printf("\n== %s ==\n\n", it->first.c_str());
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1205
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1206 std::string dicom;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1207 SystemToolbox::ReadFile(dicom, it->first, false);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1208
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1209 DicomMap d;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1210 ASSERT_TRUE(DicomMap::ParseDicomMetaInformation(d, dicom.c_str(), dicom.size()));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1211 d.Print(stdout);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1212
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1213 std::string s;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1214 ASSERT_TRUE(d.LookupStringValue(s, DICOM_TAG_TRANSFER_SYNTAX_UID, false));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1215
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1216 DicomTransferSyntax ts;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1217 ASSERT_TRUE(LookupTransferSyntax(ts, s));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1218 ASSERT_EQ(ts, it->second);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1219 }
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1220 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1221
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1222
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1223 namespace
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1224 {
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1225 class V : public DicomStreamReader::IVisitor
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1226 {
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1227 private:
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1228 DicomMap map_;
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1229 uint64_t pixelDataOffset_;
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1230
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1231 public:
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1232 V() :
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1233 pixelDataOffset_(0)
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1234 {
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1235 }
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1236
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1237 const DicomMap& GetDicomMap() const
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1238 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1239 return map_;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1240 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1241
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1242 virtual void VisitMetaHeaderTag(const DicomTag& tag,
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1243 const ValueRepresentation& vr,
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	1244 const std::string& value) ORTHANC_OVERRIDE
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1245 {
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	1246 std::cout << "Header: " << tag.Format() << " [" << Toolbox::ConvertToAscii(value).c_str() << "] (" << value.size() << ")" << std::endl;
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1247 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1248
4220 92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1249 virtual void VisitTransferSyntax(DicomTransferSyntax transferSyntax) ORTHANC_OVERRIDE
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1250 {
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1251 printf("TRANSFER SYNTAX: %s\n", GetTransferSyntaxUid(transferSyntax));
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1252 }
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1253
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1254 virtual bool VisitDatasetTag(const DicomTag& tag,
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1255 const ValueRepresentation& vr,
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	1256 const std::string& value,
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1257 bool isLittleEndian,
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1258 uint64_t fileOffset) ORTHANC_OVERRIDE
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1259 {
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	1260 if (!isLittleEndian)
28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	1261 printf("** ");
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1262
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1263 if (tag == DICOM_TAG_PIXEL_DATA)
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1264 {
4216 61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	1265 std::cout << "Dataset: " << tag.Format() << " " << EnumerationToString(vr)
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1266 << " [PIXEL] (" << value.size() << "), offset: " << std::hex << fileOffset << std::dec << std::endl;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1267 pixelDataOffset_ = fileOffset;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1268 return false;
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1269 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1270 else
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1271 {
4216 61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	1272 std::cout << "Dataset: " << tag.Format() << " " << EnumerationToString(vr)
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1273 << " [" << Toolbox::ConvertToAscii(value).c_str() << "] (" << value.size()
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1274 << "), offset: " << std::hex << fileOffset << std::dec << std::endl;
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1275 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1276
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1277 map_.SetValue(tag, value, Toolbox::IsAsciiString(value));
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1278
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1279 return true;
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1280 }
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1281
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1282 uint64_t GetPixelDataOffset() const
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1283 {
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1284 return pixelDataOffset_;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1285 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1286 };
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1287 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1288
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1289
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1290
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1291 TEST(DicomStreamReader, DISABLED_Tutu)
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1292 {
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1293 static const std::string PATH = "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/";
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1294
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1295 typedef boost::tuple<std::string, uint64_t, ValueRepresentation> Source;
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1296 typedef std::list<Source> Sources;
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1297
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1298 // $ ~/Subversion/orthanc-tests/Tests/GetPixelDataVR.py ~/Subversion/orthanc-tests/Database/ColorTestMalaterre.dcm ~/Subversion/orthanc-tests/Database/ColorTestImageJ.dcm ~/Subversion/orthanc-tests/Database/Knee/T1/IM-0001-0001.dcm ~/Subversion/orthanc-tests/Database/TransferSyntaxes/*.dcm
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1299
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1300 Sources sources;
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1301 sources.push_back(Source(PATH + "../ColorTestMalaterre.dcm", 0x03a0u, ValueRepresentation_Unknown)); // This file has strange VR
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1302 sources.push_back(Source(PATH + "../ColorTestImageJ.dcm", 0x00924, ValueRepresentation_OtherByte));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1303 sources.push_back(Source(PATH + "../Knee/T1/IM-0001-0001.dcm", 0x00c78, ValueRepresentation_OtherWord));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1304 sources.push_back(Source(PATH + "1.2.840.10008.1.2.1.dcm", 0x037cu, ValueRepresentation_OtherByte));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1305 sources.push_back(Source(PATH + "1.2.840.10008.1.2.2.dcm", 0x03e8u, ValueRepresentation_OtherByte)); // Big Endian
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1306 sources.push_back(Source(PATH + "1.2.840.10008.1.2.4.50.dcm", 0x04acu, ValueRepresentation_OtherByte));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1307 sources.push_back(Source(PATH + "1.2.840.10008.1.2.4.51.dcm", 0x072cu, ValueRepresentation_OtherByte));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1308 sources.push_back(Source(PATH + "1.2.840.10008.1.2.4.57.dcm", 0x0620u, ValueRepresentation_OtherByte));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1309 sources.push_back(Source(PATH + "1.2.840.10008.1.2.4.70.dcm", 0x065au, ValueRepresentation_OtherByte));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1310 sources.push_back(Source(PATH + "1.2.840.10008.1.2.4.80.dcm", 0x0b46u, ValueRepresentation_OtherByte));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1311 sources.push_back(Source(PATH + "1.2.840.10008.1.2.4.81.dcm", 0x073eu, ValueRepresentation_OtherByte));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1312 sources.push_back(Source(PATH + "1.2.840.10008.1.2.4.90.dcm", 0x0b66u, ValueRepresentation_OtherByte));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1313 sources.push_back(Source(PATH + "1.2.840.10008.1.2.4.91.dcm", 0x19b8u, ValueRepresentation_OtherByte));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1314 sources.push_back(Source(PATH + "1.2.840.10008.1.2.5.dcm", 0x0b0au, ValueRepresentation_OtherByte));
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1315
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1316 {
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1317 std::string dicom;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1318
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1319 uint64_t offset;
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1320 ValueRepresentation vr;
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1321
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1322 // Not a DICOM image
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1323 SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.4.50.png", false);
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1324 ASSERT_FALSE(DicomStreamReader::LookupPixelDataOffset(offset, vr, dicom));
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1325
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1326 // Image without valid DICOM preamble
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1327 SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.dcm", false);
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1328 ASSERT_FALSE(DicomStreamReader::LookupPixelDataOffset(offset, vr, dicom));
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1329 }
4216 61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	1330
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1331 for (Sources::const_iterator it = sources.begin(); it != sources.end(); ++it)
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1332 {
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1333 std::string dicom;
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1334 SystemToolbox::ReadFile(dicom, it->get<0>(), false);
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1335
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1336 {
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1337 uint64_t offset;
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1338 ValueRepresentation vr;
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1339 ASSERT_TRUE(DicomStreamReader::LookupPixelDataOffset(offset, vr, dicom));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1340 ASSERT_EQ(it->get<1>(), offset);
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1341 ASSERT_EQ(it->get<2>(), vr);
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1342 }
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1343
4494 39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1344 {
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1345 uint64_t offset;
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1346 ValueRepresentation vr;
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1347 ASSERT_TRUE(DicomStreamReader::LookupPixelDataOffset(offset, vr, dicom.c_str(), dicom.size()));
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1348 ASSERT_EQ(it->get<1>(), offset);
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1349 ASSERT_EQ(it->get<2>(), vr);
4494 39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1350 }
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1351
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1352 ParsedDicomFile a(dicom);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1353 Json::Value aa;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1354 a.DatasetToJson(aa, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1355
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1356 std::stringstream stream;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1357 size_t pos = 0;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1358
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1359 DicomStreamReader r(stream);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1360 V visitor;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1361
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1362 // Test reading byte per byte
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1363 while (pos < dicom.size() &&
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1364 !r.IsDone())
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1365 {
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1366 r.Consume(visitor);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1367 stream.clear();
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1368 stream.put(dicom[pos++]);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1369 }
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1370
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1371 r.Consume(visitor);
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1372
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5230 diff changeset	1373 ASSERT_EQ(it->get<1>(), visitor.GetPixelDataOffset());
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1374
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1375 // Truncate the original DICOM up to pixel data
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1376 dicom.resize(visitor.GetPixelDataOffset());
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1377
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1378 ParsedDicomFile b(dicom);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1379 Json::Value bb;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1380 b.DatasetToJson(bb, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0);
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1381
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1382 aa.removeMember("7fe0,0010");
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1383 aa.removeMember("fffc,fffc"); // For "1.2.840.10008.1.2.5.dcm"
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1384 ASSERT_EQ(aa.toStyledString(), bb.toStyledString());
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1385 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1386 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1387
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1388 TEST(DicomStreamReader, DISABLED_Tutu2)
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1389 {
4223 3d6f14a05db1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4220 diff changeset	1390 //static const std::string PATH = "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/";
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1391
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1392 //const std::string path = PATH + "1.2.840.10008.1.2.4.50.dcm";
4217 78c8b4a18619 fix for c++98 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4216 diff changeset	1393 //const std::string path = PATH + "1.2.840.10008.1.2.2.dcm";
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1394 const std::string path = "/home/jodogne/Subversion/orthanc-tests/Database/HierarchicalAnonymization/RTH/RT.dcm";
4217 78c8b4a18619 fix for c++98 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4216 diff changeset	1395
78c8b4a18619 fix for c++98 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4216 diff changeset	1396 std::ifstream stream(path.c_str());
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1397
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1398 DicomStreamReader r(stream);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1399 V visitor;
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1400
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1401 r.Consume(visitor);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1402
4223 3d6f14a05db1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4220 diff changeset	1403 printf(">> %d\n", static_cast<int>(r.GetProcessedBytes()));
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1404 }
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1405
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1406
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1407 #include <boost/filesystem.hpp>
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1408
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1409 TEST(DicomStreamReader, DISABLED_Tutu3)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1410 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1411 static const std::string PATH = "/home/jodogne/Subversion/orthanc-tests/Database/";
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1412
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1413 std::set<std::string> errors;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1414 unsigned int success = 0;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1415
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1416 for (boost::filesystem::recursive_directory_iterator current(PATH), end;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1417 current != end ; ++current)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1418 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1419 if (SystemToolbox::IsRegularFile(current->path().string()))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1420 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1421 try
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1422 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1423 if (current->path().extension() == ".dcm")
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1424 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1425 const std::string path = current->path().string();
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1426 printf("[%s]\n", path.c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1427
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1428 DicomMap m1;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1429
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1430 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1431 std::ifstream stream(path.c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1432
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1433 DicomStreamReader r(stream);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1434 V visitor;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1435
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1436 try
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1437 {
4220 92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1438 r.Consume(visitor, DICOM_TAG_PIXEL_DATA);
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1439 //r.Consume(visitor);
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1440 success++;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1441 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1442 catch (OrthancException& e)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1443 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1444 errors.insert(path);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1445 continue;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1446 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1447
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1448 m1.Assign(visitor.GetDicomMap());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1449 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1450
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1451 m1.SetValue(DICOM_TAG_PIXEL_DATA, "", true);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1452
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1453
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1454 DicomMap m2;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1455
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1456 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1457 std::string dicom;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1458 SystemToolbox::ReadFile(dicom, path);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1459
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1460 ParsedDicomFile f(dicom);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1461 f.ExtractDicomSummary(m2, 256);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1462 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1463
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1464 std::set<DicomTag> tags;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1465 m2.GetTags(tags);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1466
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1467 bool first = true;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1468 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1469 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1470 if (!m1.HasTag(*it))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1471 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1472 if (first)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1473 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1474 fprintf(stderr, "[%s]\n", path.c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1475 first = false;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1476 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1477
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1478 std::cerr << "ERROR: " << it->Format() << std::endl;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1479 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1480 else if (!m2.GetValue(*it).IsNull() &&
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1481 !m2.GetValue(*it).IsBinary() &&
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1482 Toolbox::IsAsciiString(m1.GetValue(*it).GetContent()))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1483 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1484 const std::string& v1 = m1.GetValue(*it).GetContent();
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1485 const std::string& v2 = m2.GetValue(*it).GetContent();
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1486
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1487 if (v1 != v2 &&
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1488 (v1.size() != v2.size() + 1 \|\|
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1489 v1.substr(0, v2.size()) != v2))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1490 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1491 std::cerr << "ERROR: [" << v1 << "] [" << v2 << "]" << std::endl;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1492 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1493 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1494 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1495 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1496 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1497 catch (boost::filesystem::filesystem_error&)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1498 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1499 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1500 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1501 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1502
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1503
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1504 printf("\n== ERRORS ==\n");
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1505 for (std::set<std::string>::const_iterator
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1506 it = errors.begin(); it != errors.end(); ++it)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1507 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1508 printf("[%s]\n", it->c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1509 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1510
4223 3d6f14a05db1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4220 diff changeset	1511 printf("\n== SUCCESSES: %u ==\n\n", success);
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1512 }
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4304 diff changeset	1513
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4304 diff changeset	1514 #endif

Mercurial > hg > orthanc

annotate OrthancFramework/UnitTestsSources/DicomMapTests.cpp @ 5795:9990b4140c1c find-refactoring