orthanc: OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.cpp annotate

annotate OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.cpp @ 5752:717acb0ea546 find-refactoring tip

fix DICOMWeb integration tests

author	Alain Mazy <am@orthanc.team>
date	Tue, 03 Sep 2024 16:37:31 +0200
parents	f7adfb22e20e
children

rev	line source
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1892 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	4 * Department, University Hospital of Liege, Belgium
5640 f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
5485 48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5442 diff changeset	7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 *
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	10 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	11 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	12 * the License, or (at your option) any later version.
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 *
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * This program is distributed in the hope that it will be useful, but
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * WITHOUT ANY WARRANTY; without even the implied warranty of
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	17 * Lesser General Public License for more details.
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	19 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	20 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	21 * <http://www.gnu.org/licenses/>.
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 **/
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	25 #include "../PrecompiledHeaders.h"
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 #include "RemoteModalityParameters.h"
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	28 #include "../Logging.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	29 #include "../OrthancException.h"
2659 c27f7ecf9b54 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	30 #include "../SerializationToolbox.h"
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	32 #include <boost/lexical_cast.hpp>
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	33 #include <stdexcept>
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	34
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	35
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	36 static const char* KEY_AET = "AET";
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	37 static const char* KEY_ALLOW_ECHO = "AllowEcho";
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	38 static const char* KEY_ALLOW_FIND = "AllowFind";
4888 8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	39 static const char* KEY_ALLOW_FIND_WORKLIST = "AllowFindWorklist";
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	40 static const char* KEY_ALLOW_GET = "AllowGet";
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	41 static const char* KEY_ALLOW_MOVE = "AllowMove";
3602 085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	42 static const char* KEY_ALLOW_N_ACTION = "AllowNAction";
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	43 static const char* KEY_ALLOW_N_EVENT_REPORT = "AllowEventReport";
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	44 static const char* KEY_ALLOW_STORAGE_COMMITMENT = "AllowStorageCommitment";
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	45 static const char* KEY_ALLOW_STORE = "AllowStore";
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	46 static const char* KEY_ALLOW_TRANSCODING = "AllowTranscoding";
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	47 static const char* KEY_HOST = "Host";
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	48 static const char* KEY_MANUFACTURER = "Manufacturer";
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	49 static const char* KEY_PORT = "Port";
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	50 static const char* KEY_USE_DICOM_TLS = "UseDicomTls";
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	51 static const char* KEY_LOCAL_AET = "LocalAet";
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	52 static const char* KEY_TIMEOUT = "Timeout";
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	53
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	54
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 namespace Orthanc
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 {
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	57 void RemoteModalityParameters::Clear()
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 {
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	59 aet_ = "ORTHANC";
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	60 host_ = "127.0.0.1";
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	61 port_ = 104;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	62 manufacturer_ = ModalityManufacturer_Generic;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	63 allowEcho_ = true;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	64 allowStore_ = true;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	65 allowFind_ = true;
4888 8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	66 allowFindWorklist_ = true;
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	67 allowMove_ = true;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	68 allowGet_ = true;
3602 085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	69 allowNAction_ = true; // For storage commitment
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	70 allowNEventReport_ = true; // For storage commitment
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	71 allowTranscoding_ = true;
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	72 useDicomTls_ = false;
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	73 localAet_.clear();
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	74 timeout_ = 0;
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 }
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	77
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	78 RemoteModalityParameters::RemoteModalityParameters()
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	79 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	80 Clear();
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	81 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	82
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	83 RemoteModalityParameters::RemoteModalityParameters(const Json::Value &serialized)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	84 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	85 Unserialize(serialized);
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	86 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	87
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	88 RemoteModalityParameters::RemoteModalityParameters(const std::string& aet,
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	89 const std::string& host,
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	90 uint16_t port,
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	91 ModalityManufacturer manufacturer)
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	92 {
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	93 Clear();
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	94 SetApplicationEntityTitle(aet);
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	95 SetHost(host);
2715 73bc0c32547c fix embedding openssl within a DLL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2659 diff changeset	96 SetPortNumber(port);
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	97 SetManufacturer(manufacturer);
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	98 }
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	99
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	100 const std::string &RemoteModalityParameters::GetApplicationEntityTitle() const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	101 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	102 return aet_;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	103 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	104
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	105 void RemoteModalityParameters::SetApplicationEntityTitle(const std::string &aet)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	106 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	107 aet_ = aet;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	108 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	109
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	110 const std::string &RemoteModalityParameters::GetHost() const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	111 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	112 return host_;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	113 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	114
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	115 void RemoteModalityParameters::SetHost(const std::string &host)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	116 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	117 host_ = host;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	118 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	119
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	120 uint16_t RemoteModalityParameters::GetPortNumber() const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	121 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	122 return port_;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	123 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	124
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	125
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	126 static void CheckPortNumber(int value)
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	127 {
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	128 if (value <= 0 \|\|
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	129 value >= 65535)
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	130 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	131 throw OrthancException(ErrorCode_ParameterOutOfRange,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	132 "A TCP port number must be in range [1..65534], but found: " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	133 boost::lexical_cast<std::string>(value));
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	134 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	135 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	136
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	137
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	138 static uint16_t ReadPortNumber(const Json::Value& value)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	139 {
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	140 int tmp;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	141
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	142 switch (value.type())
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	143 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	144 case Json::intValue:
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	145 case Json::uintValue:
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	146 tmp = value.asInt();
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	147 break;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	148
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	149 case Json::stringValue:
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	150 try
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	151 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	152 tmp = boost::lexical_cast<int>(value.asString());
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	153 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	154 catch (boost::bad_lexical_cast&)
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	155 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	156 throw OrthancException(ErrorCode_BadFileFormat);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	157 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	158 break;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	159
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	160 default:
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	161 throw OrthancException(ErrorCode_BadFileFormat);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	162 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	163
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	164 CheckPortNumber(tmp);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	165 return static_cast<uint16_t>(tmp);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	166 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	167
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	168
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	169 void RemoteModalityParameters::SetPortNumber(uint16_t port)
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	170 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	171 CheckPortNumber(port);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	172 port_ = port;
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	173 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	174
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	175 ModalityManufacturer RemoteModalityParameters::GetManufacturer() const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	176 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	177 return manufacturer_;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	178 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	179
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	180 void RemoteModalityParameters::SetManufacturer(ModalityManufacturer manufacturer)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	181 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	182 manufacturer_ = manufacturer;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	183 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	184
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	185 void RemoteModalityParameters::SetManufacturer(const std::string &manufacturer)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	186 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	187 manufacturer_ = StringToModalityManufacturer(manufacturer);
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	188 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	189
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	190 void RemoteModalityParameters::UnserializeArray(const Json::Value& serialized)
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	191 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	192 assert(serialized.type() == Json::arrayValue);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	193
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	194 if ((serialized.size() != 3 &&
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	195 serialized.size() != 4) \|\|
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	196 serialized[0].type() != Json::stringValue \|\|
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	197 serialized[1].type() != Json::stringValue \|\|
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	198 (serialized.size() == 4 &&
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	199 serialized[3].type() != Json::stringValue))
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	200 {
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	201 throw OrthancException(ErrorCode_BadFileFormat);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	202 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	203
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	204 aet_ = serialized[0].asString();
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	205 host_ = serialized[1].asString();
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	206 port_ = ReadPortNumber(serialized[2]);
1654 3727a09e7b53 fix some icc warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	207
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	208 if (serialized.size() == 4)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	209 {
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	210 manufacturer_ = StringToModalityManufacturer(serialized[3].asString());
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	211 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	212 else
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	213 {
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	214 manufacturer_ = ModalityManufacturer_Generic;
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	215 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	216 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	217
2715 73bc0c32547c fix embedding openssl within a DLL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2659 diff changeset	218
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	219 void RemoteModalityParameters::UnserializeObject(const Json::Value& serialized)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	220 {
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	221 assert(serialized.type() == Json::objectValue);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	222
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	223 aet_ = SerializationToolbox::ReadString(serialized, KEY_AET);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	224 host_ = SerializationToolbox::ReadString(serialized, KEY_HOST);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	225
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	226 if (serialized.isMember(KEY_PORT))
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	227 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	228 port_ = ReadPortNumber(serialized[KEY_PORT]);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	229 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	230 else
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	231 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	232 throw OrthancException(ErrorCode_BadFileFormat);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	233 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	234
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	235 if (serialized.isMember(KEY_MANUFACTURER))
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	236 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	237 manufacturer_ = StringToModalityManufacturer
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	238 (SerializationToolbox::ReadString(serialized, KEY_MANUFACTURER));
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	239 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	240 else
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	241 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	242 manufacturer_ = ModalityManufacturer_Generic;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	243 }
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	244
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	245 if (serialized.isMember(KEY_ALLOW_ECHO))
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	246 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	247 allowEcho_ = SerializationToolbox::ReadBoolean(serialized, KEY_ALLOW_ECHO);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	248 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	249
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	250 if (serialized.isMember(KEY_ALLOW_FIND))
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	251 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	252 allowFind_ = SerializationToolbox::ReadBoolean(serialized, KEY_ALLOW_FIND);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	253 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	254
4888 8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	255 if (serialized.isMember(KEY_ALLOW_FIND_WORKLIST))
8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	256 {
8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	257 allowFindWorklist_ = SerializationToolbox::ReadBoolean(serialized, KEY_ALLOW_FIND_WORKLIST);
8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	258 }
8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	259
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	260 if (serialized.isMember(KEY_ALLOW_STORE))
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	261 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	262 allowStore_ = SerializationToolbox::ReadBoolean(serialized, KEY_ALLOW_STORE);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	263 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	264
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	265 if (serialized.isMember(KEY_ALLOW_GET))
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	266 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	267 allowGet_ = SerializationToolbox::ReadBoolean(serialized, KEY_ALLOW_GET);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	268 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	269
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	270 if (serialized.isMember(KEY_ALLOW_MOVE))
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	271 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	272 allowMove_ = SerializationToolbox::ReadBoolean(serialized, KEY_ALLOW_MOVE);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	273 }
3602 085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	274
085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	275 if (serialized.isMember(KEY_ALLOW_N_ACTION))
085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	276 {
085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	277 allowNAction_ = SerializationToolbox::ReadBoolean(serialized, KEY_ALLOW_N_ACTION);
085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	278 }
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	279
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	280 if (serialized.isMember(KEY_ALLOW_N_EVENT_REPORT))
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	281 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	282 allowNEventReport_ = SerializationToolbox::ReadBoolean(serialized, KEY_ALLOW_N_EVENT_REPORT);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	283 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	284
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	285 if (serialized.isMember(KEY_ALLOW_STORAGE_COMMITMENT))
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	286 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	287 bool allow = SerializationToolbox::ReadBoolean(serialized, KEY_ALLOW_STORAGE_COMMITMENT);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	288 allowNAction_ = allow;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	289 allowNEventReport_ = allow;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	290 }
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	291
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	292 if (serialized.isMember(KEY_ALLOW_TRANSCODING))
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	293 {
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	294 allowTranscoding_ = SerializationToolbox::ReadBoolean(serialized, KEY_ALLOW_TRANSCODING);
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	295 }
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	296
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	297 if (serialized.isMember(KEY_USE_DICOM_TLS))
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	298 {
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	299 useDicomTls_ = SerializationToolbox::ReadBoolean(serialized, KEY_USE_DICOM_TLS);
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	300 }
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	301
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	302 if (serialized.isMember(KEY_LOCAL_AET))
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	303 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	304 localAet_ = SerializationToolbox::ReadString(serialized, KEY_LOCAL_AET);
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	305 }
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	306
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	307 if (serialized.isMember(KEY_TIMEOUT))
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	308 {
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	309 timeout_ = SerializationToolbox::ReadUnsignedInteger(serialized, KEY_TIMEOUT);
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	310 }
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	311 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	312
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	313
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	314 bool RemoteModalityParameters::IsRequestAllowed(DicomRequestType type) const
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	315 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	316 switch (type)
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	317 {
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	318 case DicomRequestType_Echo:
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	319 return allowEcho_;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	320
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	321 case DicomRequestType_Find:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	322 return allowFind_;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	323
4888 8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	324 case DicomRequestType_FindWorklist:
8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	325 return allowFindWorklist_;
8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	326
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	327 case DicomRequestType_Get:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	328 return allowGet_;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	329
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	330 case DicomRequestType_Move:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	331 return allowMove_;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	332
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	333 case DicomRequestType_Store:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	334 return allowStore_;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	335
3602 085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	336 case DicomRequestType_NAction:
085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	337 return allowNAction_;
085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	338
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	339 case DicomRequestType_NEventReport:
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	340 return allowNEventReport_;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	341
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	342 default:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	343 throw OrthancException(ErrorCode_ParameterOutOfRange);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	344 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	345 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	346
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	347
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	348 void RemoteModalityParameters::SetRequestAllowed(DicomRequestType type,
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	349 bool allowed)
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	350 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	351 switch (type)
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	352 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	353 case DicomRequestType_Echo:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	354 allowEcho_ = allowed;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	355 break;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	356
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	357 case DicomRequestType_Find:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	358 allowFind_ = allowed;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	359 break;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	360
4888 8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	361 case DicomRequestType_FindWorklist:
8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	362 allowFindWorklist_ = allowed;
8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	363 break;
8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	364
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	365 case DicomRequestType_Get:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	366 allowGet_ = allowed;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	367 break;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	368
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	369 case DicomRequestType_Move:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	370 allowMove_ = allowed;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	371 break;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	372
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	373 case DicomRequestType_Store:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	374 allowStore_ = allowed;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	375 break;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	376
3602 085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	377 case DicomRequestType_NAction:
085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	378 allowNAction_ = allowed;
085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	379 break;
085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	380
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	381 case DicomRequestType_NEventReport:
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	382 allowNEventReport_ = allowed;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	383 break;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	384
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	385 default:
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	386 throw OrthancException(ErrorCode_ParameterOutOfRange);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	387 }
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	388 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	389
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	390
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	391 bool RemoteModalityParameters::IsAdvancedFormatNeeded() const
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	392 {
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	393 return (!allowEcho_ \|\|
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	394 !allowStore_ \|\|
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	395 !allowFind_ \|\|
4888 8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	396 !allowFindWorklist_ \|\|
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	397 !allowGet_ \|\|
3602 085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	398 !allowMove_ \|\|
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	399 !allowNAction_ \|\|
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	400 !allowNEventReport_ \|\|
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	401 !allowTranscoding_ \|\|
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	402 useDicomTls_ \|\|
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	403 HasLocalAet());
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	404 }
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	405
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	406
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	407 void RemoteModalityParameters::Serialize(Json::Value& target,
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	408 bool forceAdvancedFormat) const
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	409 {
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	410 if (forceAdvancedFormat \|\|
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	411 IsAdvancedFormatNeeded())
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	412 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	413 target = Json::objectValue;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	414 target[KEY_AET] = aet_;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	415 target[KEY_HOST] = host_;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	416 target[KEY_PORT] = port_;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	417 target[KEY_MANUFACTURER] = EnumerationToString(manufacturer_);
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	418 target[KEY_ALLOW_ECHO] = allowEcho_;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	419 target[KEY_ALLOW_STORE] = allowStore_;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	420 target[KEY_ALLOW_FIND] = allowFind_;
4888 8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	421 target[KEY_ALLOW_FIND_WORKLIST] = allowFindWorklist_;
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	422 target[KEY_ALLOW_GET] = allowGet_;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	423 target[KEY_ALLOW_MOVE] = allowMove_;
3602 085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	424 target[KEY_ALLOW_N_ACTION] = allowNAction_;
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	425 target[KEY_ALLOW_N_EVENT_REPORT] = allowNEventReport_;
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	426 target[KEY_ALLOW_TRANSCODING] = allowTranscoding_;
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	427 target[KEY_USE_DICOM_TLS] = useDicomTls_;
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	428 target[KEY_LOCAL_AET] = localAet_;
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	429 target[KEY_TIMEOUT] = timeout_;
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	430 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	431 else
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	432 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	433 target = Json::arrayValue;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	434 target.append(GetApplicationEntityTitle());
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	435 target.append(GetHost());
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	436 target.append(GetPortNumber());
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	437 target.append(EnumerationToString(GetManufacturer()));
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	438 }
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	439 }
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	440
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	441
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	442 void RemoteModalityParameters::Unserialize(const Json::Value& serialized)
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	443 {
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	444 Clear();
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	445
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	446 switch (serialized.type())
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	447 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	448 case Json::objectValue:
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	449 UnserializeObject(serialized);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	450 break;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	451
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	452 case Json::arrayValue:
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	453 UnserializeArray(serialized);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	454 break;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	455
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	456 default:
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	457 throw OrthancException(ErrorCode_BadFileFormat);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	458 }
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	459 }
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	460
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	461 bool RemoteModalityParameters::IsTranscodingAllowed() const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	462 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	463 return allowTranscoding_;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	464 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	465
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	466 void RemoteModalityParameters::SetTranscodingAllowed(bool allowed)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	467 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	468 allowTranscoding_ = allowed;
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	469 }
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	470
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	471 bool RemoteModalityParameters::IsDicomTlsEnabled() const
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	472 {
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	473 return useDicomTls_;
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	474 }
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	475
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	476 void RemoteModalityParameters::SetDicomTlsEnabled(bool enabled)
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	477 {
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	478 useDicomTls_ = enabled;
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	479 }
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	480
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	481 bool RemoteModalityParameters::HasLocalAet() const
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	482 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	483 return !localAet_.empty();
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	484 }
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	485
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	486 const std::string& RemoteModalityParameters::GetLocalAet() const
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	487 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	488 if (localAet_.empty())
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	489 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	490 throw OrthancException(ErrorCode_BadSequenceOfCalls, "You should have called HasLocalAet()");
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	491 }
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	492 else
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	493 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	494 return localAet_;
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	495 }
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	496 }
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	497
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	498 void RemoteModalityParameters::SetLocalAet(const std::string& aet)
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	499 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	500 if (aet.empty())
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	501 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	502 throw OrthancException(ErrorCode_ParameterOutOfRange);
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	503 }
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	504 else
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	505 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	506 localAet_ = aet;
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	507 }
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	508 }
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	509
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	510 void RemoteModalityParameters::SetTimeout(uint32_t seconds)
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	511 {
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	512 timeout_ = seconds;
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	513 }
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	514
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	515 uint32_t RemoteModalityParameters::GetTimeout() const
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	516 {
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	517 return timeout_;
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	518 }
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	519
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	520 bool RemoteModalityParameters::HasTimeout() const
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	521 {
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	522 return timeout_ != 0;
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	523 }
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.cpp @ 5752:717acb0ea546 find-refactoring tip