Mercurial > hg > orthanc
annotate Plugins/Samples/ModalityWorklists/Plugin.cpp @ 2983:af068a6b476b
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 08 Dec 2018 11:54:14 +0100 |
parents | bb7a66efbeb1 |
children | 4e43e67f8ecf |
rev | line source |
---|---|
1802 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
1802 | 4 * Department, University Hospital of Liege, Belgium |
2447
878b59270859
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2289
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
1802 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU General Public License as | |
9 * published by the Free Software Foundation, either version 3 of the | |
10 * License, or (at your option) any later version. | |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
11 * |
1802 | 12 * This program is distributed in the hope that it will be useful, but |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU General Public License | |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
22 #include "../Common/OrthancPluginCppWrapper.h" |
1802 | 23 |
24 #include <boost/filesystem.hpp> | |
25 #include <json/value.h> | |
26 #include <json/reader.h> | |
27 #include <string.h> | |
28 #include <iostream> | |
1814 | 29 #include <algorithm> |
1802 | 30 |
31 static std::string folder_; | |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
32 static bool filterIssuerAet_ = false; |
1802 | 33 |
34 /** | |
35 * This is the main function for matching a DICOM worklist against a query. | |
36 **/ | |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
37 static bool MatchWorklist(OrthancPluginWorklistAnswers* answers, |
2214 | 38 const OrthancPluginWorklistQuery* query, |
39 const OrthancPlugins::FindMatcher& matcher, | |
2206
27106f7e3759
more refactoring of the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2205
diff
changeset
|
40 const std::string& path) |
1802 | 41 { |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
42 OrthancPlugins::MemoryBuffer dicom; |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
43 dicom.ReadFile(path); |
1802 | 44 |
2214 | 45 if (matcher.IsMatch(dicom)) |
1802 | 46 { |
47 // This DICOM file matches the worklist query, add it to the answers | |
2206
27106f7e3759
more refactoring of the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2205
diff
changeset
|
48 OrthancPluginErrorCode code = OrthancPluginWorklistAddAnswer |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
49 (OrthancPlugins::GetGlobalContext(), answers, query, dicom.GetData(), dicom.GetSize()); |
1802 | 50 |
2206
27106f7e3759
more refactoring of the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2205
diff
changeset
|
51 if (code != OrthancPluginErrorCode_Success) |
27106f7e3759
more refactoring of the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2205
diff
changeset
|
52 { |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
53 OrthancPlugins::LogError("Error while adding an answer to a worklist request"); |
2234
a78d15509a1c
cleaner separation of PluginException
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
54 ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code); |
2206
27106f7e3759
more refactoring of the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2205
diff
changeset
|
55 } |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
56 |
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
57 return true; |
2206
27106f7e3759
more refactoring of the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2205
diff
changeset
|
58 } |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
59 |
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
60 return false; |
1814 | 61 } |
62 | |
63 | |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
64 static OrthancPlugins::FindMatcher* CreateMatcher(const OrthancPluginWorklistQuery* query, |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
65 const char* issuerAet) |
2215
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
66 { |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
67 // Extract the DICOM instance underlying the C-Find query |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
68 OrthancPlugins::MemoryBuffer dicom; |
2215
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
69 dicom.GetDicomQuery(query); |
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
70 |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
71 // Convert the DICOM as JSON, and dump it to the user in "--verbose" mode |
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
72 Json::Value json; |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
73 dicom.DicomToJson(json, OrthancPluginDicomToJsonFormat_Short, |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
74 static_cast<OrthancPluginDicomToJsonFlags>(0), 0); |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
75 |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
76 OrthancPlugins::LogInfo("Received worklist query from remote modality " + |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
77 std::string(issuerAet) + ":\n" + json.toStyledString()); |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
78 |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
79 if (!filterIssuerAet_) |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
80 { |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
81 return new OrthancPlugins::FindMatcher(query); |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
82 } |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
83 else |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
84 { |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
85 // Alternative sample showing how to fine-tune an incoming C-Find |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
86 // request, before matching it against the worklist database. The |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
87 // code below will restrict the original DICOM request by |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
88 // requesting the ScheduledStationAETitle to correspond to the AET |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
89 // of the C-Find issuer. This code will make the integration test |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
90 // "test_filter_issuer_aet" succeed (cf. the orthanc-tests repository). |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
91 |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
92 static const char* SCHEDULED_PROCEDURE_STEP_SEQUENCE = "0040,0100"; |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
93 static const char* SCHEDULED_STATION_AETITLE = "0040,0001"; |
2827
d4fd4614f275
IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
94 static const char* PREGNANCY_STATUS = "0010,21c0"; |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
95 |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
96 if (!json.isMember(SCHEDULED_PROCEDURE_STEP_SEQUENCE)) |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
97 { |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
98 // Create a ScheduledProcedureStepSequence sequence, with one empty element |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
99 json[SCHEDULED_PROCEDURE_STEP_SEQUENCE] = Json::arrayValue; |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
100 json[SCHEDULED_PROCEDURE_STEP_SEQUENCE].append(Json::objectValue); |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
101 } |
2215
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
102 |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
103 Json::Value& v = json[SCHEDULED_PROCEDURE_STEP_SEQUENCE]; |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
104 |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
105 if (v.type() != Json::arrayValue || |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
106 v.size() != 1 || |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
107 v[0].type() != Json::objectValue) |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
108 { |
2236 | 109 ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
110 } |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
111 |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
112 // Set the ScheduledStationAETitle if none was provided |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
113 if (!v[0].isMember(SCHEDULED_STATION_AETITLE) || |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
114 v[0].type() != Json::stringValue || |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
115 v[0][SCHEDULED_STATION_AETITLE].asString().size() == 0 || |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
116 v[0][SCHEDULED_STATION_AETITLE].asString() == "*") |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
117 { |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
118 v[0][SCHEDULED_STATION_AETITLE] = issuerAet; |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
119 } |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
120 |
2827
d4fd4614f275
IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
121 if (json.isMember(PREGNANCY_STATUS) && |
d4fd4614f275
IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
122 json[PREGNANCY_STATUS].asString().size() == 0) |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
123 { |
2827
d4fd4614f275
IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
124 json.removeMember(PREGNANCY_STATUS); |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
125 } |
2216
9a8fab016145
sample worklist plugin fine-tuning the C-Find query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2215
diff
changeset
|
126 |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
127 // Encode the modified JSON as a DICOM instance, then convert it to a C-Find matcher |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
128 OrthancPlugins::MemoryBuffer modified; |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
129 modified.CreateDicom(json, OrthancPluginCreateDicomFlags_None); |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
130 |
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
131 return new OrthancPlugins::FindMatcher(modified); |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
132 } |
2215
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
133 } |
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
134 |
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
135 |
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
136 |
1802 | 137 OrthancPluginErrorCode Callback(OrthancPluginWorklistAnswers* answers, |
138 const OrthancPluginWorklistQuery* query, | |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
139 const char* issuerAet, |
1802 | 140 const char* calledAet) |
141 { | |
142 try | |
143 { | |
2215
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
144 // Construct an object to match the worklists in the database against the C-Find query |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
145 std::auto_ptr<OrthancPlugins::FindMatcher> matcher(CreateMatcher(query, issuerAet)); |
1911 | 146 |
2215
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
147 // Loop over the regular files in the database folder |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
148 namespace fs = boost::filesystem; |
2214 | 149 |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
150 fs::path source(folder_); |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
151 fs::directory_iterator end; |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
152 int parsedFilesCount = 0; |
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
153 int matchedWorklistCount = 0; |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
154 |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
155 try |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
156 { |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
157 for (fs::directory_iterator it(source); it != end; ++it) |
1802 | 158 { |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
159 fs::file_type type(it->status().type()); |
1814 | 160 |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
161 if (type == fs::regular_file || |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
162 type == fs::reparse_file) // cf. BitBucket issue #11 |
1802 | 163 { |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
164 std::string extension = fs::extension(it->path()); |
2206
27106f7e3759
more refactoring of the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2205
diff
changeset
|
165 std::transform(extension.begin(), extension.end(), extension.begin(), tolower); // Convert to lowercase |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
166 |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
167 if (extension == ".wl") |
1802 | 168 { |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
169 parsedFilesCount++; |
2215
028214a95194
refactoring the worklist sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2214
diff
changeset
|
170 // We found a worklist (i.e. a DICOM find with extension ".wl"), match it against the query |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
171 if (MatchWorklist(answers, query, *matcher, it->path().string())) |
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
172 { |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
173 OrthancPlugins::LogInfo("Worklist matched: " + it->path().string()); |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
174 matchedWorklistCount++; |
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
175 } |
1802 | 176 } |
177 } | |
178 } | |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
179 |
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
180 std::ostringstream message; |
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
181 message << "Worklist C-Find: parsed " << parsedFilesCount << " files, found " << matchedWorklistCount << " match(es)"; |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
182 OrthancPlugins::LogInfo(message.str()); |
2289
89d17c72287b
Modality worklist: added logs to display the number of files parsed and number of matches
Alain Mazy <alain@mazy.be>
parents:
2268
diff
changeset
|
183 |
1802 | 184 } |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
185 catch (fs::filesystem_error&) |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
186 { |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
187 OrthancPlugins::LogError("Inexistent folder while scanning for worklists: " + source.string()); |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
188 return OrthancPluginErrorCode_DirectoryExpected; |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
189 } |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
190 |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
191 // Uncomment the following line if too many answers are to be returned |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
192 // OrthancPluginMarkWorklistAnswersIncomplete(OrthancPlugins::GetGlobalContext(), answers); |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
193 |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
194 return OrthancPluginErrorCode_Success; |
1802 | 195 } |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
196 catch (OrthancPlugins::PluginException& e) |
1802 | 197 { |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
198 return e.GetErrorCode(); |
1802 | 199 } |
200 } | |
201 | |
202 | |
203 extern "C" | |
204 { | |
205 ORTHANC_PLUGINS_API int32_t OrthancPluginInitialize(OrthancPluginContext* c) | |
206 { | |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
207 OrthancPlugins::SetGlobalContext(c); |
1802 | 208 |
209 /* Check the version of the Orthanc core */ | |
210 if (OrthancPluginCheckVersion(c) == 0) | |
211 { | |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
212 OrthancPlugins::ReportMinimalOrthancVersion(ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER, |
2268
ce5c13b95dac
New function: OrthancPluginRegisterIncomingHttpRequestFilter2()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
213 ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER, |
ce5c13b95dac
New function: OrthancPluginRegisterIncomingHttpRequestFilter2()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
214 ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER); |
1802 | 215 return -1; |
216 } | |
217 | |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
218 OrthancPlugins::LogWarning("Sample worklist plugin is initializing"); |
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
219 OrthancPluginSetDescription(c, "Serve DICOM modality worklists from a folder with Orthanc."); |
1802 | 220 |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
221 OrthancPlugins::OrthancConfiguration configuration; |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
222 |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
223 OrthancPlugins::OrthancConfiguration worklists; |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
224 configuration.GetSection(worklists, "Worklists"); |
1808
9c2ffc4e938b
configuration of the sample modality worklists plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
225 |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
226 bool enabled = worklists.GetBooleanValue("Enable", false); |
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
227 if (enabled) |
1802 | 228 { |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
229 if (worklists.LookupStringValue(folder_, "Database")) |
1802 | 230 { |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
231 OrthancPlugins::LogWarning("The database of worklists will be read from folder: " + folder_); |
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
232 OrthancPluginRegisterWorklistCallback(OrthancPlugins::GetGlobalContext(), Callback); |
1802 | 233 } |
1808
9c2ffc4e938b
configuration of the sample modality worklists plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
234 else |
9c2ffc4e938b
configuration of the sample modality worklists plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
235 { |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
236 OrthancPlugins::LogError("The configuration option \"Worklists.Database\" must contain a path"); |
2205
395522e46b2b
refactoring of the worklist sample using OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1911
diff
changeset
|
237 return -1; |
1808
9c2ffc4e938b
configuration of the sample modality worklists plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
238 } |
2233
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
239 |
8f5b60647654
worklist sample: FilterIssuerAet configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2216
diff
changeset
|
240 filterIssuerAet_ = worklists.GetBooleanValue("FilterIssuerAet", false); |
1802 | 241 } |
242 else | |
243 { | |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
244 OrthancPlugins::LogWarning("Worklist server is disabled by the configuration file"); |
1808
9c2ffc4e938b
configuration of the sample modality worklists plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
245 } |
1802 | 246 |
247 return 0; | |
248 } | |
249 | |
250 | |
251 ORTHANC_PLUGINS_API void OrthancPluginFinalize() | |
252 { | |
2958
bb7a66efbeb1
OrthancPlugins::SetGlobalContext() in OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2827
diff
changeset
|
253 OrthancPlugins::LogWarning("Sample worklist plugin is finalizing"); |
1802 | 254 } |
255 | |
256 | |
257 ORTHANC_PLUGINS_API const char* OrthancPluginGetName() | |
258 { | |
1808
9c2ffc4e938b
configuration of the sample modality worklists plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
259 return "worklists"; |
1802 | 260 } |
261 | |
262 | |
263 ORTHANC_PLUGINS_API const char* OrthancPluginGetVersion() | |
264 { | |
1808
9c2ffc4e938b
configuration of the sample modality worklists plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
265 return MODALITY_WORKLISTS_VERSION; |
1802 | 266 } |
267 } |