Mercurial > hg > orthanc-wsi
annotate Framework/Targets/OrthancTarget.cpp @ 142:faabdb7f2003
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 17 Apr 2018 20:16:12 +0200 |
| parents | a0f9a3df1110 |
| children | 6b8ccfc02051 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
115
a51dee6a1515
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
98
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 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 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
|
16
7a88c614be04
preparing for precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
22 #include "../PrecompiledHeadersWSI.h" |
| 0 | 23 #include "OrthancTarget.h" |
| 24 | |
| 25 #include "../DicomToolbox.h" | |
|
140
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
115
diff
changeset
|
26 #include <Core/OrthancException.h> |
|
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
115
diff
changeset
|
27 #include <Core/Logging.h> |
|
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
115
diff
changeset
|
28 #include <Plugins/Samples/Common/OrthancHttpConnection.h> |
| 0 | 29 |
| 30 namespace OrthancWSI | |
| 31 { | |
| 32 OrthancTarget::OrthancTarget(const Orthanc::WebServiceParameters& parameters) : | |
|
61
147bd6dc28db
refactoring using new items in the plugin toolbox of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
33 orthanc_(new OrthancPlugins::OrthancHttpConnection(parameters)), |
| 0 | 34 first_(true) |
| 35 { | |
| 36 } | |
| 37 | |
| 38 | |
| 39 void OrthancTarget::Write(const std::string& file) | |
| 40 { | |
| 41 Json::Value result; | |
|
61
147bd6dc28db
refactoring using new items in the plugin toolbox of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
42 OrthancPlugins::IOrthancConnection::RestApiPost(result, *orthanc_, "/instances", file); |
| 0 | 43 |
|
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
44 if (result.type() != Json::objectValue || |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
45 !result.isMember("ID") || |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
46 result["ID"].type() != Json::stringValue) |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
47 { |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
48 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
49 } |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
50 |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
51 std::string instanceId = result["ID"].asString(); |
| 0 | 52 |
| 53 if (first_) | |
| 54 { | |
| 55 Json::Value instance; | |
|
61
147bd6dc28db
refactoring using new items in the plugin toolbox of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
56 OrthancPlugins::IOrthancConnection::RestApiGet(instance, *orthanc_, "/instances/" + instanceId); |
| 0 | 57 |
|
62
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
58 if (instance.type() != Json::objectValue || |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
59 !instance.isMember("ParentSeries") || |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
60 instance["ParentSeries"].type() != Json::stringValue) |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
61 { |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
62 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
63 } |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
64 |
|
f45cec2c32e2
Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
65 std::string seriesId = instance["ParentSeries"].asString(); |
| 0 | 66 |
| 67 LOG(WARNING) << "ID of the whole-slide image series in Orthanc: " << seriesId; | |
| 68 first_ = false; | |
| 69 } | |
| 70 | |
| 71 LOG(INFO) << "New instance was added to Orthanc: " << instanceId; | |
| 72 } | |
| 73 } |