annotate Framework/Targets/OrthancTarget.cpp @ 97:e6c8a0dcd840

fix mainline version
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 23 Dec 2016 17:08:02 +0100
parents f45cec2c32e2
children ff0ef01c332c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU Affero General Public License
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * as published by the Free Software Foundation, either version 3 of
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * the License, or (at your option) any later version.
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 *
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * This program is distributed in the hope that it will be useful, but
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * WITHOUT ANY WARRANTY; without even the implied warranty of
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * Affero General Public License for more details.
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 *
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * You should have received a copy of the GNU Affero General Public License
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 **/
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
16
7a88c614be04 preparing for precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
21 #include "../PrecompiledHeadersWSI.h"
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #include "OrthancTarget.h"
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #include "../DicomToolbox.h"
59
7a3853d51c45 Move "Framework/Orthanc/" as "Resources/Orthanc/"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 16
diff changeset
25 #include "../../Resources/Orthanc/Core/OrthancException.h"
7a3853d51c45 Move "Framework/Orthanc/" as "Resources/Orthanc/"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 16
diff changeset
26 #include "../../Resources/Orthanc/Core/Logging.h"
61
147bd6dc28db refactoring using new items in the plugin toolbox of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 59
diff changeset
27 #include "../../Resources/Orthanc/Plugins/Samples/Common/OrthancHttpConnection.h"
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 namespace OrthancWSI
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 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
32 orthanc_(new OrthancPlugins::OrthancHttpConnection(parameters)),
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 first_(true)
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 void OrthancTarget::Write(const std::string& file)
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 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
41 OrthancPlugins::IOrthancConnection::RestApiPost(result, *orthanc_, "/instances", file);
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42
62
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
43 if (result.type() != Json::objectValue ||
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
44 !result.isMember("ID") ||
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
45 result["ID"].type() != Json::stringValue)
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
46 {
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
47 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
48 }
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 std::string instanceId = result["ID"].asString();
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 if (first_)
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 {
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 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
55 OrthancPlugins::IOrthancConnection::RestApiGet(instance, *orthanc_, "/instances/" + instanceId);
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56
62
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
57 if (instance.type() != Json::objectValue ||
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
58 !instance.isMember("ParentSeries") ||
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
59 instance["ParentSeries"].type() != Json::stringValue)
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
60 {
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
61 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
f45cec2c32e2 Speed-up in the Web viewer plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
62 }
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 std::string seriesId = instance["ParentSeries"].asString();
0
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 LOG(WARNING) << "ID of the whole-slide image series in Orthanc: " << seriesId;
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 first_ = false;
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 LOG(INFO) << "New instance was added to Orthanc: " << instanceId;
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 }
4a7a53257c7d initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 }