Mercurial > hg > orthanc-python

annotate Sources/ReceivedInstanceCallback.cpp @ 122:45722358d459 fix-leak

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added PythonBytes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 30 Aug 2023 08:14:02 +0200
parents d2259c4cd677
children 65ec5597ec70
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
1 /**
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
2 * Python plugin for Orthanc
101
eb6ac5a801d1 update to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
3 * Copyright (C) 2020-2022 Osimis S.A., Belgium
eb6ac5a801d1 update to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
4 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
5 *
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
7 * modify it under the terms of the GNU Affero General Public License
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
8 * as published by the Free Software Foundation, either version 3 of
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
9 * the License, or (at your option) any later version.
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
10 *
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
11 * This program is distributed in the hope that it will be useful, but
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
12 * WITHOUT ANY WARRANTY; without even the implied warranty of
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
14 * Affero General Public License for more details.
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
15 *
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
16 * You should have received a copy of the GNU Affero General Public License
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
18 **/
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
19
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
20
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
21 #include "ReceivedInstanceCallback.h"
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
22
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
23 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
24 #include "ICallbackRegistration.h"
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
25 #include "PythonString.h"
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
26
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
27
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
28 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 10, 0)
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
29
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
30 #include <Compatibility.h> // For std::unique_ptr<>
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
31
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
32 static PyObject* receivedInstanceCallback_ = NULL;
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
33
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
34
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
35 static OrthancPluginReceivedInstanceAction ReceivedInstanceCallback(
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
36 OrthancPluginMemoryBuffer64* modifiedDicomBuffer /* out */,
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
37 const void* receivedDicomBuffer,
103
d2259c4cd677 added origin in ReceivedInstanceCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 102
diff changeset
38 uint64_t receivedDicomBufferSize,
d2259c4cd677 added origin in ReceivedInstanceCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 102
diff changeset
39 OrthancPluginInstanceOrigin origin)
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
40 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
41 try
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
42 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
43 PythonLock lock;
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
44
103
d2259c4cd677 added origin in ReceivedInstanceCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 102
diff changeset
45 PythonObject args(lock, PyTuple_New(2));
d2259c4cd677 added origin in ReceivedInstanceCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 102
diff changeset
46
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
47 PyTuple_SetItem(args.GetPyObject(), 0, PyBytes_FromStringAndSize(reinterpret_cast<const char*>(receivedDicomBuffer), receivedDicomBufferSize));
103
d2259c4cd677 added origin in ReceivedInstanceCallback
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 102
diff changeset
48 PyTuple_SetItem(args.GetPyObject(), 1, PyLong_FromLong(origin));
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
49
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
50 PythonObject result(lock, PyObject_CallObject(receivedInstanceCallback_, args.GetPyObject()));
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
51
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
52 std::string traceback;
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
53 if (lock.HasErrorOccurred(traceback))
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
54 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
55 OrthancPlugins::LogError("Error in the Python received instance callback, traceback:\n" + traceback);
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
56 return OrthancPluginReceivedInstanceAction_KeepAsIs;
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
57 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
58 else if (!PyTuple_Check(result.GetPyObject()) || PyTuple_Size(result.GetPyObject()) != 2)
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
59 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
60 OrthancPlugins::LogError("The Python received instance callback has not returned a tuple as expected");
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
61 return OrthancPluginReceivedInstanceAction_KeepAsIs;
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
62 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
63 else
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
64 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
65 PyObject* returnCode = PyTuple_GET_ITEM(result.GetPyObject(), 0);
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
66 PyObject* modifiedDicom = PyTuple_GET_ITEM(result.GetPyObject(), 1);
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
67
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
68 if (!PyLong_Check(returnCode))
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
69 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
70 OrthancPlugins::LogError("The Python received instance callback has not returned an int as the first element of the return tuple");
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
71 return OrthancPluginReceivedInstanceAction_KeepAsIs;
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
72 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
73
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
74 OrthancPluginReceivedInstanceAction resultCode = static_cast<OrthancPluginReceivedInstanceAction>(PyLong_AsLong(returnCode));
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
75
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
76 if (resultCode == OrthancPluginReceivedInstanceAction_KeepAsIs ||
102
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
77 resultCode == OrthancPluginReceivedInstanceAction_Discard)
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
78 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
79 return resultCode;
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
80 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
81 else
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
82 {
102
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
83 char* pythonBuffer = NULL;
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
84 Py_ssize_t pythonSize = 0;
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
85 if (PyBytes_AsStringAndSize(modifiedDicom, &pythonBuffer, &pythonSize) == 1)
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
86 {
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
87 OrthancPlugins::LogError("Cannot access the byte buffer returned by the Python received instance callback");
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
88 return OrthancPluginReceivedInstanceAction_KeepAsIs;
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
89 }
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
90 else
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
91 {
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
92 OrthancPluginCreateMemoryBuffer64(OrthancPlugins::GetGlobalContext(), modifiedDicomBuffer, pythonSize);
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
93
102
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
94 if (pythonSize != 0)
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
95 {
102
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
96 if (modifiedDicomBuffer->data == NULL)
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
97 {
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
98 OrthancPlugins::LogError("Cannot allocate memory in the Python received instance callback");
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
99 return OrthancPluginReceivedInstanceAction_KeepAsIs;
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
100 }
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
101 else
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
102 {
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
103 memcpy(modifiedDicomBuffer->data, pythonBuffer, pythonSize);
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
104 }
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
105 }
102
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
106
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
107 return OrthancPluginReceivedInstanceAction_Modify;
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
108 }
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
109 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
110 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
111 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
112 catch (OrthancPlugins::PluginException& e)
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
113 {
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
114 OrthancPlugins::LogError("Error in the Python received instance callback: " +
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
115 std::string(e.What(OrthancPlugins::GetGlobalContext())));
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
116 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
117
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
118 return OrthancPluginReceivedInstanceAction_KeepAsIs;
99
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
119 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
120
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
121
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
122 PyObject* RegisterReceivedInstanceCallback(PyObject* module, PyObject* args)
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
123 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
124 // The GIL is locked at this point (no need to create "PythonLock")
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
125
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
126 class Registration : public ICallbackRegistration
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
127 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
128 public:
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
129 virtual void Register() ORTHANC_OVERRIDE
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
130 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
131 OrthancPluginRegisterReceivedInstanceCallback(
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
132 OrthancPlugins::GetGlobalContext(), ReceivedInstanceCallback);
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
133 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
134 };
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
135
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
136 Registration registration;
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
137 return ICallbackRegistration::Apply(
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
138 registration, args, receivedInstanceCallback_, "Python received instance callback");
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
139 }
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
140
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
141
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
142 void FinalizeReceivedInstanceCallback()
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
143 {
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
144 ICallbackRegistration::Unregister(receivedInstanceCallback_);
465bf098554b new callback: orthanc.RegisterReceivedInstanceCallback()
Alain Mazy <am@osimis.io>
parents:
diff changeset
145 }
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
146
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
147 #else
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
148
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
149 #warning OrthancPluginRegisterReceivedInstanceCallback() is not supported
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
150
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
151 PyObject* RegisterReceivedInstanceCallback(PyObject* module, PyObject* args)
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
152 {
102
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
153 PyErr_SetString(PyExc_RuntimeError, "The version of your Orthanc SDK doesn't provide OrthancPluginRegisterReceivedInstanceCallback()");
ed994991a20b improved error handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
154 return NULL;
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
155 }
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
156
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
157 void FinalizeReceivedInstanceCallback()
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
158 {
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
159 }
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
160
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
161 #endif