Mercurial > hg > orthanc-ohif
annotate Sources/Plugin.cpp @ 6:e8e7ba4371e3
fix access to OHIF study list
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 17 Jun 2023 17:45:05 +0200 |
parents | 8c1fe0ca24f5 |
children | eab054ee7537 |
rev | line source |
---|---|
0 | 1 /** |
2 * SPDX-FileCopyrightText: 2023 Sebastien Jodogne, UCLouvain, Belgium | |
3 * SPDX-License-Identifier: GPL-3.0-or-later | |
4 */ | |
5 | |
6 /** | |
7 * OHIF plugin for Orthanc | |
8 * Copyright (C) 2023 Sebastien Jodogne, UCLouvain, Belgium | |
9 * | |
10 * This program is free software: you can redistribute it and/or | |
11 * modify it under the terms of the GNU General Public License as | |
12 * published by the Free Software Foundation, either version 3 of the | |
13 * License, or (at your option) any later version. | |
14 * | |
15 * This program is distributed in the hope that it will be useful, but | |
16 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
18 * General Public License for more details. | |
19 * | |
20 * You should have received a copy of the GNU General Public License | |
21 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
22 **/ | |
23 | |
24 | |
25 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h" | |
26 | |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
27 #include <Compression/GzipCompressor.h> |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
28 #include <DicomFormat/DicomInstanceHasher.h> |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
29 #include <DicomFormat/DicomMap.h> |
0 | 30 #include <Logging.h> |
4
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
31 #include <SerializationToolbox.h> |
0 | 32 #include <SystemToolbox.h> |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
33 #include <Toolbox.h> |
0 | 34 |
35 #include <EmbeddedResources.h> | |
36 | |
37 #include <boost/thread/shared_mutex.hpp> | |
38 | |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
39 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
40 // Reference: https://v3-docs.ohif.org/configuration/dataSources/dicom-json |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
41 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
42 enum DataType |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
43 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
44 DataType_String, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
45 DataType_Integer, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
46 DataType_Float, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
47 DataType_ListOfFloats, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
48 DataType_ListOfStrings, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
49 DataType_None |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
50 }; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
51 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
52 class TagInformation |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
53 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
54 private: |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
55 DataType type_; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
56 std::string name_; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
57 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
58 public: |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
59 TagInformation() : |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
60 type_(DataType_None) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
61 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
62 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
63 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
64 TagInformation(DataType type, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
65 const std::string& name) : |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
66 type_(type), |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
67 name_(name) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
68 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
69 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
70 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
71 DataType GetType() const |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
72 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
73 return type_; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
74 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
75 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
76 const std::string& GetName() const |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
77 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
78 return name_; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
79 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
80 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
81 bool operator== (const TagInformation& other) const |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
82 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
83 return (type_ == other.type_ && |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
84 name_ == other.name_); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
85 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
86 }; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
87 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
88 typedef std::map<Orthanc::DicomTag, TagInformation> TagsDictionary; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
89 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
90 static TagsDictionary ohifStudyTags_, ohifSeriesTags_, ohifInstanceTags_, allTags_; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
91 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
92 static void InitializeOhifTags() |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
93 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
94 ohifStudyTags_[Orthanc::DICOM_TAG_STUDY_INSTANCE_UID] = TagInformation(DataType_String, "StudyInstanceUID"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
95 ohifStudyTags_[Orthanc::DICOM_TAG_STUDY_DATE] = TagInformation(DataType_String, "StudyDate"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
96 ohifStudyTags_[Orthanc::DICOM_TAG_STUDY_TIME] = TagInformation(DataType_String, "StudyTime"); |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
97 ohifStudyTags_[Orthanc::DICOM_TAG_STUDY_DESCRIPTION] = TagInformation(DataType_String, "StudyDescription"); |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
98 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_NAME] = TagInformation(DataType_String, "PatientName"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
99 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_ID] = TagInformation(DataType_String, "PatientID"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
100 ohifStudyTags_[Orthanc::DICOM_TAG_ACCESSION_NUMBER] = TagInformation(DataType_String, "AccessionNumber"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
101 ohifStudyTags_[Orthanc::DicomTag(0x0010, 0x1010)] = TagInformation(DataType_String, "PatientAge"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
102 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_SEX] = TagInformation(DataType_String, "PatientSex"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
103 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
104 ohifSeriesTags_[Orthanc::DICOM_TAG_SERIES_INSTANCE_UID] = TagInformation(DataType_String, "SeriesInstanceUID"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
105 ohifSeriesTags_[Orthanc::DICOM_TAG_SERIES_NUMBER] = TagInformation(DataType_Integer, "SeriesNumber"); |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
106 ohifSeriesTags_[Orthanc::DICOM_TAG_SERIES_DESCRIPTION] = TagInformation(DataType_String, "SeriesDescription"); |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
107 ohifSeriesTags_[Orthanc::DICOM_TAG_MODALITY] = TagInformation(DataType_String, "Modality"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
108 ohifSeriesTags_[Orthanc::DICOM_TAG_SLICE_THICKNESS] = TagInformation(DataType_Float, "SliceThickness"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
109 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
110 ohifInstanceTags_[Orthanc::DICOM_TAG_COLUMNS] = TagInformation(DataType_Integer, "Columns"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
111 ohifInstanceTags_[Orthanc::DICOM_TAG_ROWS] = TagInformation(DataType_Integer, "Rows"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
112 ohifInstanceTags_[Orthanc::DICOM_TAG_INSTANCE_NUMBER] = TagInformation(DataType_Integer, "InstanceNumber"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
113 ohifInstanceTags_[Orthanc::DICOM_TAG_SOP_CLASS_UID] = TagInformation(DataType_String, "SOPClassUID"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
114 ohifInstanceTags_[Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION] = TagInformation(DataType_String, "PhotometricInterpretation"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
115 ohifInstanceTags_[Orthanc::DICOM_TAG_BITS_ALLOCATED] = TagInformation(DataType_Integer, "BitsAllocated"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
116 ohifInstanceTags_[Orthanc::DICOM_TAG_BITS_STORED] = TagInformation(DataType_Integer, "BitsStored"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
117 ohifInstanceTags_[Orthanc::DICOM_TAG_PIXEL_REPRESENTATION] = TagInformation(DataType_Integer, "PixelRepresentation"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
118 ohifInstanceTags_[Orthanc::DICOM_TAG_SAMPLES_PER_PIXEL] = TagInformation(DataType_Integer, "SamplesPerPixel"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
119 ohifInstanceTags_[Orthanc::DICOM_TAG_PIXEL_SPACING] = TagInformation(DataType_ListOfFloats, "PixelSpacing"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
120 ohifInstanceTags_[Orthanc::DICOM_TAG_HIGH_BIT] = TagInformation(DataType_Integer, "HighBit"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
121 ohifInstanceTags_[Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT] = TagInformation(DataType_ListOfFloats, "ImageOrientationPatient"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
122 ohifInstanceTags_[Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT] = TagInformation(DataType_ListOfFloats, "ImagePositionPatient"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
123 ohifInstanceTags_[Orthanc::DICOM_TAG_FRAME_OF_REFERENCE_UID] = TagInformation(DataType_String, "FrameOfReferenceUID"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
124 ohifInstanceTags_[Orthanc::DicomTag(0x0008, 0x0008)] = TagInformation(DataType_ListOfStrings, "ImageType"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
125 ohifInstanceTags_[Orthanc::DICOM_TAG_MODALITY] = TagInformation(DataType_String, "Modality"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
126 ohifInstanceTags_[Orthanc::DICOM_TAG_SOP_INSTANCE_UID] = TagInformation(DataType_String, "SOPInstanceUID"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
127 ohifInstanceTags_[Orthanc::DICOM_TAG_SERIES_INSTANCE_UID] = TagInformation(DataType_String, "SeriesInstanceUID"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
128 ohifInstanceTags_[Orthanc::DICOM_TAG_STUDY_INSTANCE_UID] = TagInformation(DataType_String, "StudyInstanceUID"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
129 ohifInstanceTags_[Orthanc::DICOM_TAG_WINDOW_CENTER] = TagInformation(DataType_Float, "WindowCenter"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
130 ohifInstanceTags_[Orthanc::DICOM_TAG_WINDOW_WIDTH] = TagInformation(DataType_Float, "WindowWidth"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
131 ohifInstanceTags_[Orthanc::DICOM_TAG_SERIES_DATE] = TagInformation(DataType_String, "SeriesDate"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
132 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
133 for (TagsDictionary::const_iterator it = ohifStudyTags_.begin(); it != ohifStudyTags_.end(); ++it) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
134 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
135 assert(allTags_.find(it->first) == allTags_.end() || |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
136 allTags_[it->first] == it->second); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
137 allTags_[it->first] = it->second; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
138 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
139 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
140 for (TagsDictionary::const_iterator it = ohifSeriesTags_.begin(); it != ohifSeriesTags_.end(); ++it) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
141 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
142 assert(allTags_.find(it->first) == allTags_.end() || |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
143 allTags_[it->first] == it->second); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
144 allTags_[it->first] = it->second; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
145 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
146 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
147 for (TagsDictionary::const_iterator it = ohifInstanceTags_.begin(); it != ohifInstanceTags_.end(); ++it) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
148 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
149 assert(allTags_.find(it->first) == allTags_.end() || |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
150 allTags_[it->first] == it->second); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
151 allTags_[it->first] = it->second; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
152 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
153 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
154 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
155 |
0 | 156 // Forward declaration |
157 void ReadStaticAsset(std::string& target, | |
158 const std::string& path); | |
159 | |
160 | |
161 /** | |
162 * As the OHIF static assets are gzipped by the "EmbedStaticAssets.py" | |
163 * script, we use a cache to maintain the uncompressed assets in order | |
164 * to avoid multiple gzip decodings. | |
165 **/ | |
166 class ResourcesCache : public boost::noncopyable | |
167 { | |
168 private: | |
169 typedef std::map<std::string, std::string*> Content; | |
170 | |
171 boost::shared_mutex mutex_; | |
172 Content content_; | |
173 | |
174 public: | |
175 ~ResourcesCache() | |
176 { | |
177 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) | |
178 { | |
179 assert(it->second != NULL); | |
180 delete it->second; | |
181 } | |
182 } | |
183 | |
184 void Answer(OrthancPluginContext* context, | |
185 OrthancPluginRestOutput* output, | |
186 const std::string& path) | |
187 { | |
188 const std::string mime = Orthanc::EnumerationToString(Orthanc::SystemToolbox::AutodetectMimeType(path)); | |
189 | |
190 { | |
191 // Check whether the cache already contains the resource | |
192 boost::shared_lock<boost::shared_mutex> lock(mutex_); | |
193 | |
194 Content::const_iterator found = content_.find(path); | |
195 | |
196 if (found != content_.end()) | |
197 { | |
198 assert(found->second != NULL); | |
199 OrthancPluginAnswerBuffer(context, output, found->second->c_str(), found->second->size(), mime.c_str()); | |
200 return; | |
201 } | |
202 } | |
203 | |
204 // This resource has not been cached yet | |
205 | |
206 std::unique_ptr<std::string> item(new std::string); | |
207 ReadStaticAsset(*item, path); | |
208 OrthancPluginAnswerBuffer(context, output, item->c_str(), item->size(), mime.c_str()); | |
209 | |
210 { | |
211 // Store the resource into the cache | |
212 boost::unique_lock<boost::shared_mutex> lock(mutex_); | |
213 | |
214 if (content_.find(path) == content_.end()) | |
215 { | |
216 content_[path] = item.release(); | |
217 } | |
218 } | |
219 } | |
220 }; | |
221 | |
222 | |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
223 static bool GetOhifDicomTags(Json::Value& target, |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
224 const std::string& instanceId) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
225 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
226 Json::Value source; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
227 if (!OrthancPlugins::RestApiGet(source, "/instances/" + instanceId + "/tags?short", false)) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
228 { |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
229 return false; |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
230 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
231 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
232 if (source.type() != Json::objectValue) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
233 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
234 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
235 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
236 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
237 for (TagsDictionary::const_iterator it = allTags_.begin(); it != allTags_.end(); ++it) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
238 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
239 const std::string tag = it->first.Format(); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
240 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
241 if (source.isMember(tag)) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
242 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
243 const Json::Value& value = source[tag]; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
244 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
245 /** |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
246 * The cases below derive from "Toolbox::SimplifyDicomAsJson()" |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
247 * with "DicomToJsonFormat_Short", which is invoked by the REST |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
248 * API call to "/instances/.../tags?short". |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
249 **/ |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
250 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
251 switch (value.type()) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
252 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
253 case Json::nullValue: |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
254 break; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
255 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
256 case Json::arrayValue: |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
257 // This should never happen, as this would correspond to a sequence |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
258 break; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
259 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
260 case Json::stringValue: |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
261 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
262 switch (it->second.GetType()) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
263 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
264 case DataType_String: |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
265 target[tag] = value; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
266 break; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
267 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
268 case DataType_Integer: |
4
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
269 { |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
270 int32_t v; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
271 if (Orthanc::SerializationToolbox::ParseInteger32(v, value.asString())) |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
272 { |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
273 target[tag] = v; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
274 } |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
275 break; |
4
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
276 } |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
277 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
278 case DataType_Float: |
4
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
279 { |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
280 float v; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
281 if (Orthanc::SerializationToolbox::ParseFloat(v, value.asString())) |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
282 { |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
283 target[tag] = v; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
284 } |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
285 break; |
4
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
286 } |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
287 |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
288 case DataType_ListOfStrings: |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
289 { |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
290 std::vector<std::string> tokens; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
291 Orthanc::Toolbox::TokenizeString(tokens, value.asString(), '\\'); |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
292 target[tag] = Json::arrayValue; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
293 for (size_t i = 0; i < tokens.size(); i++) |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
294 { |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
295 target[tag].append(tokens[i]); |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
296 } |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
297 break; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
298 } |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
299 |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
300 case DataType_ListOfFloats: |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
301 { |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
302 std::vector<std::string> tokens; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
303 Orthanc::Toolbox::TokenizeString(tokens, value.asString(), '\\'); |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
304 target[tag] = Json::arrayValue; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
305 for (size_t i = 0; i < tokens.size(); i++) |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
306 { |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
307 float v; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
308 if (Orthanc::SerializationToolbox::ParseFloat(v, tokens[i])) |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
309 { |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
310 target[tag].append(v); |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
311 } |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
312 } |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
313 break; |
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
314 } |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
315 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
316 default: |
4
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
317 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
318 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
319 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
320 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
321 default: |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
322 // This should never happen |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
323 break; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
324 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
325 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
326 } |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
327 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
328 return true; |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
329 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
330 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
331 |
0 | 332 static ResourcesCache cache_; |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
333 static std::string routerBasename_; |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
334 static bool useDicomWeb_; |
0 | 335 |
336 void ServeFile(OrthancPluginRestOutput* output, | |
337 const char* url, | |
338 const OrthancPluginHttpRequest* request) | |
339 { | |
340 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); | |
341 | |
342 // The next 3 HTTP headers are required to enable SharedArrayBuffer | |
343 // (https://web.dev/coop-coep/) | |
344 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Embedder-Policy", "require-corp"); | |
345 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Opener-Policy", "same-origin"); | |
346 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Resource-Policy", "same-origin"); | |
347 | |
6
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
348 std::string uri; |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
349 if (request->groupsCount > 0) |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
350 { |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
351 uri = request->groups[0]; |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
352 } |
0 | 353 |
354 if (uri == "app-config.js") | |
355 { | |
356 std::string system, user; | |
357 Orthanc::EmbeddedResources::GetFileResource(system, Orthanc::EmbeddedResources::APP_CONFIG_SYSTEM); | |
358 Orthanc::EmbeddedResources::GetFileResource(user, Orthanc::EmbeddedResources::APP_CONFIG_USER); | |
359 | |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
360 std::map<std::string, std::string> dictionary; |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
361 dictionary["ROUTER_BASENAME"] = routerBasename_; |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
362 dictionary["USE_DICOM_WEB"] = (useDicomWeb_ ? "true" : "false"); |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
363 |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
364 system = Orthanc::Toolbox::SubstituteVariables(system, dictionary); |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
365 |
0 | 366 std::string s = (user + "\n" + system); |
367 OrthancPluginAnswerBuffer(context, output, s.c_str(), s.size(), "application/json"); | |
368 } | |
6
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
369 else if (uri == "" || // Study list |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
370 uri == "tmtv" || // Total metabolic tumor volume |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
371 uri == "viewer") // Default viewer (including MPR) |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
372 { |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
373 // Those correspond to the different modes of the OHIF platform: |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
374 // https://v3-docs.ohif.org/platform/modes/ |
0 | 375 cache_.Answer(context, output, "index.html"); |
376 } | |
377 else | |
378 { | |
379 cache_.Answer(context, output, uri); | |
380 } | |
381 } | |
382 | |
383 | |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
384 static void GenerateOhifStudy(Json::Value& target, |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
385 const std::string& studyId) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
386 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
387 // https://v3-docs.ohif.org/configuration/dataSources/dicom-json |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
388 static const char* const KEY_ID = "ID"; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
389 const std::string KEY_PATIENT_ID = Orthanc::DICOM_TAG_PATIENT_ID.Format(); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
390 const std::string KEY_STUDY_INSTANCE_UID = Orthanc::DICOM_TAG_STUDY_INSTANCE_UID.Format(); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
391 const std::string KEY_SERIES_INSTANCE_UID = Orthanc::DICOM_TAG_SERIES_INSTANCE_UID.Format(); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
392 const std::string KEY_SOP_INSTANCE_UID = Orthanc::DICOM_TAG_SOP_INSTANCE_UID.Format(); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
393 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
394 Json::Value instancesIds; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
395 if (!OrthancPlugins::RestApiGet(instancesIds, "/studies/" + studyId + "/instances", false)) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
396 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
397 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
398 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
399 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
400 if (instancesIds.type() != Json::arrayValue) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
401 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
402 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
403 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
404 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
405 std::vector<Json::Value> instancesTags; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
406 instancesTags.reserve(instancesIds.size()); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
407 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
408 for (Json::ArrayIndex i = 0; i < instancesIds.size(); i++) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
409 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
410 if (instancesIds[i].type() != Json::objectValue || |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
411 !instancesIds[i].isMember(KEY_ID) || |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
412 instancesIds[i][KEY_ID].type() != Json::stringValue) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
413 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
414 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
415 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
416 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
417 Json::Value t; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
418 if (GetOhifDicomTags(t, instancesIds[i][KEY_ID].asString())) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
419 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
420 instancesTags.push_back(t); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
421 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
422 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
423 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
424 typedef std::list<const Json::Value*> ListOfResources; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
425 typedef std::map<std::string, ListOfResources> MapOfResources; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
426 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
427 MapOfResources studies; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
428 for (Json::ArrayIndex i = 0; i < instancesTags.size(); i++) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
429 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
430 if (instancesTags[i].isMember(KEY_STUDY_INSTANCE_UID)) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
431 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
432 if (instancesTags[i][KEY_STUDY_INSTANCE_UID].type() != Json::stringValue) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
433 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
434 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
435 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
436 else |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
437 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
438 const std::string& studyInstanceUid = instancesTags[i][KEY_STUDY_INSTANCE_UID].asString(); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
439 studies[studyInstanceUid].push_back(&instancesTags[i]); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
440 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
441 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
442 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
443 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
444 target["studies"] = Json::arrayValue; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
445 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
446 for (MapOfResources::const_iterator it = studies.begin(); it != studies.end(); ++it) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
447 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
448 if (!it->second.empty()) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
449 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
450 assert(it->second.front() != NULL); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
451 const Json::Value& firstInstanceInStudy = *it->second.front(); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
452 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
453 Json::Value study = Json::objectValue; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
454 for (TagsDictionary::const_iterator tag = ohifStudyTags_.begin(); tag != ohifStudyTags_.end(); ++tag) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
455 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
456 if (firstInstanceInStudy.isMember(tag->first.Format())) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
457 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
458 study[tag->second.GetName()] = firstInstanceInStudy[tag->first.Format()]; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
459 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
460 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
461 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
462 MapOfResources seriesInStudy; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
463 for (ListOfResources::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
464 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
465 assert(*it2 != NULL); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
466 const Json::Value& instanceInStudy = **it2; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
467 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
468 if (instanceInStudy.isMember(KEY_SERIES_INSTANCE_UID)) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
469 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
470 if (instanceInStudy[KEY_SERIES_INSTANCE_UID].type() != Json::stringValue) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
471 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
472 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
473 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
474 else |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
475 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
476 const std::string& seriesInstanceUid = instanceInStudy[KEY_SERIES_INSTANCE_UID].asString(); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
477 seriesInStudy[seriesInstanceUid].push_back(&instanceInStudy); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
478 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
479 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
480 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
481 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
482 study["series"] = Json::arrayValue; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
483 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
484 for (MapOfResources::const_iterator it3 = seriesInStudy.begin(); it3 != seriesInStudy.end(); ++it3) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
485 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
486 if (!it3->second.empty()) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
487 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
488 assert(it3->second.front() != NULL); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
489 const Json::Value& firstInstanceInSeries = *it3->second.front(); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
490 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
491 Json::Value series = Json::objectValue; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
492 for (TagsDictionary::const_iterator tag = ohifSeriesTags_.begin(); tag != ohifSeriesTags_.end(); ++tag) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
493 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
494 if (firstInstanceInSeries.isMember(tag->first.Format())) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
495 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
496 series[tag->second.GetName()] = firstInstanceInSeries[tag->first.Format()]; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
497 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
498 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
499 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
500 series["instances"] = Json::arrayValue; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
501 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
502 for (ListOfResources::const_iterator it4 = it3->second.begin(); it4 != it3->second.end(); ++it4) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
503 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
504 assert(*it4 != NULL); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
505 const Json::Value& instanceInSeries = **it4; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
506 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
507 Json::Value metadata; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
508 for (TagsDictionary::const_iterator tag = ohifInstanceTags_.begin(); tag != ohifInstanceTags_.end(); ++tag) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
509 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
510 if (instanceInSeries.isMember(tag->first.Format())) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
511 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
512 metadata[tag->second.GetName()] = instanceInSeries[tag->first.Format()]; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
513 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
514 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
515 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
516 Orthanc::DicomInstanceHasher hasher(instanceInSeries[KEY_PATIENT_ID].asString(), |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
517 instanceInSeries[KEY_STUDY_INSTANCE_UID].asString(), |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
518 instanceInSeries[KEY_SERIES_INSTANCE_UID].asString(), |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
519 instanceInSeries[KEY_SOP_INSTANCE_UID].asString()); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
520 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
521 Json::Value instance = Json::objectValue; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
522 instance["metadata"] = metadata; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
523 instance["url"] = "dicomweb:../instances/" + hasher.HashInstance() + "/file"; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
524 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
525 series["instances"].append(instance); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
526 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
527 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
528 study["series"].append(series); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
529 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
530 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
531 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
532 target["studies"].append(study); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
533 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
534 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
535 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
536 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
537 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
538 void GetOhifStudy(OrthancPluginRestOutput* output, |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
539 const char* url, |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
540 const OrthancPluginHttpRequest* request) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
541 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
542 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
543 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
544 const std::string studyId = request->groups[0]; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
545 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
546 Json::Value v; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
547 GenerateOhifStudy(v, studyId); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
548 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
549 std::string s; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
550 Orthanc::Toolbox::WriteFastJson(s, v); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
551 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
552 OrthancPluginAnswerBuffer(context, output, s.c_str(), s.size(), "application/json"); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
553 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
554 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
555 |
0 | 556 OrthancPluginErrorCode OnChangeCallback(OrthancPluginChangeType changeType, |
557 OrthancPluginResourceType resourceType, | |
558 const char* resourceId) | |
559 { | |
560 try | |
561 { | |
562 if (changeType == OrthancPluginChangeType_OrthancStarted) | |
563 { | |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
564 if (useDicomWeb_) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
565 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
566 Json::Value info; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
567 if (!OrthancPlugins::RestApiGet(info, "/plugins/dicom-web", false)) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
568 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
569 throw Orthanc::OrthancException( |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
570 Orthanc::ErrorCode_InternalError, |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
571 "The OHIF plugin requires the DICOMweb plugin to be installed"); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
572 } |
4
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
573 |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
574 if (info.type() != Json::objectValue || |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
575 !info.isMember("ID") || |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
576 !info.isMember("Version") || |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
577 info["ID"].type() != Json::stringValue || |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
578 info["Version"].type() != Json::stringValue || |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
579 info["ID"].asString() != "dicom-web") |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
580 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
581 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
582 "The DICOMweb plugin is required by OHIF, but is not properly installed"); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
583 } |
0 | 584 } |
585 } | |
586 } | |
587 catch (Orthanc::OrthancException& e) | |
588 { | |
589 LOG(ERROR) << "Exception: " << e.What(); | |
590 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
591 } | |
592 | |
593 return OrthancPluginErrorCode_Success; | |
594 } | |
595 | |
596 | |
597 extern "C" | |
598 { | |
599 ORTHANC_PLUGINS_API int32_t OrthancPluginInitialize(OrthancPluginContext* context) | |
600 { | |
601 OrthancPlugins::SetGlobalContext(context); | |
602 | |
603 /* Check the version of the Orthanc core */ | |
604 if (OrthancPluginCheckVersion(context) == 0) | |
605 { | |
606 char info[1024]; | |
607 sprintf(info, "Your version of Orthanc (%s) must be above %d.%d.%d to run this plugin", | |
608 context->orthancVersion, | |
609 ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER, | |
610 ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER, | |
611 ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER); | |
612 OrthancPluginLogError(context, info); | |
613 return -1; | |
614 } | |
615 | |
616 #if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 7, 2) | |
617 Orthanc::Logging::InitializePluginContext(context); | |
618 #else | |
619 Orthanc::Logging::Initialize(context); | |
620 #endif | |
621 | |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
622 InitializeOhifTags(); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
623 |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
624 OrthancPlugins::OrthancConfiguration configuration; |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
625 |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
626 { |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
627 OrthancPlugins::OrthancConfiguration globalConfiguration; |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
628 globalConfiguration.GetSection(configuration, "OHIF"); |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
629 } |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
630 |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
631 routerBasename_ = configuration.GetStringValue("RouterBasename", "/ohif"); |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
632 useDicomWeb_ = configuration.GetBooleanValue("DicomWeb", false); |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
633 |
6
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
634 // Make sure that the router basename ends with a trailing slash |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
635 if (routerBasename_.empty() || |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
636 routerBasename_[routerBasename_.size() - 1] != '/') |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
637 { |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
638 routerBasename_ += "/"; |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
639 } |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
640 |
0 | 641 OrthancPluginSetDescription(context, "OHIF plugin for Orthanc."); |
642 | |
6
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
643 OrthancPlugins::RegisterRestCallback<ServeFile>("/ohif", true); |
0 | 644 OrthancPlugins::RegisterRestCallback<ServeFile>("/ohif/(.*)", true); |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
645 OrthancPlugins::RegisterRestCallback<GetOhifStudy>("/ohif-source/(.*)", true); |
0 | 646 |
647 OrthancPluginRegisterOnChangeCallback(context, OnChangeCallback); | |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
648 |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
649 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
650 // Extend the default Orthanc Explorer with custom JavaScript for OHIF |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
651 std::string explorer; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
652 Orthanc::EmbeddedResources::GetFileResource(explorer, Orthanc::EmbeddedResources::ORTHANC_EXPLORER); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
653 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
654 std::map<std::string, std::string> dictionary; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
655 dictionary["USE_DICOM_WEB"] = (useDicomWeb_ ? "true" : "false"); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
656 explorer = Orthanc::Toolbox::SubstituteVariables(explorer, dictionary); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
657 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
658 OrthancPluginExtendOrthancExplorer(context, explorer.c_str()); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
659 } |
0 | 660 |
661 return 0; | |
662 } | |
663 | |
664 | |
665 ORTHANC_PLUGINS_API void OrthancPluginFinalize() | |
666 { | |
667 } | |
668 | |
669 | |
670 ORTHANC_PLUGINS_API const char* OrthancPluginGetName() | |
671 { | |
672 return "ohif"; | |
673 } | |
674 | |
675 | |
676 ORTHANC_PLUGINS_API const char* OrthancPluginGetVersion() | |
677 { | |
678 return ORTHANC_OHIF_VERSION; | |
679 } | |
680 } |