orthanc: Plugins/Samples/Common/OrthancPluginCppWrapper.cpp annotate

annotate Plugins/Samples/Common/OrthancPluginCppWrapper.cpp @ 2533:e7f86a9f0f79

improvements

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 17 Apr 2018 11:27:51 +0200
parents	878b59270859
children	57e2d65d37ce

rev	line source
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
2447 878b59270859 upgrade to year 2018 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	5 * Copyright (C) 2017-2018 Osimis S.A., Belgium
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "OrthancPluginCppWrapper.h"
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include <json/reader.h>
2058 43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	37 #include <json/writer.h>
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40 namespace OrthancPlugins
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 {
2062 40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	42 void MemoryBuffer::Check(OrthancPluginErrorCode code)
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	43 {
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	44 if (code != OrthancPluginErrorCode_Success)
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	45 {
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	46 // Prevent using garbage information
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	47 buffer_.data = NULL;
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	48 buffer_.size = 0;
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	49 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code);
2062 40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	50 }
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	51 }
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	52
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	53
2264 8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	54 bool MemoryBuffer::CheckHttp(OrthancPluginErrorCode code)
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	55 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	56 if (code != OrthancPluginErrorCode_Success)
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	57 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	58 // Prevent using garbage information
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	59 buffer_.data = NULL;
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	60 buffer_.size = 0;
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	61 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	62
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	63 if (code == OrthancPluginErrorCode_Success)
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	64 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	65 return true;
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	66 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	67 else if (code == OrthancPluginErrorCode_UnknownResource \|\|
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	68 code == OrthancPluginErrorCode_InexistentItem)
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	69 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	70 return false;
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	71 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	72 else
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	73 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	74 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code);
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	75 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	76 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	77
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	78
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 MemoryBuffer::MemoryBuffer(OrthancPluginContext* context) :
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 context_(context)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 buffer_.data = NULL;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 buffer_.size = 0;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 void MemoryBuffer::Clear()
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 if (buffer_.data != NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 OrthancPluginFreeMemoryBuffer(context_, &buffer_);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 buffer_.data = NULL;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 buffer_.size = 0;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 void MemoryBuffer::Assign(OrthancPluginMemoryBuffer& other)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 Clear();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102 buffer_.data = other.data;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103 buffer_.size = other.size;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105 other.data = NULL;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 other.size = 0;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 void MemoryBuffer::ToString(std::string& target) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112 if (buffer_.size == 0)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114 target.clear();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	115 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118 target.assign(reinterpret_cast<const char*>(buffer_.data), buffer_.size);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 void MemoryBuffer::ToJson(Json::Value& target) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125 if (buffer_.data == NULL \|\|
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126 buffer_.size == 0)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	128 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 const char* tmp = reinterpret_cast<const char*>(buffer_.data);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133 Json::Reader reader;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 if (!reader.parse(tmp, tmp + buffer_.size, target))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 OrthancPluginLogError(context_, "Cannot convert some memory buffer to JSON");
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	137 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 bool MemoryBuffer::RestApiGet(const std::string& uri,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 bool applyPlugins)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 Clear();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 if (applyPlugins)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 {
2264 8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	149 return CheckHttp(OrthancPluginRestApiGetAfterPlugins(context_, &buffer_, uri.c_str()));
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 {
2264 8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	153 return CheckHttp(OrthancPluginRestApiGet(context_, &buffer_, uri.c_str()));
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 bool MemoryBuffer::RestApiPost(const std::string& uri,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 const char* body,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 size_t bodySize,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161 bool applyPlugins)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 Clear();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 if (applyPlugins)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 {
2264 8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	167 return CheckHttp(OrthancPluginRestApiPostAfterPlugins(context_, &buffer_, uri.c_str(), body, bodySize));
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170 {
2264 8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	171 return CheckHttp(OrthancPluginRestApiPost(context_, &buffer_, uri.c_str(), body, bodySize));
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 bool MemoryBuffer::RestApiPut(const std::string& uri,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 const char* body,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 size_t bodySize,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179 bool applyPlugins)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181 Clear();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183 if (applyPlugins)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184 {
2264 8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	185 return CheckHttp(OrthancPluginRestApiPutAfterPlugins(context_, &buffer_, uri.c_str(), body, bodySize));
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	187 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 {
2264 8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	189 return CheckHttp(OrthancPluginRestApiPut(context_, &buffer_, uri.c_str(), body, bodySize));
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	190 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193
2058 43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	194 bool MemoryBuffer::RestApiPost(const std::string& uri,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	195 const Json::Value& body,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	196 bool applyPlugins)
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	197 {
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	198 Json::FastWriter writer;
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	199 return RestApiPost(uri, writer.write(body), applyPlugins);
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	200 }
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	201
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	202
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	203 bool MemoryBuffer::RestApiPut(const std::string& uri,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	204 const Json::Value& body,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	205 bool applyPlugins)
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	206 {
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	207 Json::FastWriter writer;
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	208 return RestApiPut(uri, writer.write(body), applyPlugins);
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	209 }
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	210
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	211
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	212 void MemoryBuffer::CreateDicom(const Json::Value& tags,
8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	213 OrthancPluginCreateDicomFlags flags)
8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	214 {
8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	215 Clear();
8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	216
8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	217 Json::FastWriter writer;
8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	218 std::string s = writer.write(tags);
8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	219
2062 40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	220 Check(OrthancPluginCreateDicom(context_, &buffer_, s.c_str(), NULL, flags));
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	221 }
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	222
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	223
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	224 void MemoryBuffer::ReadFile(const std::string& path)
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	225 {
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	226 Clear();
40ffd0e8676a generation of etag in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	227 Check(OrthancPluginReadFile(context_, &buffer_, path.c_str()));
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	228 }
8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	229
8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2058 diff changeset	230
2205 395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	231 void MemoryBuffer::GetDicomQuery(const OrthancPluginWorklistQuery* query)
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	232 {
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	233 Clear();
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	234 Check(OrthancPluginWorklistGetDicomQuery(context_, &buffer_, query));
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	235 }
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	236
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	237
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	238 void OrthancString::Assign(char* str)
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 {
2205 395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	240 if (str == NULL)
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	241 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	242 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
2205 395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	243 }
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	244 else
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	245 {
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	246 Clear();
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	247 str_ = str;
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	248 }
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 void OrthancString::Clear()
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 if (str_ != NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 OrthancPluginFreeString(context_, str_);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 str_ = NULL;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262 void OrthancString::ToString(std::string& target) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 if (str_ == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 target.clear();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 target.assign(str_);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 void OrthancString::ToJson(Json::Value& target) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 if (str_ == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 OrthancPluginLogError(context_, "Cannot convert an empty memory buffer to JSON");
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	280 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 Json::Reader reader;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284 if (!reader.parse(str_, target))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286 OrthancPluginLogError(context_, "Cannot convert some memory buffer to JSON");
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	287 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 }
2205 395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	290
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	291
2206 27106f7e3759 more refactoring of the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2205 diff changeset	292 void MemoryBuffer::DicomToJson(Json::Value& target,
27106f7e3759 more refactoring of the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2205 diff changeset	293 OrthancPluginDicomToJsonFormat format,
27106f7e3759 more refactoring of the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2205 diff changeset	294 OrthancPluginDicomToJsonFlags flags,
27106f7e3759 more refactoring of the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2205 diff changeset	295 uint32_t maxStringLength)
2205 395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	296 {
2206 27106f7e3759 more refactoring of the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2205 diff changeset	297 OrthancString str(context_);
27106f7e3759 more refactoring of the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2205 diff changeset	298 str.Assign(OrthancPluginDicomBufferToJson(context_, GetData(), GetSize(), format, flags, maxStringLength));
27106f7e3759 more refactoring of the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2205 diff changeset	299 str.ToJson(target);
2205 395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	300 }
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	301
2264 8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	302
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	303 bool MemoryBuffer::HttpGet(const std::string& url,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	304 const std::string& username,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	305 const std::string& password)
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	306 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	307 Clear();
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	308 return CheckHttp(OrthancPluginHttpGet(context_, &buffer_, url.c_str(),
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	309 username.empty() ? NULL : username.c_str(),
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	310 password.empty() ? NULL : password.c_str()));
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	311 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	312
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	313
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	314 bool MemoryBuffer::HttpPost(const std::string& url,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	315 const std::string& body,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	316 const std::string& username,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	317 const std::string& password)
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	318 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	319 Clear();
2267 f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	320 return CheckHttp(OrthancPluginHttpPost(context_, &buffer_, url.c_str(),
f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	321 body.c_str(), body.size(),
f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	322 username.empty() ? NULL : username.c_str(),
f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	323 password.empty() ? NULL : password.c_str()));
2264 8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	324 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	325
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	326
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	327 bool MemoryBuffer::HttpPut(const std::string& url,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	328 const std::string& body,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	329 const std::string& username,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	330 const std::string& password)
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	331 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	332 Clear();
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	333 return CheckHttp(OrthancPluginHttpPut(context_, &buffer_, url.c_str(),
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	334 body.empty() ? NULL : body.c_str(),
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	335 body.size(),
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	336 username.empty() ? NULL : username.c_str(),
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	337 password.empty() ? NULL : password.c_str()));
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	338 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	339
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	340
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	341 bool HttpDelete(OrthancPluginContext* context_,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	342 const std::string& url,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	343 const std::string& username,
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	344 const std::string& password)
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	345 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	346 OrthancPluginErrorCode error = OrthancPluginHttpDelete
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	347 (context_, url.c_str(),
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	348 username.empty() ? NULL : username.c_str(),
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	349 password.empty() ? NULL : password.c_str());
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	350
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	351 if (error == OrthancPluginErrorCode_Success)
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	352 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	353 return true;
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	354 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	355 else if (error == OrthancPluginErrorCode_UnknownResource \|\|
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	356 error == OrthancPluginErrorCode_InexistentItem)
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	357 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	358 return false;
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	359 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	360 else
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	361 {
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	362 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error);
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	363 }
8e5e0de75839 primitives for HTTP client in plugin C++ wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2263 diff changeset	364 }
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 OrthancConfiguration::OrthancConfiguration(OrthancPluginContext* context) :
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 context_(context)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369 {
2205 395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	370 OrthancString str(context);
395522e46b2b refactoring of the worklist sample using OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2177 diff changeset	371 str.Assign(OrthancPluginGetConfiguration(context));
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 if (str.GetContent() == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375 OrthancPluginLogError(context, "Cannot access the Orthanc configuration");
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	376 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379 str.ToJson(configuration_);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 if (configuration_.type() != Json::objectValue)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 OrthancPluginLogError(context, "Unable to read the Orthanc configuration");
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	384 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389 OrthancPluginContext* OrthancConfiguration::GetContext() const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 if (context_ == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	393 ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 return context_;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402 std::string OrthancConfiguration::GetPath(const std::string& key) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 if (path_.empty())
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406 return key;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 return path_ + "." + key;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414
2167 aa2915963531 "Folders" sub-configuration in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2112 diff changeset	415 bool OrthancConfiguration::IsSection(const std::string& key) const
aa2915963531 "Folders" sub-configuration in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2112 diff changeset	416 {
aa2915963531 "Folders" sub-configuration in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2112 diff changeset	417 assert(configuration_.type() == Json::objectValue);
aa2915963531 "Folders" sub-configuration in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2112 diff changeset	418
aa2915963531 "Folders" sub-configuration in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2112 diff changeset	419 return (configuration_.isMember(key) &&
aa2915963531 "Folders" sub-configuration in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2112 diff changeset	420 configuration_[key].type() == Json::objectValue);
aa2915963531 "Folders" sub-configuration in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2112 diff changeset	421 }
aa2915963531 "Folders" sub-configuration in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2112 diff changeset	422
aa2915963531 "Folders" sub-configuration in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 2112 diff changeset	423
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	424 void OrthancConfiguration::GetSection(OrthancConfiguration& target,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	425 const std::string& key) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427 assert(configuration_.type() == Json::objectValue);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	428
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429 target.context_ = context_;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	430 target.path_ = GetPath(key);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 if (!configuration_.isMember(key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 target.configuration_ = Json::objectValue;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438 if (configuration_[key].type() != Json::objectValue)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 if (context_ != NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442 std::string s = "The configuration section \"" + target.path_ + "\" is not an associative array as expected";
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443 OrthancPluginLogError(context_, s.c_str());
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	446 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 target.configuration_ = configuration_[key];
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454 bool OrthancConfiguration::LookupStringValue(std::string& target,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	455 const std::string& key) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 assert(configuration_.type() == Json::objectValue);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459 if (!configuration_.isMember(key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	460 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461 return false;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 if (configuration_[key].type() != Json::stringValue)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 if (context_ != NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468 std::string s = "The configuration option \"" + GetPath(key) + "\" is not a string as expected";
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469 OrthancPluginLogError(context_, s.c_str());
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	471
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	472 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	473 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	474
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 target = configuration_[key].asString();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	476 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 bool OrthancConfiguration::LookupIntegerValue(int& target,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 const std::string& key) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 assert(configuration_.type() == Json::objectValue);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	485 if (!configuration_.isMember(key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	486 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	487 return false;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490 switch (configuration_[key].type())
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	491 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	492 case Json::intValue:
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	493 target = configuration_[key].asInt();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	494 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496 case Json::uintValue:
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 target = configuration_[key].asUInt();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 default:
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 if (context_ != NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	503 std::string s = "The configuration option \"" + GetPath(key) + "\" is not an integer as expected";
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504 OrthancPluginLogError(context_, s.c_str());
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	507 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	509 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	510
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	511
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	512 bool OrthancConfiguration::LookupUnsignedIntegerValue(unsigned int& target,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513 const std::string& key) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	515 int tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516 if (!LookupIntegerValue(tmp, key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	517 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518 return false;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	521 if (tmp < 0)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	522 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	523 if (context_ != NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	525 std::string s = "The configuration option \"" + GetPath(key) + "\" is not a positive integer as expected";
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	526 OrthancPluginLogError(context_, s.c_str());
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	527 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	528
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	529 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	530 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	531 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	532 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	533 target = static_cast<unsigned int>(tmp);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	535 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	537
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	538
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	539 bool OrthancConfiguration::LookupBooleanValue(bool& target,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540 const std::string& key) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542 assert(configuration_.type() == Json::objectValue);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544 if (!configuration_.isMember(key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	545 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546 return false;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	548
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	549 if (configuration_[key].type() != Json::booleanValue)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	550 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551 if (context_ != NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	553 std::string s = "The configuration option \"" + GetPath(key) + "\" is not a Boolean as expected";
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554 OrthancPluginLogError(context_, s.c_str());
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	557 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 target = configuration_[key].asBool();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	563
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	564
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565 bool OrthancConfiguration::LookupFloatValue(float& target,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566 const std::string& key) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	567 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	568 assert(configuration_.type() == Json::objectValue);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	569
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	570 if (!configuration_.isMember(key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	571 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	572 return false;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575 switch (configuration_[key].type())
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	577 case Json::realValue:
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	578 target = configuration_[key].asFloat();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	580
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581 case Json::intValue:
2112 82461d1e8e17 removal warning with MSVC Sebastien Jodogne <s.jodogne@gmail.com> parents: 2109 diff changeset	582 target = static_cast<float>(configuration_[key].asInt());
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	584
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585 case Json::uintValue:
2112 82461d1e8e17 removal warning with MSVC Sebastien Jodogne <s.jodogne@gmail.com> parents: 2109 diff changeset	586 target = static_cast<float>(configuration_[key].asUInt());
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589 default:
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590 if (context_ != NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	592 std::string s = "The configuration option \"" + GetPath(key) + "\" is not an integer as expected";
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 OrthancPluginLogError(context_, s.c_str());
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	596 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	598 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	600
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	601 bool OrthancConfiguration::LookupListOfStrings(std::list<std::string>& target,
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	602 const std::string& key,
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	603 bool allowSingleString) const
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	604 {
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	605 assert(configuration_.type() == Json::objectValue);
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	606
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	607 target.clear();
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	608
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	609 if (!configuration_.isMember(key))
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	610 {
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	611 return false;
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	612 }
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	613
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	614 switch (configuration_[key].type())
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	615 {
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	616 case Json::arrayValue:
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	617 {
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	618 bool ok = true;
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	619
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	620 for (Json::Value::ArrayIndex i = 0; ok && i < configuration_[key].size(); i++)
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	621 {
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	622 if (configuration_[key][i].type() == Json::stringValue)
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	623 {
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	624 target.push_back(configuration_[key][i].asString());
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	625 }
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	626 else
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	627 {
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	628 ok = false;
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	629 }
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	630 }
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	631
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	632 if (ok)
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	633 {
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	634 return true;
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	635 }
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	636
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	637 break;
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	638 }
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	639
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	640 case Json::stringValue:
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	641 if (allowSingleString)
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	642 {
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	643 target.push_back(configuration_[key].asString());
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	644 return true;
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	645 }
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	646
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	647 break;
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	648
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	649 default:
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	650 break;
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	651 }
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	652
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	653 if (context_ != NULL)
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	654 {
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	655 std::string s = ("The configuration option \"" + GetPath(key) +
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	656 "\" is not a list of strings as expected");
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	657 OrthancPluginLogError(context_, s.c_str());
e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	658 }
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	659
2265 e46b0ee6c19d allowSingleString in OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2264 diff changeset	660 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
2263 b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	661 }
b9775db0fd9b OrthancPlugins::OrthancConfiguration::LookupListOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	662
2266 a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	663
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	664 bool OrthancConfiguration::LookupSetOfStrings(std::set<std::string>& target,
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	665 const std::string& key,
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	666 bool allowSingleString) const
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	667 {
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	668 std::list<std::string> lst;
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	669
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	670 if (LookupListOfStrings(lst, key, allowSingleString))
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	671 {
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	672 target.clear();
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	673
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	674 for (std::list<std::string>::const_iterator
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	675 it = lst.begin(); it != lst.end(); ++it)
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	676 {
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	677 target.insert(*it);
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	678 }
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	679
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	680 return true;
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	681 }
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	682 else
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	683 {
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	684 return false;
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	685 }
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	686 }
a344e47e9c9a OrthancConfiguration::LookupSetOfStrings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2265 diff changeset	687
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	689 std::string OrthancConfiguration::GetStringValue(const std::string& key,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	690 const std::string& defaultValue) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 std::string tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	693 if (LookupStringValue(tmp, key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	694 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	695 return tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	696 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	697 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	698 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	699 return defaultValue;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	700 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	701 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	702
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704 int OrthancConfiguration::GetIntegerValue(const std::string& key,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	705 int defaultValue) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	706 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	707 int tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	708 if (LookupIntegerValue(tmp, key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	710 return tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	712 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	713 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	714 return defaultValue;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	716 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	717
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	718
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	719 unsigned int OrthancConfiguration::GetUnsignedIntegerValue(const std::string& key,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	720 unsigned int defaultValue) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	721 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	722 unsigned int tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	723 if (LookupUnsignedIntegerValue(tmp, key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	724 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	725 return tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	726 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	728 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	729 return defaultValue;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	730 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	731 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	732
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	733
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734 bool OrthancConfiguration::GetBooleanValue(const std::string& key,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	735 bool defaultValue) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	737 bool tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738 if (LookupBooleanValue(tmp, key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 return tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	741 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	743 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	744 return defaultValue;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	745 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	746 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	747
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	749 float OrthancConfiguration::GetFloatValue(const std::string& key,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	750 float defaultValue) const
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	751 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	752 float tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	753 if (LookupFloatValue(tmp, key))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	754 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	755 return tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	756 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	757 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	758 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	759 return defaultValue;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	760 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	761 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	762
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	763
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	764 void OrthancImage::Clear()
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	765 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	766 if (image_ != NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	767 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	768 OrthancPluginFreeImage(context_, image_);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	769 image_ = NULL;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	770 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	771 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	772
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	773
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	774 void OrthancImage::CheckImageAvailable()
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	775 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	776 if (image_ == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	777 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	778 OrthancPluginLogError(context_, "Trying to access a NULL image");
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	779 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	780 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	781 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	782
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	783
2048 154f3e73ad3a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2047 diff changeset	784 OrthancImage::OrthancImage(OrthancPluginContext* context) :
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	785 context_(context),
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	786 image_(NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	787 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	788 if (context == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	789 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	790 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	791 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	792 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	793
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	794
2048 154f3e73ad3a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2047 diff changeset	795 OrthancImage::OrthancImage(OrthancPluginContext* context,
154f3e73ad3a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2047 diff changeset	796 OrthancPluginImage* image) :
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	797 context_(context),
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	798 image_(image)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	799 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	800 if (context == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	801 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	802 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	803 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	805
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	806
2048 154f3e73ad3a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2047 diff changeset	807 OrthancImage::OrthancImage(OrthancPluginContext* context,
154f3e73ad3a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2047 diff changeset	808 OrthancPluginPixelFormat format,
154f3e73ad3a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2047 diff changeset	809 uint32_t width,
154f3e73ad3a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2047 diff changeset	810 uint32_t height) :
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	811 context_(context)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	812 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	813 if (context == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	814 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	815 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	816 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	818 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	819 image_ = OrthancPluginCreateImage(context, format, width, height);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	820 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	821 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	822
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	823
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	824 void OrthancImage::UncompressPngImage(const void* data,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	825 size_t size)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	826 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	827 Clear();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828 image_ = OrthancPluginUncompressImage(context_, data, size, OrthancPluginImageFormat_Png);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829 if (image_ == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	831 OrthancPluginLogError(context_, "Cannot uncompress a PNG image");
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	832 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	834 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	836
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	837 void OrthancImage::UncompressJpegImage(const void* data,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	838 size_t size)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	839 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	840 Clear();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	841 image_ = OrthancPluginUncompressImage(context_, data, size, OrthancPluginImageFormat_Jpeg);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842 if (image_ == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	843 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	844 OrthancPluginLogError(context_, "Cannot uncompress a JPEG image");
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	845 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	846 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	847 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	848
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	849
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	850 void OrthancImage::DecodeDicomImage(const void* data,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	851 size_t size,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	852 unsigned int frame)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	853 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	854 Clear();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	855 image_ = OrthancPluginDecodeDicomImage(context_, data, size, frame);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	856 if (image_ == NULL)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	858 OrthancPluginLogError(context_, "Cannot uncompress a DICOM image");
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	859 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	860 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	864 OrthancPluginPixelFormat OrthancImage::GetPixelFormat()
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	865 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866 CheckImageAvailable();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 return OrthancPluginGetImagePixelFormat(context_, image_);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	868 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	870
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	871 unsigned int OrthancImage::GetWidth()
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	872 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873 CheckImageAvailable();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	874 return OrthancPluginGetImageWidth(context_, image_);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	875 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	878 unsigned int OrthancImage::GetHeight()
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	879 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	880 CheckImageAvailable();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	881 return OrthancPluginGetImageHeight(context_, image_);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	882 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	883
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	884
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	885 unsigned int OrthancImage::GetPitch()
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	886 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	887 CheckImageAvailable();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	888 return OrthancPluginGetImagePitch(context_, image_);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	889 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	890
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	891
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	892 const void* OrthancImage::GetBuffer()
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	893 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	894 CheckImageAvailable();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	895 return OrthancPluginGetImageBuffer(context_, image_);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	896 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	897
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	898
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	899 void OrthancImage::CompressPngImage(MemoryBuffer& target)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	900 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	901 CheckImageAvailable();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	902
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	903 OrthancPluginMemoryBuffer tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	904 OrthancPluginCompressPngImage(context_, &tmp, GetPixelFormat(),
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	905 GetWidth(), GetHeight(), GetPitch(), GetBuffer());
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	906
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	907 target.Assign(tmp);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	908 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	909
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	911 void OrthancImage::CompressJpegImage(MemoryBuffer& target,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	912 uint8_t quality)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	913 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	914 CheckImageAvailable();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	915
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	916 OrthancPluginMemoryBuffer tmp;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	917 OrthancPluginCompressJpegImage(context_, &tmp, GetPixelFormat(),
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	918 GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	919
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	920 target.Assign(tmp);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	921 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	922
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	923
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	924 void OrthancImage::AnswerPngImage(OrthancPluginRestOutput* output)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	925 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	926 CheckImageAvailable();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	927 OrthancPluginCompressAndAnswerPngImage(context_, output, GetPixelFormat(),
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	928 GetWidth(), GetHeight(), GetPitch(), GetBuffer());
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	929 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	930
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	931
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	932 void OrthancImage::AnswerJpegImage(OrthancPluginRestOutput* output,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	933 uint8_t quality)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	934 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	935 CheckImageAvailable();
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	936 OrthancPluginCompressAndAnswerJpegImage(context_, output, GetPixelFormat(),
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	937 GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	938 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	939
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940
2231 61e0564d03bb backwards compatibility within OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2215 diff changeset	941
61e0564d03bb backwards compatibility within OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2215 diff changeset	942 #if HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1
2212 c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	943 FindMatcher::FindMatcher(OrthancPluginContext* context,
2213 95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	944 const OrthancPluginWorklistQuery* worklist) :
2212 c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	945 context_(context),
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	946 matcher_(NULL),
2213 95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	947 worklist_(worklist)
2212 c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	948 {
2213 95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	949 if (worklist_ == NULL)
2212 c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	950 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	951 ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
2212 c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	952 }
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	953 }
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	954
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	955
2215 028214a95194 refactoring the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2213 diff changeset	956 void FindMatcher::SetupDicom(OrthancPluginContext* context,
028214a95194 refactoring the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2213 diff changeset	957 const void* query,
028214a95194 refactoring the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2213 diff changeset	958 uint32_t size)
2212 c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	959 {
2215 028214a95194 refactoring the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2213 diff changeset	960 context_ = context;
028214a95194 refactoring the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2213 diff changeset	961 worklist_ = NULL;
028214a95194 refactoring the worklist sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 2213 diff changeset	962
2212 c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	963 matcher_ = OrthancPluginCreateFindMatcher(context_, query, size);
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	964 if (matcher_ == NULL)
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	965 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	966 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
2212 c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	967 }
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	968 }
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	969
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	970
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	971 FindMatcher::~FindMatcher()
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	972 {
2213 95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	973 // The "worklist_" field
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	974
2212 c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	975 if (matcher_ != NULL)
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	976 {
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	977 OrthancPluginFreeFindMatcher(context_, matcher_);
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	978 }
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	979 }
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	980
c02f6ec404d8 OrthancPlugins::FindMatcher Sebastien Jodogne <s.jodogne@gmail.com> parents: 2206 diff changeset	981
2213 95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	982
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	983 bool FindMatcher::IsMatch(const void* dicom,
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	984 uint32_t size) const
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	985 {
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	986 int32_t result;
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	987
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	988 if (matcher_ != NULL)
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	989 {
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	990 result = OrthancPluginFindMatcherIsMatch(context_, matcher_, dicom, size);
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	991 }
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	992 else if (worklist_ != NULL)
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	993 {
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	994 result = OrthancPluginWorklistIsMatch(context_, worklist_, dicom, size);
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	995 }
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	996 else
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	997 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	998 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
2213 95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	999 }
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1000
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1001 if (result == 0)
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1002 {
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1003 return false;
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1004 }
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1005 else if (result == 1)
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1006 {
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1007 return true;
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1008 }
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1009 else
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1010 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	1011 ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
2213 95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1012 }
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1013 }
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1014
2231 61e0564d03bb backwards compatibility within OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2215 diff changeset	1015 #endif /* HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1 */
2213 95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1016
95d1d758abb7 FindMatcher::IsMatch Sebastien Jodogne <s.jodogne@gmail.com> parents: 2212 diff changeset	1017
2058 43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1018 bool RestApiGet(Json::Value& result,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1019 OrthancPluginContext* context,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1020 const std::string& uri,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1021 bool applyPlugins)
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1022 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1023 MemoryBuffer answer(context);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1024 if (!answer.RestApiGet(uri, applyPlugins))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1025 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026 return false;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1028 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1029 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1030 answer.ToJson(result);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1033 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1034
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1035
2058 43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1036 bool RestApiPost(Json::Value& result,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1037 OrthancPluginContext* context,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1038 const std::string& uri,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1039 const char* body,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1040 size_t bodySize,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1041 bool applyPlugins)
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1042 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1043 MemoryBuffer answer(context);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1044 if (!answer.RestApiPost(uri, body, bodySize, applyPlugins))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1045 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1046 return false;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1047 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1048 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1049 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1050 answer.ToJson(result);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1051 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1052 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1053 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1054
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1055
2058 43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1056 bool RestApiPost(Json::Value& result,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1057 OrthancPluginContext* context,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1058 const std::string& uri,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1059 const Json::Value& body,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1060 bool applyPlugins)
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1061 {
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1062 Json::FastWriter writer;
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1063 return RestApiPost(result, context, uri, writer.write(body), applyPlugins);
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1064 }
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1065
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1066
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1067 bool RestApiPut(Json::Value& result,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1068 OrthancPluginContext* context,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1069 const std::string& uri,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1070 const char* body,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1071 size_t bodySize,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1072 bool applyPlugins)
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1073 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1074 MemoryBuffer answer(context);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1075 if (!answer.RestApiPut(uri, body, bodySize, applyPlugins))
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1076 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1077 return false;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1078 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1079 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1080 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1081 answer.ToJson(result);
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1082 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1083 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1084 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1085
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1086
2058 43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1087 bool RestApiPut(Json::Value& result,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1088 OrthancPluginContext* context,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1089 const std::string& uri,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1090 const Json::Value& body,
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1091 bool applyPlugins)
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1092 {
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1093 Json::FastWriter writer;
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1094 return RestApiPut(result, context, uri, writer.write(body), applyPlugins);
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1095 }
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1096
43cd2ab060c7 cont OrthancPluginCppWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2048 diff changeset	1097
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1098 bool RestApiDelete(OrthancPluginContext* context,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1099 const std::string& uri,
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1100 bool applyPlugins)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1101 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1102 OrthancPluginErrorCode error;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1103
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1104 if (applyPlugins)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1105 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1106 error = OrthancPluginRestApiDeleteAfterPlugins(context, uri.c_str());
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1107 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1108 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1109 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1110 error = OrthancPluginRestApiDelete(context, uri.c_str());
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1111 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1112
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1113 if (error == OrthancPluginErrorCode_Success)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1114 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1115 return true;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1116 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1117 else if (error == OrthancPluginErrorCode_UnknownResource \|\|
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1118 error == OrthancPluginErrorCode_InexistentItem)
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1119 {
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1120 return false;
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1121 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1122 else
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1123 {
2234 a78d15509a1c cleaner separation of PluginException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2231 diff changeset	1124 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error);
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1125 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1126 }
2109 d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1127
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1128
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2267 diff changeset	1129 void ReportMinimalOrthancVersion(OrthancPluginContext* context,
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2267 diff changeset	1130 unsigned int major,
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2267 diff changeset	1131 unsigned int minor,
ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2267 diff changeset	1132 unsigned int revision)
2109 d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1133 {
2267 f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	1134 std::string s = ("Your version of the Orthanc core (" +
f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	1135 std::string(context->orthancVersion) +
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2267 diff changeset	1136 ") is too old to run this plugin (version " +
2267 f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	1137 boost::lexical_cast<std::string>(major) + "." +
f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	1138 boost::lexical_cast<std::string>(minor) + "." +
f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	1139 boost::lexical_cast<std::string>(revision) +
f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	1140 " is required)");
f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	1141
f915aff7a866 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2266 diff changeset	1142 OrthancPluginLogError(context, s.c_str());
2109 d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1143 }
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1144
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1145
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1146 bool CheckMinimalOrthancVersion(OrthancPluginContext* context,
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1147 unsigned int major,
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1148 unsigned int minor,
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1149 unsigned int revision)
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1150 {
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1151 if (context == NULL)
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1152 {
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1153 OrthancPluginLogError(context, "Bad Orthanc context in the plugin");
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1154 return false;
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1155 }
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1156
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1157 if (!strcmp(context->orthancVersion, "mainline"))
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1158 {
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1159 // Assume compatibility with the mainline
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1160 return true;
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1161 }
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1162
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1163 // Parse the version of the Orthanc core
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1164 int aa, bb, cc;
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1165 if (
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1166 #ifdef _MSC_VER
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1167 sscanf_s
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1168 #else
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1169 sscanf
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1170 #endif
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1171 (context->orthancVersion, "%4d.%4d.%4d", &aa, &bb, &cc) != 3 \|\|
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1172 aa < 0 \|\|
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1173 bb < 0 \|\|
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1174 cc < 0)
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1175 {
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1176 throw false;
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1177 }
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1178
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1179 unsigned int a = static_cast<unsigned int>(aa);
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1180 unsigned int b = static_cast<unsigned int>(bb);
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1181 unsigned int c = static_cast<unsigned int>(cc);
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1182
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1183 // Check the major version number
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1184
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1185 if (a > major)
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1186 {
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1187 return true;
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1188 }
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1189
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1190 if (a < major)
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1191 {
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1192 return false;
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1193 }
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1194
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1195
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1196 // Check the minor version number
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1197 assert(a == major);
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1198
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1199 if (b > minor)
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1200 {
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1201 return true;
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1202 }
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1203
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1204 if (b < minor)
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1205 {
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1206 return false;
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1207 }
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1208
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1209 // Check the patch level version number
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1210 assert(a == major && b == minor);
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1211
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1212 if (c >= revision)
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1213 {
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1214 return true;
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1215 }
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1216 else
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1217 {
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1218 return false;
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1219 }
d5c29fd74ffa OrthancPlugins::CheckMinimalOrthancVersion Sebastien Jodogne <s.jodogne@gmail.com> parents: 2062 diff changeset	1220 }
2047 438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1221 }
438f86ee19fc toolbox shared by all plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1222

Mercurial > hg > orthanc

annotate Plugins/Samples/Common/OrthancPluginCppWrapper.cpp @ 2533:e7f86a9f0f79