Mercurial > hg > orthanc-ohif
annotate Sources/Plugin.cpp @ 44:9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 03 May 2024 13:02:51 +0200 |
parents | f3dc8ecf4349 |
children | 63a392fbf14e |
rev | line source |
---|---|
0 | 1 /** |
30 | 2 * SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium |
0 | 3 * SPDX-License-Identifier: GPL-3.0-or-later |
4 */ | |
5 | |
6 /** | |
7 * OHIF plugin for Orthanc | |
30 | 8 * Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium |
0 | 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> |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
30 #include <Logging.h> |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
31 #include <MultiThreading/SharedMessageQueue.h> |
4
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
32 #include <SerializationToolbox.h> |
0 | 33 #include <SystemToolbox.h> |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
34 #include <Toolbox.h> |
0 | 35 |
36 #include <EmbeddedResources.h> | |
37 | |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
38 #include <boost/thread.hpp> |
0 | 39 #include <boost/thread/shared_mutex.hpp> |
40 | |
38
fae02fc69b46
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
37
diff
changeset
|
41 #define ORTHANC_PLUGIN_NAME "ohif" |
fae02fc69b46
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
37
diff
changeset
|
42 |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
43 |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
44 static const std::string METADATA_OHIF = "4202"; |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
45 static const char* const KEY_VERSION = "Version"; |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
46 static const unsigned int MAX_INSTANCES_IN_QUEUE = 10000; |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
47 |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
48 |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
49 enum DataSource |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
50 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
51 DataSource_DicomWeb, |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
52 DataSource_DicomJson |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
53 }; |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
54 |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
55 |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
56 // Reference: https://v3-docs.ohif.org/configuration/dataSources/dicom-json |
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 enum DataType |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
59 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
60 DataType_String, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
61 DataType_Integer, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
62 DataType_Float, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
63 DataType_ListOfFloats, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
64 DataType_ListOfStrings, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
65 DataType_None |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
66 }; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
67 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
68 class TagInformation |
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 private: |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
71 DataType type_; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
72 std::string name_; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
73 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
74 public: |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
75 TagInformation() : |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
76 type_(DataType_None) |
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 } |
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 TagInformation(DataType type, |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
81 const std::string& name) : |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
82 type_(type), |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
83 name_(name) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
84 { |
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 DataType GetType() const |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
88 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
89 return type_; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
90 } |
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 const std::string& GetName() const |
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 return name_; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
95 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
96 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
97 bool operator== (const TagInformation& other) const |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
98 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
99 return (type_ == other.type_ && |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
100 name_ == other.name_); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
101 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
102 }; |
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 typedef std::map<Orthanc::DicomTag, TagInformation> TagsDictionary; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
105 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
106 static TagsDictionary ohifStudyTags_, ohifSeriesTags_, ohifInstanceTags_, allTags_; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
107 |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
108 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
109 static const Orthanc::DicomTag RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE(0x0054, 0x0016); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
110 |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
111 static void InitializeOhifTags() |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
112 { |
7
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
113 /** |
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
114 * Those are the tags that are found in the documentation of the |
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
115 * "DICOM JSON" data source: |
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
116 * https://docs.ohif.org/configuration/dataSources/dicom-json |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
117 * |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
118 * Official list of tags: |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
119 * https://github.com/OHIF/Viewers/blob/master/platform/docs/docs/faq.md#what-are-the-list-of-required-metadata-for-the-ohif-viewer-to-work |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
120 * |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
121 * Official example: |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
122 * https://ohif-dicom-json-example.s3.amazonaws.com/LIDC-IDRI-0001.json |
7
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
123 **/ |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
124 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
|
125 ohifStudyTags_[Orthanc::DICOM_TAG_STUDY_DATE] = TagInformation(DataType_String, "StudyDate"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
126 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
|
127 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
|
128 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_NAME] = TagInformation(DataType_String, "PatientName"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
129 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_ID] = TagInformation(DataType_String, "PatientID"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
130 ohifStudyTags_[Orthanc::DICOM_TAG_ACCESSION_NUMBER] = TagInformation(DataType_String, "AccessionNumber"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
131 ohifStudyTags_[Orthanc::DicomTag(0x0010, 0x1010)] = TagInformation(DataType_String, "PatientAge"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
132 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_SEX] = TagInformation(DataType_String, "PatientSex"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
133 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
134 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
|
135 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
|
136 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
|
137 ohifSeriesTags_[Orthanc::DICOM_TAG_MODALITY] = TagInformation(DataType_String, "Modality"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
138 ohifSeriesTags_[Orthanc::DICOM_TAG_SLICE_THICKNESS] = TagInformation(DataType_Float, "SliceThickness"); |
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 ohifInstanceTags_[Orthanc::DICOM_TAG_COLUMNS] = TagInformation(DataType_Integer, "Columns"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
141 ohifInstanceTags_[Orthanc::DICOM_TAG_ROWS] = TagInformation(DataType_Integer, "Rows"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
142 ohifInstanceTags_[Orthanc::DICOM_TAG_INSTANCE_NUMBER] = TagInformation(DataType_Integer, "InstanceNumber"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
143 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
|
144 ohifInstanceTags_[Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION] = TagInformation(DataType_String, "PhotometricInterpretation"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
145 ohifInstanceTags_[Orthanc::DICOM_TAG_BITS_ALLOCATED] = TagInformation(DataType_Integer, "BitsAllocated"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
146 ohifInstanceTags_[Orthanc::DICOM_TAG_BITS_STORED] = TagInformation(DataType_Integer, "BitsStored"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
147 ohifInstanceTags_[Orthanc::DICOM_TAG_PIXEL_REPRESENTATION] = TagInformation(DataType_Integer, "PixelRepresentation"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
148 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
|
149 ohifInstanceTags_[Orthanc::DICOM_TAG_PIXEL_SPACING] = TagInformation(DataType_ListOfFloats, "PixelSpacing"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
150 ohifInstanceTags_[Orthanc::DICOM_TAG_HIGH_BIT] = TagInformation(DataType_Integer, "HighBit"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
151 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
|
152 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
|
153 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
|
154 ohifInstanceTags_[Orthanc::DicomTag(0x0008, 0x0008)] = TagInformation(DataType_ListOfStrings, "ImageType"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
155 ohifInstanceTags_[Orthanc::DICOM_TAG_MODALITY] = TagInformation(DataType_String, "Modality"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
156 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
|
157 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
|
158 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
|
159 ohifInstanceTags_[Orthanc::DICOM_TAG_WINDOW_CENTER] = TagInformation(DataType_Float, "WindowCenter"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
160 ohifInstanceTags_[Orthanc::DICOM_TAG_WINDOW_WIDTH] = TagInformation(DataType_Float, "WindowWidth"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
161 ohifInstanceTags_[Orthanc::DICOM_TAG_SERIES_DATE] = TagInformation(DataType_String, "SeriesDate"); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
162 |
7
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
163 /** |
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
164 * The items below are related to PET scans. Their list can be found |
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
165 * by looking for "required metadata are missing" in |
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
166 * "extensions/default/src/getPTImageIdInstanceMetadata.ts" |
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
167 **/ |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
168 ohifInstanceTags_[Orthanc::DICOM_TAG_ACQUISITION_DATE] = TagInformation(DataType_String, "AcquisitionDate"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
169 ohifInstanceTags_[Orthanc::DICOM_TAG_ACQUISITION_TIME] = TagInformation(DataType_String, "AcquisitionTime"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
170 ohifInstanceTags_[Orthanc::DICOM_TAG_SERIES_TIME] = TagInformation(DataType_String, "SeriesTime"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
171 ohifInstanceTags_[Orthanc::DicomTag(0x0010, 0x1020)] = TagInformation(DataType_Float, "PatientSize"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
172 ohifInstanceTags_[Orthanc::DicomTag(0x0010, 0x1030)] = TagInformation(DataType_Float, "PatientWeight"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
173 ohifInstanceTags_[Orthanc::DicomTag(0x0018, 0x1242)] = TagInformation(DataType_Integer, "ActualFrameDuration"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
174 ohifInstanceTags_[Orthanc::DicomTag(0x0028, 0x0051)] = TagInformation(DataType_ListOfStrings, "CorrectedImage"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
175 ohifInstanceTags_[Orthanc::DicomTag(0x0054, 0x1001)] = TagInformation(DataType_String, "Units"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
176 ohifInstanceTags_[Orthanc::DicomTag(0x0054, 0x1102)] = TagInformation(DataType_String, "DecayCorrection"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
177 ohifInstanceTags_[Orthanc::DicomTag(0x0054, 0x1300)] = TagInformation(DataType_Float, "FrameReferenceTime"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
178 ohifInstanceTags_[RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE] = TagInformation(DataType_None, "RadiopharmaceuticalInformationSequence"); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
179 |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
180 /** |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
181 * Added in version 1.3 |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
182 **/ |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
183 ohifInstanceTags_[Orthanc::DICOM_TAG_RESCALE_INTERCEPT] = TagInformation(DataType_Float, "RescaleIntercept"); |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
184 ohifInstanceTags_[Orthanc::DICOM_TAG_RESCALE_SLOPE] = TagInformation(DataType_Float, "RescaleSlope"); |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
185 ohifInstanceTags_[Orthanc::DICOM_TAG_NUMBER_OF_FRAMES] = TagInformation(DataType_Integer, "NumberOfFrames"); |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
186 |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
187 |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
188 // UNTESTED |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
189 ohifInstanceTags_[Orthanc::DicomTag(0x7053, 0x1000)] = TagInformation(DataType_Float, "70531000"); // Philips SUVScaleFactor |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
190 ohifInstanceTags_[Orthanc::DicomTag(0x7053, 0x1009)] = TagInformation(DataType_Float, "70531009"); // Philips ActivityConcentrationScaleFactor |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
191 ohifInstanceTags_[Orthanc::DicomTag(0x0009, 0x100d)] = TagInformation(DataType_String, "0009100d"); // GE PrivatePostInjectionDateTime |
7
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
192 |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
193 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
|
194 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
195 assert(allTags_.find(it->first) == allTags_.end() || |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
196 allTags_[it->first] == it->second); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
197 allTags_[it->first] = it->second; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
198 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
199 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
200 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
|
201 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
202 assert(allTags_.find(it->first) == allTags_.end() || |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
203 allTags_[it->first] == it->second); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
204 allTags_[it->first] = it->second; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
205 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
206 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
207 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
|
208 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
209 assert(allTags_.find(it->first) == allTags_.end() || |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
210 allTags_[it->first] == it->second); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
211 allTags_[it->first] = it->second; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
212 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
213 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
214 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
215 |
0 | 216 // Forward declaration |
217 void ReadStaticAsset(std::string& target, | |
218 const std::string& path); | |
219 | |
220 | |
221 /** | |
222 * As the OHIF static assets are gzipped by the "EmbedStaticAssets.py" | |
223 * script, we use a cache to maintain the uncompressed assets in order | |
224 * to avoid multiple gzip decodings. | |
225 **/ | |
226 class ResourcesCache : public boost::noncopyable | |
227 { | |
228 private: | |
229 typedef std::map<std::string, std::string*> Content; | |
230 | |
231 boost::shared_mutex mutex_; | |
232 Content content_; | |
233 | |
234 public: | |
235 ~ResourcesCache() | |
236 { | |
237 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) | |
238 { | |
239 assert(it->second != NULL); | |
240 delete it->second; | |
241 } | |
242 } | |
243 | |
244 void Answer(OrthancPluginContext* context, | |
245 OrthancPluginRestOutput* output, | |
246 const std::string& path) | |
247 { | |
248 const std::string mime = Orthanc::EnumerationToString(Orthanc::SystemToolbox::AutodetectMimeType(path)); | |
249 | |
250 { | |
251 // Check whether the cache already contains the resource | |
252 boost::shared_lock<boost::shared_mutex> lock(mutex_); | |
253 | |
254 Content::const_iterator found = content_.find(path); | |
255 | |
256 if (found != content_.end()) | |
257 { | |
258 assert(found->second != NULL); | |
259 OrthancPluginAnswerBuffer(context, output, found->second->c_str(), found->second->size(), mime.c_str()); | |
260 return; | |
261 } | |
262 } | |
263 | |
264 // This resource has not been cached yet | |
265 | |
266 std::unique_ptr<std::string> item(new std::string); | |
267 ReadStaticAsset(*item, path); | |
33
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
268 |
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
269 // patch OHIF for https://github.com/OHIF/Viewers/issues/3928 |
37 | 270 // TODO - Remove after official release OHIF 3.8.0 |
33
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
271 if (Orthanc::Toolbox::StartsWith(path, "app.bundle.")) |
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
272 { |
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
273 boost::replace_all(*item, "window.location.origin + location.pathname + location.search", "window.location.origin + window.location.pathname + location.search"); |
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
274 } |
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
275 |
0 | 276 OrthancPluginAnswerBuffer(context, output, item->c_str(), item->size(), mime.c_str()); |
277 | |
278 { | |
279 // Store the resource into the cache | |
280 boost::unique_lock<boost::shared_mutex> lock(mutex_); | |
281 | |
282 if (content_.find(path) == content_.end()) | |
283 { | |
284 content_[path] = item.release(); | |
285 } | |
286 } | |
287 } | |
288 }; | |
289 | |
290 | |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
291 static bool ParseTagFromOrthanc(Json::Value& target, |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
292 const Orthanc::DicomTag& tag, |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
293 const std::string& name, |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
294 DataType type, |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
295 const Json::Value& source) |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
296 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
297 const std::string formattedTag = tag.Format(); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
298 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
299 if (source.isMember(formattedTag)) |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
300 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
301 const Json::Value& value = source[formattedTag]; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
302 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
303 /** |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
304 * The cases below derive from "Toolbox::SimplifyDicomAsJson()" |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
305 * with "DicomToJsonFormat_Short", which is invoked by the REST |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
306 * API call to "/instances/.../tags?short". |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
307 **/ |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
308 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
309 switch (value.type()) |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
310 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
311 case Json::nullValue: |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
312 return false; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
313 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
314 case Json::arrayValue: |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
315 // This should never happen, as this would correspond to a sequence |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
316 return false; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
317 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
318 case Json::stringValue: |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
319 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
320 switch (type) |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
321 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
322 case DataType_String: |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
323 target[name] = value; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
324 return true; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
325 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
326 case DataType_Integer: |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
327 { |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
328 std::vector<std::string> tokens; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
329 Orthanc::Toolbox::TokenizeString(tokens, value.asString(), '\\'); |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
330 |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
331 if (!tokens.empty()) |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
332 { |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
333 int32_t v; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
334 if (Orthanc::SerializationToolbox::ParseInteger32(v, tokens[0])) |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
335 { |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
336 target[name] = v; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
337 } |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
338 return true; |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
339 } |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
340 else |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
341 { |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
342 return false; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
343 } |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
344 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
345 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
346 case DataType_Float: |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
347 { |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
348 std::vector<std::string> tokens; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
349 Orthanc::Toolbox::TokenizeString(tokens, value.asString(), '\\'); |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
350 |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
351 if (!tokens.empty()) |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
352 { |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
353 float v; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
354 if (Orthanc::SerializationToolbox::ParseFloat(v, tokens[0])) |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
355 { |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
356 target[name] = v; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
357 } |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
358 return true; |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
359 } |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
360 else |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
361 { |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
362 return false; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
363 } |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
364 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
365 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
366 case DataType_ListOfStrings: |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
367 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
368 std::vector<std::string> tokens; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
369 Orthanc::Toolbox::TokenizeString(tokens, value.asString(), '\\'); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
370 target[name] = Json::arrayValue; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
371 for (size_t i = 0; i < tokens.size(); i++) |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
372 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
373 target[name].append(tokens[i]); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
374 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
375 return true; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
376 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
377 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
378 case DataType_ListOfFloats: |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
379 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
380 std::vector<std::string> tokens; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
381 Orthanc::Toolbox::TokenizeString(tokens, value.asString(), '\\'); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
382 target[name] = Json::arrayValue; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
383 for (size_t i = 0; i < tokens.size(); i++) |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
384 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
385 float v; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
386 if (Orthanc::SerializationToolbox::ParseFloat(v, tokens[i])) |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
387 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
388 target[name].append(v); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
389 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
390 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
391 return true; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
392 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
393 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
394 default: |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
395 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
396 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
397 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
398 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
399 default: |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
400 // This should never happen |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
401 return false; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
402 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
403 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
404 else |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
405 { |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
406 return false; |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
407 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
408 } |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
409 |
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
410 |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
411 static bool EncodeOhifInstance(Json::Value& target, |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
412 const std::string& instanceId) |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
413 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
414 Json::Value source; |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
415 if (!OrthancPlugins::RestApiGet(source, "/instances/" + instanceId + "/tags?short", false)) |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
416 { |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
417 return false; |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
418 } |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
419 else if (source.type() != Json::objectValue) |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
420 { |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
421 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
422 } |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
423 else |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
424 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
425 target[KEY_VERSION] = static_cast<int>(METADATA_VERSION); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
426 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
427 for (TagsDictionary::const_iterator it = allTags_.begin(); it != allTags_.end(); ++it) |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
428 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
429 ParseTagFromOrthanc(target, it->first, it->first.Format(), it->second.GetType(), source); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
430 } |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
431 |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
432 /** |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
433 * This is a sequence for PET scans that is manually injected, to be |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
434 * used in function "getPTImageIdInstanceMetadata()" of |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
435 * "extensions/default/src/getPTImageIdInstanceMetadata.ts" |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
436 **/ |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
437 static const Orthanc::DicomTag RADIONUCLIDE_HALF_LIFE(0x0018, 0x1075); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
438 static const Orthanc::DicomTag RADIONUCLIDE_TOTAL_DOSE(0x0018, 0x1074); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
439 static const Orthanc::DicomTag RADIOPHARMACEUTICAL_START_DATETIME(0x0018, 0x1078); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
440 static const Orthanc::DicomTag RADIOPHARMACEUTICAL_START_TIME(0x0018, 0x1072); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
441 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
442 if (source.isMember(RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE.Format())) |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
443 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
444 const Json::Value& pharma = source[RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE.Format()]; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
445 if (pharma.type() == Json::arrayValue && |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
446 pharma.size() > 0 && |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
447 pharma[0].type() == Json::objectValue) |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
448 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
449 Json::Value info; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
450 if (ParseTagFromOrthanc(info, RADIONUCLIDE_HALF_LIFE, "RadionuclideHalfLife", DataType_Float, pharma[0]) && |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
451 ParseTagFromOrthanc(info, RADIONUCLIDE_TOTAL_DOSE, "RadionuclideTotalDose", DataType_Float, pharma[0]) && |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
452 (ParseTagFromOrthanc(info, RADIOPHARMACEUTICAL_START_DATETIME, "RadiopharmaceuticalStartDateTime", DataType_String, pharma[0]) || |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
453 ParseTagFromOrthanc(info, RADIOPHARMACEUTICAL_START_TIME, "RadiopharmaceuticalStartTime", DataType_String, pharma[0]))) |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
454 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
455 Json::Value sequence = Json::arrayValue; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
456 sequence.append(info); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
457 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
458 target[RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE.Format()] = sequence; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
459 } |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
460 } |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
461 } |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
462 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
463 return true; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
464 } |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
465 } |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
466 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
467 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
468 static std::string GetCacheUri(const std::string& instanceId) |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
469 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
470 return "/instances/" + instanceId + "/metadata/" + METADATA_OHIF; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
471 } |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
472 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
473 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
474 static void CacheAsMetadata(const Json::Value& instanceTags, |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
475 const std::string& instanceId) |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
476 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
477 std::string uncompressed; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
478 Orthanc::Toolbox::WriteFastJson(uncompressed, instanceTags); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
479 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
480 std::string compressed; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
481 Orthanc::GzipCompressor compressor; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
482 Orthanc::IBufferCompressor::Compress(compressed, compressor, uncompressed); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
483 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
484 std::string metadata; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
485 Orthanc::Toolbox::EncodeBase64(metadata, compressed); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
486 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
487 Json::Value answer; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
488 OrthancPlugins::RestApiPut(answer, GetCacheUri(instanceId), metadata.c_str(), metadata.size(), false); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
489 } |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
490 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
491 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
492 static bool GetOhifInstance(Json::Value& target, |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
493 const std::string& instanceId) |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
494 { |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
495 #if 0 |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
496 // This disables all the caching (for debugging) |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
497 return EncodeOhifInstance(target, instanceId); |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
498 #else |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
499 const std::string uri = GetCacheUri(instanceId); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
500 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
501 std::string metadata; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
502 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
503 if (OrthancPlugins::RestApiGetString(metadata, uri, false)) |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
504 { |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
505 try |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
506 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
507 std::string compressed; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
508 Orthanc::Toolbox::DecodeBase64(compressed, metadata); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
509 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
510 std::string uncompressed; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
511 Orthanc::GzipCompressor compressor; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
512 Orthanc::IBufferCompressor::Uncompress(uncompressed, compressor, compressed); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
513 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
514 if (Orthanc::Toolbox::ReadJson(target, uncompressed) && |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
515 target.isMember(KEY_VERSION) && |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
516 target[KEY_VERSION].type() == Json::intValue && |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
517 target[KEY_VERSION].asInt() == METADATA_VERSION) |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
518 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
519 // Success, we can reuse the cached value |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
520 return true; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
521 } |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
522 } |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
523 catch (Orthanc::OrthancException&) |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
524 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
525 } |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
526 |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
527 // Remove corrupted or metadata with an earlier version |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
528 OrthancPlugins::RestApiDelete(uri, false); |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
529 } |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
530 |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
531 if (EncodeOhifInstance(target, instanceId)) |
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
532 { |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
533 CacheAsMetadata(target, instanceId); |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
534 return true; |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
535 } |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
536 else |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
537 { |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
538 return false; |
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
539 } |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
540 #endif |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
541 } |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
542 |
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
543 |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
544 static ResourcesCache cache_; |
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
545 static std::string userConfiguration_; |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
546 static std::string routerBasename_; |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
547 static DataSource dataSource_; |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
548 static bool preload_; |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
549 static boost::thread metadataThread_; |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
550 static Orthanc::SharedMessageQueue pendingInstances_; |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
551 static bool continueThread_; |
0 | 552 |
553 void ServeFile(OrthancPluginRestOutput* output, | |
554 const char* url, | |
555 const OrthancPluginHttpRequest* request) | |
556 { | |
557 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); | |
558 | |
559 // The next 3 HTTP headers are required to enable SharedArrayBuffer | |
560 // (https://web.dev/coop-coep/) | |
561 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Embedder-Policy", "require-corp"); | |
562 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Opener-Policy", "same-origin"); | |
563 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Resource-Policy", "same-origin"); | |
564 | |
6
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
565 std::string uri; |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
566 if (request->groupsCount > 0) |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
567 { |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
568 uri = request->groups[0]; |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
569 } |
0 | 570 |
571 if (uri == "app-config.js") | |
572 { | |
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
573 std::string system; |
0 | 574 Orthanc::EmbeddedResources::GetFileResource(system, Orthanc::EmbeddedResources::APP_CONFIG_SYSTEM); |
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
575 |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
576 std::map<std::string, std::string> dictionary; |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
577 dictionary["ROUTER_BASENAME"] = routerBasename_; |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
578 dictionary["USE_DICOM_WEB"] = (dataSource_ == DataSource_DicomWeb ? "true" : "false"); |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
579 |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
580 system = Orthanc::Toolbox::SubstituteVariables(system, dictionary); |
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
581 |
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
582 std::string s = (userConfiguration_ + "\n" + system); |
27
bf4e5434567c
Fixed wrong MIME type for app-config.js that prevents the OHIF viewer from loading with Orthanc 1.12.2
Alain Mazy <am@osimis.io>
parents:
13
diff
changeset
|
583 OrthancPluginAnswerBuffer(context, output, s.c_str(), s.size(), "text/javascript"); |
0 | 584 } |
36
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
585 else if (uri == "" || // Study list |
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
586 uri == "tmtv" || // Total metabolic tumor volume |
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
587 uri == "viewer" || // Default viewer (including MPR) |
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
588 uri == "segmentation" || // Segmentation mode |
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
589 uri == "microscopy" // Microscopy mode |
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
590 ) |
6
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
591 { |
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
592 // 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
|
593 // https://v3-docs.ohif.org/platform/modes/ |
0 | 594 cache_.Answer(context, output, "index.html"); |
595 } | |
596 else | |
597 { | |
598 cache_.Answer(context, output, uri); | |
599 } | |
600 } | |
601 | |
602 | |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
603 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
|
604 const std::string& studyId) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
605 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
606 // 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
|
607 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
|
608 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
|
609 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
|
610 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
|
611 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
|
612 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
613 Json::Value instancesIds; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
614 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
|
615 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
616 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
|
617 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
618 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
619 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
|
620 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
621 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
|
622 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
623 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
624 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
|
625 instancesTags.reserve(instancesIds.size()); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
626 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
627 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
|
628 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
629 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
|
630 !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
|
631 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
|
632 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
633 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
|
634 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
635 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
636 Json::Value t; |
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
637 if (GetOhifInstance(t, instancesIds[i][KEY_ID].asString())) |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
638 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
639 instancesTags.push_back(t); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
640 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
641 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
642 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
643 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
|
644 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
|
645 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
646 MapOfResources studies; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
647 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
|
648 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
649 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
|
650 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
651 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
|
652 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
653 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
|
654 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
655 else |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
656 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
657 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
|
658 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
|
659 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
660 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
661 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
662 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
663 target["studies"] = Json::arrayValue; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
664 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
665 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
|
666 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
667 if (!it->second.empty()) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
668 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
669 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
|
670 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
|
671 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
672 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
|
673 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
|
674 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
675 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
|
676 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
677 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
|
678 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
679 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
680 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
681 MapOfResources seriesInStudy; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
682 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
|
683 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
684 assert(*it2 != NULL); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
685 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
|
686 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
687 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
|
688 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
689 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
|
690 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
691 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
|
692 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
693 else |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
694 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
695 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
|
696 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
|
697 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
698 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
699 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
700 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
701 study["series"] = Json::arrayValue; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
702 |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
703 std::set<std::string> modalities; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
704 unsigned int countInstances = 0; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
705 |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
706 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
|
707 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
708 if (!it3->second.empty()) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
709 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
710 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
|
711 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
|
712 |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
713 if (firstInstanceInSeries.isMember(Orthanc::DICOM_TAG_MODALITY.Format())) |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
714 { |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
715 modalities.insert(firstInstanceInSeries[Orthanc::DICOM_TAG_MODALITY.Format()].asString()); |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
716 } |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
717 |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
718 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
|
719 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
|
720 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
721 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
|
722 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
723 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
|
724 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
725 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
726 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
727 series["instances"] = Json::arrayValue; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
728 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
729 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
|
730 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
731 assert(*it4 != NULL); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
732 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
|
733 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
734 Json::Value metadata; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
735 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
|
736 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
737 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
|
738 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
739 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
|
740 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
741 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
742 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
743 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
|
744 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
|
745 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
|
746 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
|
747 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
748 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
|
749 instance["metadata"] = metadata; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
750 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
|
751 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
752 series["instances"].append(instance); |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
753 countInstances++; |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
754 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
755 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
756 study["series"].append(series); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
757 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
758 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
759 |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
760 std::string jsonModalities; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
761 for (std::set<std::string>::const_iterator it = modalities.begin(); it != modalities.end(); ++it) |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
762 { |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
763 if (!jsonModalities.empty()) |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
764 { |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
765 jsonModalities += ","; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
766 } |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
767 jsonModalities += *it; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
768 } |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
769 |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
770 study["NumInstances"] = countInstances; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
771 study["Modalities"] = jsonModalities; |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
772 |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
773 target["studies"].append(study); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
774 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
775 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
776 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
777 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
778 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
779 void GetOhifStudy(OrthancPluginRestOutput* output, |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
780 const char* url, |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
781 const OrthancPluginHttpRequest* request) |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
782 { |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
783 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
784 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
785 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
|
786 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
787 Json::Value v; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
788 GenerateOhifStudy(v, studyId); |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
789 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
790 std::string s; |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
791 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
|
792 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
793 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
|
794 } |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
795 |
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
796 |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
797 static void MetadataThread() |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
798 { |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
799 while (continueThread_) |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
800 { |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
801 std::unique_ptr<Orthanc::IDynamicObject> instance(pendingInstances_.Dequeue(100)); |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
802 if (instance.get() != NULL) |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
803 { |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
804 const std::string instanceId = dynamic_cast<Orthanc::SingleValueObject<std::string>&>(*instance).GetValue(); |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
805 const std::string uri = GetCacheUri(instanceId); |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
806 |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
807 Json::Value instanceTags; |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
808 std::string metadata; |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
809 if (!OrthancPlugins::RestApiGetString(metadata, uri, false) && |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
810 EncodeOhifInstance(instanceTags, instanceId)) |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
811 { |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
812 CacheAsMetadata(instanceTags, instanceId); |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
813 } |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
814 } |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
815 } |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
816 } |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
817 |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
818 |
0 | 819 OrthancPluginErrorCode OnChangeCallback(OrthancPluginChangeType changeType, |
820 OrthancPluginResourceType resourceType, | |
821 const char* resourceId) | |
822 { | |
823 try | |
824 { | |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
825 switch (changeType) |
0 | 826 { |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
827 case OrthancPluginChangeType_OrthancStarted: |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
828 { |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
829 continueThread_ = true; |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
830 |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
831 switch (dataSource_) |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
832 { |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
833 case DataSource_DicomWeb: |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
834 { |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
835 Json::Value info; |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
836 if (!OrthancPlugins::RestApiGet(info, "/plugins/dicom-web", false)) |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
837 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
838 throw Orthanc::OrthancException( |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
839 Orthanc::ErrorCode_InternalError, |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
840 "The OHIF plugin requires the DICOMweb plugin to be installed"); |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
841 } |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
842 |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
843 if (info.type() != Json::objectValue || |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
844 !info.isMember("ID") || |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
845 !info.isMember("Version") || |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
846 info["ID"].type() != Json::stringValue || |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
847 info["Version"].type() != Json::stringValue || |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
848 info["ID"].asString() != "dicom-web") |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
849 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
850 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
851 "The DICOMweb plugin is required by OHIF, but is not properly installed"); |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
852 } |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
853 |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
854 break; |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
855 } |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
856 |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
857 case DataSource_DicomJson: |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
858 { |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
859 if (preload_) |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
860 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
861 metadataThread_ = boost::thread(MetadataThread); |
43
f3dc8ecf4349
using the new primitives for logging in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
39
diff
changeset
|
862 ORTHANC_PLUGINS_LOG_INFO("Started the OHIF preload thread"); |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
863 } |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
864 else |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
865 { |
43
f3dc8ecf4349
using the new primitives for logging in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
39
diff
changeset
|
866 ORTHANC_PLUGINS_LOG_INFO("The OHIF preload thread was not started, as indicated in the configuration file"); |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
867 } |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
868 break; |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
869 } |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
870 |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
871 default: |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
872 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
873 } |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
874 |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
875 break; |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
876 } |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
877 |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
878 case OrthancPluginChangeType_OrthancStopped: |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
879 { |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
880 continueThread_ = false; |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
881 |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
882 if (metadataThread_.joinable()) |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
883 { |
43
f3dc8ecf4349
using the new primitives for logging in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
39
diff
changeset
|
884 ORTHANC_PLUGINS_LOG_INFO("Stopping the OHIF preload thread"); |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
885 metadataThread_.join(); |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
886 } |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
887 break; |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
888 } |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
889 |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
890 case OrthancPluginChangeType_NewInstance: |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
891 { |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
892 if (metadataThread_.joinable() && |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
893 pendingInstances_.GetSize() < MAX_INSTANCES_IN_QUEUE) /* avoid overwhelming Orthanc */ |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
894 { |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
895 pendingInstances_.Enqueue(new Orthanc::SingleValueObject<std::string>(resourceId)); |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
896 } |
4
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
897 |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
898 break; |
0 | 899 } |
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
900 |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
901 default: |
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
902 break; |
0 | 903 } |
904 } | |
905 catch (Orthanc::OrthancException& e) | |
906 { | |
43
f3dc8ecf4349
using the new primitives for logging in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
39
diff
changeset
|
907 ORTHANC_PLUGINS_LOG_ERROR("Exception: " + std::string(e.What())); |
0 | 908 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); |
909 } | |
910 | |
911 return OrthancPluginErrorCode_Success; | |
912 } | |
913 | |
914 | |
915 extern "C" | |
916 { | |
917 ORTHANC_PLUGINS_API int32_t OrthancPluginInitialize(OrthancPluginContext* context) | |
918 { | |
43
f3dc8ecf4349
using the new primitives for logging in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
39
diff
changeset
|
919 OrthancPlugins::SetGlobalContext(context, ORTHANC_PLUGIN_NAME); |
0 | 920 |
44
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
921 #if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 4) |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
922 Orthanc::Logging::InitializePluginContext(context, ORTHANC_PLUGIN_NAME); |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
923 #elif ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 7, 2) |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
924 Orthanc::Logging::InitializePluginContext(context); |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
925 #else |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
926 Orthanc::Logging::Initialize(context); |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
927 #endif |
9afd691bfb74
added tags: RescaleIntercept, RescaleSlope, and NumberOfFrames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
928 |
0 | 929 /* Check the version of the Orthanc core */ |
930 if (OrthancPluginCheckVersion(context) == 0) | |
931 { | |
932 char info[1024]; | |
933 sprintf(info, "Your version of Orthanc (%s) must be above %d.%d.%d to run this plugin", | |
934 context->orthancVersion, | |
935 ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER, | |
936 ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER, | |
937 ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER); | |
938 OrthancPluginLogError(context, info); | |
939 return -1; | |
940 } | |
941 | |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
942 try |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
943 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
944 InitializeOhifTags(); |
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
945 |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
946 OrthancPlugins::OrthancConfiguration configuration; |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
947 |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
948 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
949 OrthancPlugins::OrthancConfiguration globalConfiguration; |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
950 globalConfiguration.GetSection(configuration, "OHIF"); |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
951 } |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
952 |
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
953 routerBasename_ = configuration.GetStringValue("RouterBasename", "/ohif/"); |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
954 std::string s = configuration.GetStringValue("DataSource", "dicom-json"); |
13
4ef286d0f78e
renamed "Configuration" as "UserConfiguration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
955 std::string userConfigurationPath = configuration.GetStringValue("UserConfiguration", ""); |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
956 preload_ = configuration.GetBooleanValue("Preload", true); |
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
957 |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
958 if (s == "dicom-web") |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
959 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
960 dataSource_ = DataSource_DicomWeb; |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
961 } |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
962 else if (s == "dicom-json") |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
963 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
964 dataSource_ = DataSource_DicomJson; |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
965 } |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
966 else |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
967 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
968 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange, |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
969 "Configuration option \"OHIF.DataSource\" must be either " |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
970 "\"dicomweb\" or \"dicom-json\", but found: " + s); |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
971 } |
6
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
972 |
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
973 if (userConfigurationPath.empty()) |
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
974 { |
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
975 Orthanc::EmbeddedResources::GetFileResource(userConfiguration_, Orthanc::EmbeddedResources::APP_CONFIG_USER); |
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
976 } |
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
977 else |
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
978 { |
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
979 Orthanc::SystemToolbox::ReadFile(userConfiguration_, userConfigurationPath); |
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
980 } |
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
981 |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
982 // Make sure that the router basename ends with a trailing slash |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
983 if (routerBasename_.empty() || |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
984 routerBasename_[routerBasename_.size() - 1] != '/') |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
985 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
986 routerBasename_ += "/"; |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
987 } |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
988 |
38
fae02fc69b46
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
37
diff
changeset
|
989 OrthancPlugins::SetDescription(ORTHANC_PLUGIN_NAME, "OHIF plugin for Orthanc."); |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
990 |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
991 OrthancPlugins::RegisterRestCallback<ServeFile>("/ohif", true); |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
992 OrthancPlugins::RegisterRestCallback<ServeFile>("/ohif/(.*)", true); |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
993 OrthancPlugins::RegisterRestCallback<GetOhifStudy>("/studies/([0-9a-f-]+)/ohif-dicom-json", true); |
0 | 994 |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
995 OrthancPluginRegisterOnChangeCallback(context, OnChangeCallback); |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
996 |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
997 { |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
998 // Extend the default Orthanc Explorer with custom JavaScript for OHIF |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
999 std::string explorer; |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
1000 Orthanc::EmbeddedResources::GetFileResource(explorer, Orthanc::EmbeddedResources::ORTHANC_EXPLORER); |
0 | 1001 |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
1002 std::map<std::string, std::string> dictionary; |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
1003 dictionary["USE_DICOM_WEB"] = (dataSource_ == DataSource_DicomWeb ? "true" : "false"); |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
1004 explorer = Orthanc::Toolbox::SubstituteVariables(explorer, dictionary); |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
1005 |
39 | 1006 OrthancPlugins::ExtendOrthancExplorer(ORTHANC_PLUGIN_NAME, explorer); |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
1007 } |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
1008 } |
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
1009 catch (Orthanc::OrthancException& e) |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
1010 { |
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
1011 return -1; |
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
1012 } |
0 | 1013 |
1014 return 0; | |
1015 } | |
1016 | |
1017 | |
1018 ORTHANC_PLUGINS_API void OrthancPluginFinalize() | |
1019 { | |
1020 } | |
1021 | |
1022 | |
1023 ORTHANC_PLUGINS_API const char* OrthancPluginGetName() | |
1024 { | |
38
fae02fc69b46
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
37
diff
changeset
|
1025 return ORTHANC_PLUGIN_NAME; |
0 | 1026 } |
1027 | |
1028 | |
1029 ORTHANC_PLUGINS_API const char* OrthancPluginGetVersion() | |
1030 { | |
1031 return ORTHANC_OHIF_VERSION; | |
1032 } | |
1033 } |