annotate Sources/IncomingInstanceFilter.cpp @ 100:e2b2e1d4e1bb

fixed compatibility with Orthanc SDK 1.8.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 23 Feb 2022 07:30:33 +0100
parents e37ed36541be
children eb6ac5a801d1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
97
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
1 /**
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
2 * Python plugin for Orthanc
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
3 * Copyright (C) 2020-2021 Osimis S.A., Belgium
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
4 *
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
5 * This program is free software: you can redistribute it and/or
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
6 * modify it under the terms of the GNU Affero General Public License
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
7 * as published by the Free Software Foundation, either version 3 of
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
8 * the License, or (at your option) any later version.
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
9 *
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
10 * This program is distributed in the hope that it will be useful, but
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
11 * WITHOUT ANY WARRANTY; without even the implied warranty of
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
13 * Affero General Public License for more details.
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
14 *
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
15 * You should have received a copy of the GNU Affero General Public License
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
17 **/
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
18
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
19
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
20 #include "IncomingInstanceFilter.h"
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
21
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
22 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
23 #include "Autogenerated/sdk.h"
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
24 #include "ICallbackRegistration.h"
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
25 #include "PythonString.h"
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
26
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
27
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
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: 97
diff changeset
29
97
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
30 static PyObject* incomingCStoreInstanceFilter_ = NULL;
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
31
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
32
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
33 static int32_t IncomingCStoreInstanceFilter(const OrthancPluginDicomInstance *instance)
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
34 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
35 try
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
36 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
37 PythonLock lock;
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
38
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
39 /**
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
40 * Construct an instance object of the "orthanc.DicomInstance"
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
41 * class. This is done by calling the constructor function
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
42 * "sdk_OrthancPluginDicomInstance_Type".
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
43 **/
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
44 PythonObject args(lock, PyTuple_New(2));
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
45 PyTuple_SetItem(args.GetPyObject(), 0, PyLong_FromSsize_t((intptr_t) instance));
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
46 PyTuple_SetItem(args.GetPyObject(), 1, PyBool_FromLong(true /* borrowed, don't destruct */));
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
47 PyObject *pInst = PyObject_CallObject((PyObject*) GetOrthancPluginDicomInstanceType(), args.GetPyObject());
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
48
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
49 /**
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
50 * Construct the arguments tuple (instance)
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
51 **/
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
52 PythonObject args2(lock, PyTuple_New(1));
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
53 PyTuple_SetItem(args2.GetPyObject(), 0, pInst);
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
54
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
55 PythonObject result(lock, PyObject_CallObject(incomingCStoreInstanceFilter_, args2.GetPyObject()));
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
56
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
57 std::string traceback;
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
58 if (lock.HasErrorOccurred(traceback))
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
59 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
60 OrthancPlugins::LogError("Error in the Python incoming-cstore-instance callback, "
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
61 "traceback:\n" + traceback);
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
62 return -1;
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
63 }
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
64 else
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
65 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
66 if (PyLong_Check(result.GetPyObject()))
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
67 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
68 return static_cast<int32_t>(PyLong_AsLong(result.GetPyObject()));
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
69 }
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
70 else
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
71 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
72 OrthancPlugins::LogError("The Python incoming-cstore-instance filter has not returned an integer");
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
73 return -1;
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
74 }
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
75 }
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
76 }
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
77 catch (OrthancPlugins::PluginException& e)
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
78 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
79 return e.GetErrorCode();
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
80 }
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
81 }
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
82
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
83
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
84 PyObject* RegisterIncomingCStoreInstanceFilter(PyObject* module, PyObject* args)
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
85 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
86 // The GIL is locked at this point (no need to create "PythonLock")
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
87
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
88 class Registration : public ICallbackRegistration
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
89 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
90 public:
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
91 virtual void Register() ORTHANC_OVERRIDE
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
92 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
93 OrthancPluginRegisterIncomingCStoreInstanceFilter(
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
94 OrthancPlugins::GetGlobalContext(), IncomingCStoreInstanceFilter);
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
95 }
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
96 };
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
97
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
98 Registration registration;
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
99 return ICallbackRegistration::Apply(
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
100 registration, args, incomingCStoreInstanceFilter_, "Python incoming CStore instance filter");
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
101 }
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
102
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
103
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
104 void FinalizeIncomingCStoreInstanceFilter()
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
105 {
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
106 ICallbackRegistration::Unregister(incomingCStoreInstanceFilter_);
e37ed36541be added missing files
Alain Mazy <am@osimis.io>
parents:
diff changeset
107 }
100
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
108
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
109 #else
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
110
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
111 #warning OrthancPluginRegisterIncomingCStoreInstanceFilter() is not supported
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
112
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
113 PyObject* RegisterIncomingCStoreInstanceFilter(PyObject* module, PyObject* args)
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
114 {
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
115 OrthancPlugins::LogError("The version of your Orthanc SDK doesn't provide OrthancPluginRegisterIncomingCStoreInstanceFilter()");
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
116 Py_INCREF(Py_None);
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
117 return Py_None;
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
118 }
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
119
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
120 void FinalizeIncomingCStoreInstanceFilter()
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
121 {
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
122 }
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
123
e2b2e1d4e1bb fixed compatibility with Orthanc SDK 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
124 #endif