annotate Plugin/SeriesInformationAdapter.cpp @ 287:ec1af1fdcaca

fix build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 06 Nov 2020 17:33:32 +0100
parents 620ed85fb514
children e376158e2dbb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
122
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
226
aee499712ac4 upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 209
diff changeset
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * Affero General Public License for more details.
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 **/
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #include "SeriesInformationAdapter.h"
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #include "ViewerToolbox.h"
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25
287
ec1af1fdcaca fix build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
26 #include <Logging.h>
ec1af1fdcaca fix build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
27
99
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
28 #include <boost/regex.hpp>
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
29
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 namespace OrthancPlugins
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 {
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 bool SeriesInformationAdapter::Create(std::string& content,
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 const std::string& seriesId)
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 {
260
620ed85fb514 replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
35 LOG(INFO) << "Ordering instances of series: " << seriesId;
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
99
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
37 Json::Value series, study, patient, ordered;
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 if (!GetJsonFromOrthanc(series, context_, "/series/" + seriesId) ||
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 !GetJsonFromOrthanc(study, context_, "/studies/" + series["ID"].asString() + "/module?simplify") ||
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 !GetJsonFromOrthanc(patient, context_, "/studies/" + series["ID"].asString() + "/module-patient?simplify") ||
99
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
41 !GetJsonFromOrthanc(ordered, context_, "/series/" + series["ID"].asString() + "/ordered-slices") ||
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 !series.isMember("Instances") ||
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 series["Instances"].type() != Json::arrayValue)
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 {
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 return false;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 }
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 Json::Value result;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 result["ID"] = seriesId;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 result["SeriesDescription"] = series["MainDicomTags"]["SeriesDescription"].asString();
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 result["StudyDescription"] = study["StudyDescription"].asString();
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 result["PatientID"] = patient["PatientID"].asString();
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 result["PatientName"] = patient["PatientName"].asString();
99
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
54 result["Type"] = ordered["Type"];
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
55 result["Slices"] = ordered["Slices"];
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
56
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
57 boost::regex pattern("^/instances/([a-f0-9-]+)/frames/([0-9]+)$");
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
58
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
59 for (Json::Value::ArrayIndex i = 0; i < result["Slices"].size(); i++)
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
60 {
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
61 boost::cmatch what;
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
62 if (regex_match(result["Slices"][i].asCString(), what, pattern))
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
63 {
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
64 result["Slices"][i] = std::string(what[1]) + "_" + std::string(what[2]);
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
65 }
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
66 else
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
67 {
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
68 return false;
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
69 }
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
70 }
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
71
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 content = result.toStyledString();
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 return true;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 }
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 }