orthanc: OrthancFramework/UnitTestsSources/DicomMapTests.cpp annotate

annotate OrthancFramework/UnitTestsSources/DicomMapTests.cpp @ 5044:6fed78e13233

Refactored DicomMap to handle sequences when needed

author	Alain Mazy <am@osimis.io>
date	Tue, 28 Jun 2022 17:45:09 +0200
parents	1c08cd68250a
children	a9ca92ecbbc2

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
4870 43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4845 diff changeset	5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4845 diff changeset	6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	7 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	8 * 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	9 * 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	10 * 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	11 * 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	12 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	13 * 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	14 * 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	15 * 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	16 * Lesser General Public License for more details.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	17 *
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	18 * 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	19 * 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	20 * <http://www.gnu.org/licenses/>.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	21 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	22
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	23
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	24 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	25 // 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	26 # include <OrthancFramework.h>
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	27 #endif
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	28
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	29 #if !defined(DCMTK_VERSION_NUMBER)
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	30 # error DCMTK_VERSION_NUMBER is not defined
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	31 #endif
e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	32
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	33 #include <gtest/gtest.h>
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	35 #include "../Sources/Compatibility.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	36 #include "../Sources/OrthancException.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	37 #include "../Sources/DicomFormat/DicomMap.h"
4220 92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	38 #include "../Sources/DicomFormat/DicomStreamReader.h"
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	39 #include "../Sources/DicomParsing/FromDcmtkBridge.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	40 #include "../Sources/DicomParsing/ToDcmtkBridge.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	41 #include "../Sources/DicomParsing/ParsedDicomFile.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	42 #include "../Sources/DicomParsing/DicomWebJsonVisitor.h"
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43
4304 50b0c69b653a continued abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4223 diff changeset	44 #include <boost/lexical_cast.hpp>
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 using namespace Orthanc;
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47
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	48
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	49 namespace Orthanc
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 {
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	51 // 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	52 // 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	53
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 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	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 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	57 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	58 {
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 }
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 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	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 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	64 }
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65
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	66 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	67 {
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 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	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 };
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 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	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 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	75 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	76 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	77
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	78 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	79 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	80 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	81 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	82
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 {
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 const std::set<DicomTag>& s = DicomMap::GetAllMainDicomTags();
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 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	86 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	87 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	88 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	89 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	90 }
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91
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	92 {
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 const std::set<DicomTag>& s = DicomMap::GetMainDicomTags(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	94 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	95 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	96 }
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97
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 {
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 const std::set<DicomTag>& s = DicomMap::GetMainDicomTags(ResourceType_Study);
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 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	101 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	102 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	103 }
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	104
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 {
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 const std::set<DicomTag>& s = DicomMap::GetMainDicomTags(ResourceType_Series);
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_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	108 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	109 }
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110
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	111 {
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	112 const std::set<DicomTag>& s = DicomMap::GetMainDicomTags(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	113 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	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 }
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	116 }
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
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	118 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	119 {
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	120 DicomMap::AddMainDicomTag(DICOM_TAG_BITS_ALLOCATED, ResourceType_Instance);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121
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	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 const std::set<DicomTag>& s = DicomMap::GetMainDicomTags(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	124 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	125 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	126 }
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	127 {
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	128 const std::set<DicomTag>& s = DicomMap::GetMainDicomTags(ResourceType_Series);
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 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	130 }
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	131
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(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	133 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	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 // 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	136 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	137
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 }
4933 312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	139
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	140 TEST_F(DicomMapMainTagsTests, Signatures)
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	141 {
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	142 std::string defaultPatientSignature = DicomMap::GetDefaultMainDicomTagsSignature(ResourceType_Patient);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	143 std::string defaultStudySignature = DicomMap::GetDefaultMainDicomTagsSignature(ResourceType_Study);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	144 std::string defaultSeriesSignature = DicomMap::GetDefaultMainDicomTagsSignature(ResourceType_Series);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	145 std::string defaultInstanceSignature = DicomMap::GetDefaultMainDicomTagsSignature(ResourceType_Instance);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	146
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	147 ASSERT_NE(defaultInstanceSignature, defaultPatientSignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	148 ASSERT_NE(defaultSeriesSignature, defaultStudySignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	149 ASSERT_NE(defaultSeriesSignature, defaultPatientSignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	150
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	151 std::string patientSignature = DicomMap::GetMainDicomTagsSignature(ResourceType_Patient);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	152 std::string studySignature = DicomMap::GetMainDicomTagsSignature(ResourceType_Study);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	153 std::string seriesSignature = DicomMap::GetMainDicomTagsSignature(ResourceType_Series);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	154 std::string instanceSignature = DicomMap::GetMainDicomTagsSignature(ResourceType_Instance);
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 // at start, default and current signature should be equal
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	157 ASSERT_EQ(defaultPatientSignature, patientSignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	158 ASSERT_EQ(defaultStudySignature, studySignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	159 ASSERT_EQ(defaultSeriesSignature, seriesSignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	160 ASSERT_EQ(defaultInstanceSignature, instanceSignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	161
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	162 DicomMap::AddMainDicomTag(DICOM_TAG_BITS_ALLOCATED, ResourceType_Instance);
4933 312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	163 instanceSignature = DicomMap::GetMainDicomTagsSignature(ResourceType_Instance);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	164
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	165 ASSERT_NE(defaultInstanceSignature, instanceSignature);
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	166 }
312c6f4da888 adding MainDicomTags signatures Alain Mazy <am@osimis.io> parents: 4932 diff changeset	167
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168 }
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4944 diff changeset	170
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 TEST(DicomMap, Tags)
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 {
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	173 std::set<DicomTag> s;
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	174
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 DicomMap m;
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	176 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	177 ASSERT_EQ(0u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	178
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179 ASSERT_FALSE(m.HasTag(DICOM_TAG_PATIENT_NAME));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180 ASSERT_FALSE(m.HasTag(0x0010, 0x0010));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	181 m.SetValue(0x0010, 0x0010, "PatientName", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182 ASSERT_TRUE(m.HasTag(DICOM_TAG_PATIENT_NAME));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183 ASSERT_TRUE(m.HasTag(0x0010, 0x0010));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184
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(1u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	187 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, *s.begin());
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	188
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 ASSERT_FALSE(m.HasTag(DICOM_TAG_PATIENT_ID));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	190 m.SetValue(DICOM_TAG_PATIENT_ID, "PatientID", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 ASSERT_TRUE(m.HasTag(0x0010, 0x0020));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	192 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	193 ASSERT_EQ("PatientID2", m.GetValue(0x0010, 0x0020).GetContent());
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	195 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	196 ASSERT_EQ(2u, s.size());
1360 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 m.Remove(DICOM_TAG_PATIENT_ID);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 ASSERT_THROW(m.GetValue(0x0010, 0x0020), OrthancException);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	201 m.GetTags(s);
1492 9f66a12eb8fc fix warnings for gcc 5 jodogne parents: 1368 diff changeset	202 ASSERT_EQ(1u, s.size());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	203 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, *s.begin());
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	204
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3694 diff changeset	205 std::unique_ptr<DicomMap> mm(m.Clone());
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	206 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	207
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	208 m.SetValue(DICOM_TAG_PATIENT_ID, "Hello", false);
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 ASSERT_THROW(mm->GetValue(DICOM_TAG_PATIENT_ID), OrthancException);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 mm->CopyTagIfExists(m, DICOM_TAG_PATIENT_ID);
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	211 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	212
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1704 diff changeset	213 DicomValue v;
711 8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 ASSERT_TRUE(v.IsNull());
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 }
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 TEST(DicomMap, FindTemplates)
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 {
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 DicomMap m;
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 DicomMap::SetupFindPatientTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 ASSERT_TRUE(m.HasTag(DICOM_TAG_PATIENT_ID));
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 DicomMap::SetupFindStudyTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 ASSERT_TRUE(m.HasTag(DICOM_TAG_STUDY_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 ASSERT_TRUE(m.HasTag(DICOM_TAG_ACCESSION_NUMBER));
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::SetupFindSeriesTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 ASSERT_TRUE(m.HasTag(DICOM_TAG_SERIES_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 DicomMap::SetupFindInstanceTemplate(m);
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 ASSERT_TRUE(m.HasTag(DICOM_TAG_SOP_INSTANCE_UID));
8f62e8d5a384 test main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 }
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	235
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	236
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	237
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	238
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	239 static void TestModule(ResourceType level,
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	240 DicomModule module)
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	241 {
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	242 // REFERENCE: DICOM PS3.3 2015c - Information Object Definitions
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	243 // 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	244
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	245 std::set<DicomTag> moduleTags;
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	246 const std::set<DicomTag>& main = DicomMap::GetMainDicomTags(level);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	247 DicomTag::AddTagsForModule(moduleTags, module);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	248
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	249 // The main dicom tags are a subset of the module
1304 7b6925b0890d cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	250 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	251 {
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	252 bool ok = moduleTags.find(*it) != moduleTags.end();
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	253
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	254 // Exceptions for the Study level
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	255 if (level == ResourceType_Study &&
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	256 (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	257 it == DicomTag(0x0032, 0x1032) \|\| / RequestingPhysician, from Imaging Service Request module, related to Study */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	258 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	259 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	260 ok = true;
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	261 }
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	262
1849 6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	263 // Exceptions for the Series level
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	264 if (level == ResourceType_Series &&
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	265 (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	266 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	267 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	268 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	269 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	270 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	271 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	272 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	273 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	274 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	275 it == DicomTag(0x0018, 0x1400) \|\| / AcquisitionDeviceProcessingDescription, from CR/X-Ray/DX/WholeSlideMicro Image (SIMPLIFICATION => Series) */
68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1849 diff changeset	276 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	277 {
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	278 ok = true;
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	279 }
6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	280
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	281 // Exceptions for the Instance level
1704 d2268c7a7ede fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1492 diff changeset	282 if (level == ResourceType_Instance &&
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	283 (it == DicomTag(0x0020, 0x0012) \|\| / AccessionNumber, from General Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	284 it == DicomTag(0x0054, 0x1330) \|\| / ImageIndex, from PET Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	285 it == DicomTag(0x0020, 0x0100) \|\| / TemporalPositionIdentifier, from MR Image module */
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	286 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	287 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	288 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	289 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	290 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	291 ok = true;
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	292 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	293
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	294 if (!ok)
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	295 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	296 std::cout << it->Format() << ": " << FromDcmtkBridge::GetTagName(*it, "")
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	297 << " not expected at level " << EnumerationToString(level) << std::endl;
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	298 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	299
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	300 EXPECT_TRUE(ok);
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	301 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	302 }
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
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	305 TEST(DicomMap, Modules)
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	306 {
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	307 TestModule(ResourceType_Patient, DicomModule_Patient);
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	308 TestModule(ResourceType_Study, DicomModule_Study);
1849 6394a2f8f1e1 test main dicom tags at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	309 TestModule(ResourceType_Series, DicomModule_Series); // TODO
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	310 TestModule(ResourceType_Instance, DicomModule_Instance);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	311 }
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	312
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	313
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	314 TEST(DicomMap, Parse)
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	315 {
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	316 DicomMap m;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	317 float f;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	318 double d;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	319 int32_t i;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	320 int64_t j;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	321 uint32_t k;
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	322 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	323 unsigned int ui;
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	324 std::string s;
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 m.SetValue(DICOM_TAG_PATIENT_NAME, " ", false); // Empty value
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	327 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	328 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	329 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	330 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	331 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	332 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	333
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	334 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	335 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	336 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	337 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	338 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	339 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	340 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	341
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	342 ASSERT_FALSE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	343 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	344 ASSERT_EQ("0", s);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	345
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	346
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	347 // 2**31-1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	348 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483647", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	349 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	350 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	351 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	352 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	353 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	354 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	355 ASSERT_FLOAT_EQ(2147483647.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	356 ASSERT_DOUBLE_EQ(2147483647.0, d);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	357 ASSERT_EQ(2147483647, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	358 ASSERT_EQ(2147483647ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	359 ASSERT_EQ(2147483647u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	360 ASSERT_EQ(2147483647ull, l);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	361
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	362 // Test shortcuts
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	363 m.SetValue(DICOM_TAG_PATIENT_NAME, "42", false);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	364 ASSERT_TRUE(m.ParseFloat(f, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	365 ASSERT_TRUE(m.ParseDouble(d, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	366 ASSERT_TRUE(m.ParseInteger32(i, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	367 ASSERT_TRUE(m.ParseInteger64(j, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	368 ASSERT_TRUE(m.ParseUnsignedInteger32(k, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	369 ASSERT_TRUE(m.ParseUnsignedInteger64(l, DICOM_TAG_PATIENT_NAME));
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	370 ASSERT_FLOAT_EQ(42.0f, f);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	371 ASSERT_DOUBLE_EQ(42.0, d);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	372 ASSERT_EQ(42, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	373 ASSERT_EQ(42ll, j);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	374 ASSERT_EQ(42u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	375 ASSERT_EQ(42ull, l);
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	376
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	377 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	378 ASSERT_EQ("42", s);
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	379 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	380 ASSERT_EQ("42", s);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2410 diff changeset	381
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	382
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	383 // 2**31
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	384 m.SetValue(DICOM_TAG_PATIENT_NAME, "2147483648", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	385 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	386 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	387 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	388 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	389 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	390 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	391 ASSERT_FLOAT_EQ(2147483648.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	392 ASSERT_DOUBLE_EQ(2147483648.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	393 ASSERT_EQ(2147483648ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	394 ASSERT_EQ(2147483648u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	395 ASSERT_EQ(2147483648ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	396
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	397 // 2**32-1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	398 m.SetValue(DICOM_TAG_PATIENT_NAME, "4294967295", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	399 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	400 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	401 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	402 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	403 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	404 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	405 ASSERT_FLOAT_EQ(4294967295.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	406 ASSERT_DOUBLE_EQ(4294967295.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	407 ASSERT_EQ(4294967295ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	408 ASSERT_EQ(4294967295u, k);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	409 ASSERT_EQ(4294967295ull, l);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	410
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	411 // 2**32
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	412 m.SetValue(DICOM_TAG_PATIENT_NAME, "4294967296", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	413 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	414 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	415 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	416 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	417 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	418 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	419 ASSERT_FLOAT_EQ(4294967296.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	420 ASSERT_DOUBLE_EQ(4294967296.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	421 ASSERT_EQ(4294967296ll, j);
2418 abc275c0a44d fix msvc 2008 jodogne parents: 2416 diff changeset	422 ASSERT_EQ(4294967296ull, 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 m.SetValue(DICOM_TAG_PATIENT_NAME, "-1", false);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	425 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	426 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	427 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	428 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	429 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	430 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	431 ASSERT_FLOAT_EQ(-1.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	432 ASSERT_DOUBLE_EQ(-1.0, d);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	433 ASSERT_EQ(-1, i);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	434 ASSERT_EQ(-1ll, j);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	435
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	436 // -2**31
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	437 m.SetValue(DICOM_TAG_PATIENT_NAME, "-2147483648", 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(-2147483648.0f, f);
2829 61fdb06e389a fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	445 ASSERT_DOUBLE_EQ(-2147483648.0, d);
61fdb06e389a fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	446 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	447 ASSERT_EQ(-2147483648ll, 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 - 1
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	450 m.SetValue(DICOM_TAG_PATIENT_NAME, "-2147483649", 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_FALSE(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(-2147483649.0f, f);
3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	458 ASSERT_DOUBLE_EQ(-2147483649.0, d);
2416 feb0d2dcfa9b try and fix compiler bugs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2412 diff changeset	459 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	460
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	461
fc26659493b6 added support for COLUMNS/ROWS tags with invalid 800\0 value observed in some US images amazy parents: 3497 diff changeset	462 // "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	463 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	464 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	465 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	466 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	467 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	468 ASSERT_EQ(800u, ui);
2410 3590c936e56f parsing numbers in DicomValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	469 }
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	470
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	471
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	472 TEST(DicomMap, Serialize)
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	473 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	474 Json::Value s;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	475
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	476 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	477 DicomMap m;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	478 m.SetValue(DICOM_TAG_PATIENT_NAME, "Hello", false);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	479 m.SetValue(DICOM_TAG_STUDY_DESCRIPTION, "Binary", true);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	480 m.SetNullValue(DICOM_TAG_SERIES_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	481 m.Serialize(s);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	482 }
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 DicomMap m;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	486 m.Unserialize(s);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	487
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	488 const DicomValue* v = m.TestAndGetValue(DICOM_TAG_ACCESSION_NUMBER);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	489 ASSERT_TRUE(v == NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	490
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	491 v = m.TestAndGetValue(DICOM_TAG_PATIENT_NAME);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	492 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	493 ASSERT_FALSE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	494 ASSERT_FALSE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	495 ASSERT_EQ("Hello", v->GetContent());
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 v = m.TestAndGetValue(DICOM_TAG_STUDY_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	498 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	499 ASSERT_FALSE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	500 ASSERT_TRUE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	501 ASSERT_EQ("Binary", v->GetContent());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	502
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	503 v = m.TestAndGetValue(DICOM_TAG_SERIES_DESCRIPTION);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	504 ASSERT_TRUE(v != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	505 ASSERT_TRUE(v->IsNull());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	506 ASSERT_FALSE(v->IsBinary());
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	507 ASSERT_THROW(v->GetContent(), OrthancException);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	508 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2829 diff changeset	509 }
3005 8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	510
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	511
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	512
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	513 TEST(DicomMap, ExtractMainDicomTags)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	514 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	515 DicomMap b;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	516 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	517 ASSERT_TRUE(b.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	518
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	519 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	520 DicomMap a;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	521 a.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	522 a.SetValue(DICOM_TAG_STUDY_DESCRIPTION, "B", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	523 a.SetValue(DICOM_TAG_SERIES_DESCRIPTION, "C", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	524 a.SetValue(DICOM_TAG_NUMBER_OF_FRAMES, "D", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	525 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	526 ASSERT_FALSE(a.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	527 b.ExtractMainDicomTags(a);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	528 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	529
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	530 ASSERT_EQ(4u, b.GetSize());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	531 ASSERT_EQ("A", b.GetValue(DICOM_TAG_PATIENT_NAME).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	532 ASSERT_EQ("B", b.GetValue(DICOM_TAG_STUDY_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	533 ASSERT_EQ("C", b.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	534 ASSERT_EQ("D", b.GetValue(DICOM_TAG_NUMBER_OF_FRAMES).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	535 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	536 ASSERT_TRUE(b.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	537
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	538 b.SetValue(DICOM_TAG_PATIENT_NAME, "G", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	539
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	540 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	541 DicomMap a;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	542 a.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	543 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	544 ASSERT_FALSE(a.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	545 b.Merge(a);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	546 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	547
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	548 ASSERT_EQ(5u, b.GetSize());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	549 ASSERT_EQ("G", b.GetValue(DICOM_TAG_PATIENT_NAME).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	550 ASSERT_EQ("B", b.GetValue(DICOM_TAG_STUDY_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	551 ASSERT_EQ("C", b.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	552 ASSERT_EQ("D", b.GetValue(DICOM_TAG_NUMBER_OF_FRAMES).GetContent());
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	553 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	554 ASSERT_FALSE(b.HasOnlyMainDicomTags());
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	555 }
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	556
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	557
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	558 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	559 {
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	560 {
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	561 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	562
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	563 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	564 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	565 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	566 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	567 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	568 }
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	569
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	570 {
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 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	572 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	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 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	575 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	576 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	577 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	578 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	579 }
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
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 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	583 tags.insert(DICOM_TAG_MODALITIES_IN_STUDY);
4944 f377d5643538 new Warnings configuration + InstanceAvailability tag Alain Mazy <am@osimis.io> parents: 4940 diff changeset	584 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	585
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 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	587 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	588 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	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_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	591 }
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 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	595 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	596 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	597
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 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	599 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	600 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	601 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	602 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	603 }
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
3551 173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	607 TEST(DicomMap, RemoveBinary)
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	608 {
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	609 DicomMap b;
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	610 b.SetValue(DICOM_TAG_PATIENT_NAME, "A", false);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	611 b.SetValue(DICOM_TAG_PATIENT_ID, "B", true);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	612 b.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, DicomValue()); // NULL
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	613 b.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, DicomValue("C", false));
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	614 b.SetValue(DICOM_TAG_SOP_INSTANCE_UID, DicomValue("D", true));
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	615
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	616 b.RemoveBinaryTags();
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	617
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	618 std::string s;
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	619 ASSERT_EQ(2u, b.GetSize());
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	620 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	621 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	622 }
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	623
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3541 diff changeset	624
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	625 TEST(DicomMap, FromDicomAsJsonAndSequences)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	626 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	627 DicomMap m;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	628 std::string jsonFullString = "{"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	629 "\"0008,1090\" : "
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	630 "{"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	631 "\"Name\" : \"ManufacturerModelName\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	632 "\"Type\" : \"String\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	633 "\"Value\" : \"MyModel\""
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	634 "},"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	635 "\"0008,1111\" : "
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	636 "{"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	637 "\"Name\" : \"ReferencedPerformedProcedureStepSequence\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	638 "\"Type\" : \"Sequence\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	639 "\"Value\" : "
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	640 "["
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	641 "{"
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	642 "\"0008,1150\" : "
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\" : \"ReferencedSOPClassUID\","
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\" : \"1.2.4\""
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,1155\" : "
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\" : \"ReferencedSOPInstanceUID\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	651 "\"Type\" : \"String\","
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	652 "\"Value\" : \"1.2.3\""
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 "]"
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
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	658 Json::Value parsedJson;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	659 bool ret = Toolbox::ReadJson(parsedJson, jsonFullString);
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 m.FromDicomAsJson(parsedJson, false /* append /, true / parseSequences*/);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	662 ASSERT_TRUE(ret);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	663
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	664 ASSERT_TRUE(m.HasTag(DicomTag(0x0008, 0x1090)));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	665 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	666
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	667 ASSERT_TRUE(m.HasTag(DicomTag(0x0008, 0x1111)));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	668 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	669 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	670
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	671 {// serialize to human dicomAsJson
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	672 Json::Value dicomAsJson = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	673 FromDcmtkBridge::ToJson(dicomAsJson, m, DicomToJsonFormat_Human);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	674 // printf("%s", dicomAsJson.toStyledString().c_str());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	675
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	676 ASSERT_TRUE(dicomAsJson.isMember("ManufacturerModelName"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	677 ASSERT_TRUE(dicomAsJson.isMember("ReferencedPerformedProcedureStepSequence"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	678 ASSERT_TRUE(dicomAsJson["ReferencedPerformedProcedureStepSequence"][0].isMember("ReferencedSOPClassUID"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	679 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	680 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	681
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	682 {// serialize to full dicomAsJson
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	683 Json::Value dicomAsJson = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	684 FromDcmtkBridge::ToJson(dicomAsJson, m, DicomToJsonFormat_Full);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	685 // printf("%s", dicomAsJson.toStyledString().c_str());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	686
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	687 ASSERT_TRUE(dicomAsJson.isMember("0008,1090"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	688 ASSERT_TRUE(dicomAsJson.isMember("0008,1111"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	689 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	690 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	691 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	692 }
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 {// serialize to short dicomAsJson
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	695 Json::Value dicomAsJson = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	696 FromDcmtkBridge::ToJson(dicomAsJson, m, DicomToJsonFormat_Short);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	697 // printf("%s", dicomAsJson.toStyledString().c_str());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	698
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	699 ASSERT_TRUE(dicomAsJson.isMember("0008,1090"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	700 ASSERT_TRUE(dicomAsJson.isMember("0008,1111"));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	701 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	702 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	703 ASSERT_EQ("MyModel", dicomAsJson["0008,1090"].asString());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	704 }
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 {// extract sequence
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	707 DicomMap sequencesOnly;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	708 m.ExtractSequences(sequencesOnly);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	709
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	710 ASSERT_EQ(1, sequencesOnly.GetSize());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	711 ASSERT_TRUE(sequencesOnly.HasTag(0x0008, 0x1111));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	712 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	713
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	714 // copy sequence
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	715 DicomMap sequencesCopy;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	716 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	717
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	718 ASSERT_EQ(1, sequencesCopy.GetSize());
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	719 ASSERT_TRUE(sequencesCopy.HasTag(0x0008, 0x1111));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	720 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	721 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	722 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	723
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	724 TEST(DicomMap, ExtractSummary)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	725 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	726 Json::Value v = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	727 v["PatientName"] = "Hello";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	728 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	729
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	730 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	731 Json::Value a = Json::arrayValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	732
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	733 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	734 Json::Value item = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	735 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	736 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	737 a.append(item);
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
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	740 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	741 Json::Value item = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	742 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	743 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	744 a.append(item);
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 v["ReferencedImageSequence"] = a;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	748 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	749
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	750 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	751 Json::Value a = Json::arrayValue;
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["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	756
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	757 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	758 Json::Value b = Json::arrayValue;
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 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	761 Json::Value c = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	762 c["CodeValue"] = "122403";
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	763 c["0008,103e"] = "WORLD"; // Series description
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	764 b.append(c);
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 item["PurposeOfReferenceCodeSequence"] = b;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	768 }
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 a.append(item);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	771 }
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 v["RelatedSeriesSequence"] = a;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	774 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	775
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	776 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	777
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	778 DicomMap summary;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	779 std::set<DicomTag> ignoreTagLength;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	780 dicom->ExtractDicomSummary(summary, ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength);
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 ASSERT_TRUE(summary.HasTag(0x0008, 0x1140));
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5040 diff changeset	783 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	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
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	787
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	788 TEST(DicomWebJson, Multiplicity)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	789 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	790 // 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	791
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	792 ParsedDicomFile dicom(false);
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	793 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	794 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	795 dicom.ReplacePlainString(DICOM_TAG_IMAGE_POSITION_PATIENT, "");
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	796
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	797 DicomWebJsonVisitor visitor;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	798 dicom.Apply(visitor);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	799
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	800 {
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	801 const Json::Value& tag = visitor.GetResult() ["00200037"]; // ImageOrientationPatient
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	802 const Json::Value& value = tag["Value"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	803
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	804 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	805 ASSERT_EQ(2u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	806 ASSERT_EQ(3u, value.size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	807 ASSERT_EQ(Json::realValue, value[1].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	808 ASSERT_FLOAT_EQ(1.0f, value[0].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	809 ASSERT_FLOAT_EQ(2.3f, value[1].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	810 ASSERT_FLOAT_EQ(4.0f, value[2].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	811 }
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() ["00200032"]; // ImagePositionPatient
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	815 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	816 ASSERT_EQ(1u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	817 }
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	818
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	819 std::string xml;
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	820 visitor.FormatXml(xml);
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	821
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	822 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	823 DicomMap m;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	824 m.FromDicomWeb(visitor.GetResult());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	825 ASSERT_EQ(3u, m.GetSize());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	826
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	827 std::string s;
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	828 ASSERT_TRUE(m.LookupStringValue(s, DICOM_TAG_PATIENT_NAME, false));
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	829 ASSERT_EQ("SB1^SB2^SB3^SB4^SB5", s);
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	830 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	831 ASSERT_TRUE(s.empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	832
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	833 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	834
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	835 std::vector<std::string> v;
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	836 Toolbox::TokenizeString(v, s, '\\');
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	837 ASSERT_FLOAT_EQ(1.0f, boost::lexical_cast<float>(v[0]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	838 ASSERT_FLOAT_EQ(2.3f, boost::lexical_cast<float>(v[1]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	839 ASSERT_FLOAT_EQ(4.0f, boost::lexical_cast<float>(v[2]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	840 }
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	841 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	842
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	843
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	844 TEST(DicomWebJson, NullValue)
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	845 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	846 // 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	847
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	848 ParsedDicomFile dicom(false);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	849 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	850
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	851 DicomWebJsonVisitor visitor;
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	852 dicom.Apply(visitor);
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	853
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	854 {
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	855 const Json::Value& tag = visitor.GetResult() ["00200037"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	856 const Json::Value& value = tag["Value"];
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	857
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	858 ASSERT_EQ(EnumerationToString(ValueRepresentation_DecimalString), tag["vr"].asString());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	859 ASSERT_EQ(2u, tag.getMemberNames().size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	860 ASSERT_EQ(4u, value.size());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	861 ASSERT_EQ(Json::realValue, value[0].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	862 ASSERT_EQ(Json::nullValue, value[1].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	863 ASSERT_EQ(Json::nullValue, value[2].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	864 ASSERT_EQ(Json::realValue, value[3].type());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	865 ASSERT_FLOAT_EQ(1.5f, value[0].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	866 ASSERT_FLOAT_EQ(2.5f, value[3].asFloat());
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	867 }
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	868
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	869 std::string xml;
3201 b69fe409cb4d dicomweb json to xml Sebastien Jodogne <s.jodogne@gmail.com> parents: 3200 diff changeset	870 visitor.FormatXml(xml);
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	871
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	872 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	873 DicomMap m;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	874 m.FromDicomWeb(visitor.GetResult());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	875 ASSERT_EQ(1u, m.GetSize());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	876
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	877 std::string s;
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3497 diff changeset	878 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	879
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	880 std::vector<std::string> v;
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	881 Toolbox::TokenizeString(v, s, '\\');
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	882 ASSERT_FLOAT_EQ(1.5f, boost::lexical_cast<float>(v[0]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	883 ASSERT_TRUE(v[1].empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	884 ASSERT_TRUE(v[2].empty());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	885 ASSERT_FLOAT_EQ(2.5f, boost::lexical_cast<float>(v[3]));
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	886 }
3198 7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	887 }
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	888
7724ed267b5c unit testing dicomweb conversion Sebastien Jodogne <s.jodogne@gmail.com> parents: 3197 diff changeset	889
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	890 TEST(DicomWebJson, PixelSpacing)
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	891 {
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	892 // 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	893 // correctly handled (dot "." vs comma ",")
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	894 ParsedDicomFile source(false);
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	895 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	896
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	897 DicomWebJsonVisitor visitor;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	898 source.Apply(visitor);
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	899
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	900 DicomMap target;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	901 target.FromDicomWeb(visitor.GetResult());
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	902
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	903 ASSERT_EQ("DS", visitor.GetResult() ["00280030"]["vr"].asString());
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	904 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	905 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	906
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	907 std::string s;
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	908 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	909 ASSERT_EQ(s, "1.5\\1.3");
4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3551 diff changeset	910 }
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	911
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	912
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	913 TEST(DicomMap, MainTagNames)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	914 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	915 ASSERT_EQ(3, ResourceType_Instance - ResourceType_Patient);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	916
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	917 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	918 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	919 ResourceType level = static_cast<ResourceType>(i);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	920
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	921 const std::set<DicomTag>& tags = DicomMap::GetMainDicomTags(level);
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	922
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	923 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	924 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	925 DicomMap a;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	926 a.SetValue(*it, "TEST", false);
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 Json::Value json;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	929 a.DumpMainDicomTags(json, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	930
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	931 ASSERT_EQ(Json::objectValue, json.type());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	932 ASSERT_EQ(1u, json.getMemberNames().size());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	933
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	934 std::string name = json.getMemberNames() [0];
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	935 EXPECT_EQ(name, FromDcmtkBridge::GetTagName(*it, ""));
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	936
4696 dd6274412ff4 new configuration option "ExternalDictionaries" to load external DICOM dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4494 diff changeset	937 std::string main = FromDcmtkBridge::GetTagName(*it, "");
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	938 if (!main.empty())
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	939 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	940 ASSERT_EQ(main, name);
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 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	943 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	944 }
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	945
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	946
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	947
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	948 TEST(DicomTag, Comparisons)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	949 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	950 DicomTag a(0x0000, 0x0000);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	951 DicomTag b(0x0010, 0x0010);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	952 DicomTag c(0x0010, 0x0020);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	953 DicomTag d(0x0020, 0x0000);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	954
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	955 // operator==()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	956 ASSERT_TRUE(a == a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	957 ASSERT_FALSE(a == b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	958
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	959 // operator!=()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	960 ASSERT_FALSE(a != a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	961 ASSERT_TRUE(a != b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	962
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	963 // operator<=()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	964 ASSERT_TRUE(a <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	965 ASSERT_TRUE(a <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	966 ASSERT_TRUE(a <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	967 ASSERT_TRUE(a <= d);
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 ASSERT_FALSE(b <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	970 ASSERT_TRUE(b <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	971 ASSERT_TRUE(b <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	972 ASSERT_TRUE(b <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	973
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	974 ASSERT_FALSE(c <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	975 ASSERT_FALSE(c <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	976 ASSERT_TRUE(c <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	977 ASSERT_TRUE(c <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	978
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	979 ASSERT_FALSE(d <= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	980 ASSERT_FALSE(d <= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	981 ASSERT_FALSE(d <= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	982 ASSERT_TRUE(d <= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	983
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	984 // operator<()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	985 ASSERT_FALSE(a < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	986 ASSERT_TRUE(a < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	987 ASSERT_TRUE(a < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	988 ASSERT_TRUE(a < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	989
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	990 ASSERT_FALSE(b < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	991 ASSERT_FALSE(b < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	992 ASSERT_TRUE(b < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	993 ASSERT_TRUE(b < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	994
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	995 ASSERT_FALSE(c < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	996 ASSERT_FALSE(c < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	997 ASSERT_FALSE(c < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	998 ASSERT_TRUE(c < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	999
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1000 ASSERT_FALSE(d < a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1001 ASSERT_FALSE(d < b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1002 ASSERT_FALSE(d < c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1003 ASSERT_FALSE(d < d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1004
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1005 // operator>=()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1006 ASSERT_TRUE(a >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1007 ASSERT_FALSE(a >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1008 ASSERT_FALSE(a >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1009 ASSERT_FALSE(a >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1010
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1011 ASSERT_TRUE(b >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1012 ASSERT_TRUE(b >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1013 ASSERT_FALSE(b >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1014 ASSERT_FALSE(b >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1015
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1016 ASSERT_TRUE(c >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1017 ASSERT_TRUE(c >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1018 ASSERT_TRUE(c >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1019 ASSERT_FALSE(c >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1020
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1021 ASSERT_TRUE(d >= a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1022 ASSERT_TRUE(d >= b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1023 ASSERT_TRUE(d >= c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1024 ASSERT_TRUE(d >= d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1025
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1026 // operator>()
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1027 ASSERT_FALSE(a > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1028 ASSERT_FALSE(a > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1029 ASSERT_FALSE(a > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1030 ASSERT_FALSE(a > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1031
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1032 ASSERT_TRUE(b > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1033 ASSERT_FALSE(b > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1034 ASSERT_FALSE(b > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1035 ASSERT_FALSE(b > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1036
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1037 ASSERT_TRUE(c > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1038 ASSERT_TRUE(c > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1039 ASSERT_FALSE(c > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1040 ASSERT_FALSE(c > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1041
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1042 ASSERT_TRUE(d > a);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1043 ASSERT_TRUE(d > b);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1044 ASSERT_TRUE(d > c);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1045 ASSERT_FALSE(d > d);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1046 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1047
4845 02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1048 TEST(ParsedDicomFile, canIncludeXsVrTags)
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1049 {
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1050 Json::Value tags;
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1051 tags["0028,0034"] = "1\\1"; // PixelAspectRatio
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1052 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	1053
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1054 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	1055 // simply make sure it does not throw !
02d77189d8ba added ReceivedInstanceCallback + sample C++ plugin Alain Mazy <am@osimis.io> parents: 4831 diff changeset	1056 }
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1057
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1058
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4304 diff changeset	1059 #if ORTHANC_SANDBOXED != 1
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4304 diff changeset	1060
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1061 #include "../Sources/SystemToolbox.h"
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1062
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1063 TEST(DicomMap, DISABLED_ParseDicomMetaInformation)
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1064 {
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1065 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	1066
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1067 std::map<std::string, DicomTransferSyntax> f;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1068 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	1069 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	1070 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	1071 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	1072 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	1073 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	1074 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	1075 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	1076 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	1077 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	1078 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	1079 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	1080
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1081 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	1082 {
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1083 printf("\n== %s ==\n\n", it->first.c_str());
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1084
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1085 std::string dicom;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1086 SystemToolbox::ReadFile(dicom, it->first, false);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1087
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1088 DicomMap d;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1089 ASSERT_TRUE(DicomMap::ParseDicomMetaInformation(d, dicom.c_str(), dicom.size()));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1090 d.Print(stdout);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1091
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1092 std::string s;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1093 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	1094
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1095 DicomTransferSyntax ts;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1096 ASSERT_TRUE(LookupTransferSyntax(ts, s));
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1097 ASSERT_EQ(ts, it->second);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1098 }
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1099 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1100
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1101
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1102 namespace
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1103 {
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1104 class V : public DicomStreamReader::IVisitor
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1105 {
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1106 private:
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1107 DicomMap map_;
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1108 uint64_t pixelDataOffset_;
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1109
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1110 public:
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1111 V() :
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1112 pixelDataOffset_(0)
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1113 {
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1114 }
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1115
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1116 const DicomMap& GetDicomMap() const
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1117 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1118 return map_;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1119 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1120
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1121 virtual void VisitMetaHeaderTag(const DicomTag& tag,
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1122 const ValueRepresentation& vr,
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	1123 const std::string& value) ORTHANC_OVERRIDE
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1124 {
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	1125 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	1126 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1127
4220 92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1128 virtual void VisitTransferSyntax(DicomTransferSyntax transferSyntax) ORTHANC_OVERRIDE
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1129 {
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1130 printf("TRANSFER SYNTAX: %s\n", GetTransferSyntaxUid(transferSyntax));
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1131 }
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1132
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1133 virtual bool VisitDatasetTag(const DicomTag& tag,
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1134 const ValueRepresentation& vr,
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	1135 const std::string& value,
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1136 bool isLittleEndian,
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1137 uint64_t fileOffset) ORTHANC_OVERRIDE
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1138 {
4215 28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	1139 if (!isLittleEndian)
28e9457dc7ab working on sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	1140 printf("** ");
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1141
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1142 if (tag == DICOM_TAG_PIXEL_DATA)
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1143 {
4216 61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	1144 std::cout << "Dataset: " << tag.Format() << " " << EnumerationToString(vr)
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1145 << " [PIXEL] (" << value.size() << "), offset: " << std::hex << fileOffset << std::dec << std::endl;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1146 pixelDataOffset_ = fileOffset;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1147 return false;
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1148 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1149 else
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1150 {
4216 61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	1151 std::cout << "Dataset: " << tag.Format() << " " << EnumerationToString(vr)
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1152 << " [" << Toolbox::ConvertToAscii(value).c_str() << "] (" << value.size()
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1153 << "), offset: " << std::hex << fileOffset << std::dec << std::endl;
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1154 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1155
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1156 map_.SetValue(tag, value, Toolbox::IsAsciiString(value));
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1157
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1158 return true;
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1159 }
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1160
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1161 uint64_t GetPixelDataOffset() const
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1162 {
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1163 return pixelDataOffset_;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1164 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1165 };
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1166 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1167
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1168
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1169
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1170 TEST(DicomStreamReader, DISABLED_Tutu)
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1171 {
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1172 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	1173
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1174 typedef std::list< std::pair<std::string, uint64_t> > Sources;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1175
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1176 Sources sources;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1177 sources.push_back(std::make_pair(PATH + "../ColorTestMalaterre.dcm", 0x03a0u));
4494 39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1178 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.1.dcm", 0x037cu));
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1179 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.2.dcm", 0x03e8u)); // Big Endian
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1180 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.4.50.dcm", 0x04acu));
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1181 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.4.51.dcm", 0x072cu));
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1182 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.4.57.dcm", 0x0620u));
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1183 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.4.70.dcm", 0x065au));
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1184 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.4.80.dcm", 0x0b46u));
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1185 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.4.81.dcm", 0x073eu));
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1186 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.4.90.dcm", 0x0b66u));
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1187 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.4.91.dcm", 0x19b8u));
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1188 sources.push_back(std::make_pair(PATH + "1.2.840.10008.1.2.5.dcm", 0x0b0au));
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1189
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1190 {
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1191 std::string dicom;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1192
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1193 uint64_t offset;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1194 // Not a DICOM image
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1195 SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.4.50.png", false);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1196 ASSERT_FALSE(DicomStreamReader::LookupPixelDataOffset(offset, dicom));
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1197
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1198 // Image without valid DICOM preamble
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1199 SystemToolbox::ReadFile(dicom, PATH + "1.2.840.10008.1.2.dcm", false);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1200 ASSERT_FALSE(DicomStreamReader::LookupPixelDataOffset(offset, dicom));
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1201 }
4216 61585d8a9faf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 4215 diff changeset	1202
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1203 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	1204 {
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1205 std::string dicom;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1206 SystemToolbox::ReadFile(dicom, it->first, false);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1207
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1208 {
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1209 uint64_t offset;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1210 ASSERT_TRUE(DicomStreamReader::LookupPixelDataOffset(offset, dicom));
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1211 ASSERT_EQ(it->second, offset);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1212 }
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1213
4494 39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1214 {
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1215 uint64_t offset;
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1216 ASSERT_TRUE(DicomStreamReader::LookupPixelDataOffset(offset, dicom.c_str(), dicom.size()));
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1217 ASSERT_EQ(it->second, offset);
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1218 }
39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4493 diff changeset	1219
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1220 ParsedDicomFile a(dicom);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1221 Json::Value aa;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1222 a.DatasetToJson(aa, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1223
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1224 std::stringstream stream;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1225 size_t pos = 0;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1226
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1227 DicomStreamReader r(stream);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1228 V visitor;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1229
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1230 // Test reading byte per byte
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1231 while (pos < dicom.size() &&
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1232 !r.IsDone())
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1233 {
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1234 r.Consume(visitor);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1235 stream.clear();
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1236 stream.put(dicom[pos++]);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1237 }
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1238
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1239 r.Consume(visitor);
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1240
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1241 ASSERT_EQ(it->second, visitor.GetPixelDataOffset());
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1242
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1243 // Truncate the original DICOM up to pixel data
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1244 dicom.resize(visitor.GetPixelDataOffset());
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1245
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1246 ParsedDicomFile b(dicom);
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1247 Json::Value bb;
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1248 b.DatasetToJson(bb, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0);
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1249
4493 b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1250 aa.removeMember("7fe0,0010");
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1251 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	1252 ASSERT_EQ(aa.toStyledString(), bb.toStyledString());
b57ca702a430 DicomStreamReader::LookupPixelDataOffset() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1253 }
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1254 }
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1255
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1256 TEST(DicomStreamReader, DISABLED_Tutu2)
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1257 {
4223 3d6f14a05db1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4220 diff changeset	1258 //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	1259
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1260 //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	1261 //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	1262 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	1263
78c8b4a18619 fix for c++98 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4216 diff changeset	1264 std::ifstream stream(path.c_str());
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1265
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1266 DicomStreamReader r(stream);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1267 V visitor;
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1268
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1269 r.Consume(visitor);
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1270
4223 3d6f14a05db1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4220 diff changeset	1271 printf(">> %d\n", static_cast<int>(r.GetProcessedBytes()));
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	1272 }
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1273
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1274
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1275 #include <boost/filesystem.hpp>
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1276
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1277 TEST(DicomStreamReader, DISABLED_Tutu3)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1278 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1279 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	1280
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1281 std::set<std::string> errors;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1282 unsigned int success = 0;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1283
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1284 for (boost::filesystem::recursive_directory_iterator current(PATH), end;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1285 current != end ; ++current)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1286 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1287 if (SystemToolbox::IsRegularFile(current->path().string()))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1288 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1289 try
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1290 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1291 if (current->path().extension() == ".dcm")
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1292 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1293 const std::string path = current->path().string();
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1294 printf("[%s]\n", path.c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1295
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1296 DicomMap m1;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1297
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1298 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1299 std::ifstream stream(path.c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1300
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1301 DicomStreamReader r(stream);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1302 V visitor;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1303
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1304 try
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1305 {
4220 92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1306 r.Consume(visitor, DICOM_TAG_PIXEL_DATA);
92a21efa5c96 reorganization of DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4219 diff changeset	1307 //r.Consume(visitor);
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1308 success++;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1309 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1310 catch (OrthancException& e)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1311 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1312 errors.insert(path);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1313 continue;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1314 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1315
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1316 m1.Assign(visitor.GetDicomMap());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1317 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1318
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1319 m1.SetValue(DICOM_TAG_PIXEL_DATA, "", true);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1320
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1321
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1322 DicomMap m2;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1323
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1324 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1325 std::string dicom;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1326 SystemToolbox::ReadFile(dicom, path);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1327
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1328 ParsedDicomFile f(dicom);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1329 f.ExtractDicomSummary(m2, 256);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1330 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1331
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1332 std::set<DicomTag> tags;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1333 m2.GetTags(tags);
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1334
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1335 bool first = true;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1336 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	1337 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1338 if (!m1.HasTag(*it))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1339 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1340 if (first)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1341 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1342 fprintf(stderr, "[%s]\n", path.c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1343 first = false;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1344 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1345
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1346 std::cerr << "ERROR: " << it->Format() << std::endl;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1347 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1348 else if (!m2.GetValue(*it).IsNull() &&
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1349 !m2.GetValue(*it).IsBinary() &&
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1350 Toolbox::IsAsciiString(m1.GetValue(*it).GetContent()))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1351 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1352 const std::string& v1 = m1.GetValue(*it).GetContent();
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1353 const std::string& v2 = m2.GetValue(*it).GetContent();
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1354
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1355 if (v1 != v2 &&
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1356 (v1.size() != v2.size() + 1 \|\|
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1357 v1.substr(0, v2.size()) != v2))
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1358 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1359 std::cerr << "ERROR: [" << v1 << "] [" << v2 << "]" << std::endl;
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1360 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1361 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1362 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1363 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1364 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1365 catch (boost::filesystem::filesystem_error&)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1366 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1367 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1368 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1369 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1370
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1371
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1372 printf("\n== ERRORS ==\n");
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1373 for (std::set<std::string>::const_iterator
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1374 it = errors.begin(); it != errors.end(); ++it)
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1375 {
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1376 printf("[%s]\n", it->c_str());
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1377 }
8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1378
4223 3d6f14a05db1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4220 diff changeset	1379 printf("\n== SUCCESSES: %u ==\n\n", success);
4218 8e069a7e1c11 validation against orthanc-tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4217 diff changeset	1380 }
4325 b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4304 diff changeset	1381
b96aedfa8cc1 unit tests now running in WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 4304 diff changeset	1382 #endif

Mercurial > hg > orthanc

annotate OrthancFramework/UnitTestsSources/DicomMapTests.cpp @ 5044:6fed78e13233