Mercurial > hg > orthanc-ohif
annotate Sources/Plugin.cpp @ 41:2753b5eeacb1
added CITATION.cff
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sat, 06 Apr 2024 17:27:21 +0200 |
| parents | a63247d45917 |
| children | f3dc8ecf4349 |
| 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> |
| 0 | 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 |
|
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
117 **/ |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
118 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
|
119 ohifStudyTags_[Orthanc::DICOM_TAG_STUDY_DATE] = TagInformation(DataType_String, "StudyDate"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
120 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
|
121 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
|
122 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_NAME] = TagInformation(DataType_String, "PatientName"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
123 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_ID] = TagInformation(DataType_String, "PatientID"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
124 ohifStudyTags_[Orthanc::DICOM_TAG_ACCESSION_NUMBER] = TagInformation(DataType_String, "AccessionNumber"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
125 ohifStudyTags_[Orthanc::DicomTag(0x0010, 0x1010)] = TagInformation(DataType_String, "PatientAge"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
126 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_SEX] = TagInformation(DataType_String, "PatientSex"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
127 |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
128 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
|
129 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
|
130 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
|
131 ohifSeriesTags_[Orthanc::DICOM_TAG_MODALITY] = TagInformation(DataType_String, "Modality"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
132 ohifSeriesTags_[Orthanc::DICOM_TAG_SLICE_THICKNESS] = TagInformation(DataType_Float, "SliceThickness"); |
|
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 ohifInstanceTags_[Orthanc::DICOM_TAG_COLUMNS] = TagInformation(DataType_Integer, "Columns"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
135 ohifInstanceTags_[Orthanc::DICOM_TAG_ROWS] = TagInformation(DataType_Integer, "Rows"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
136 ohifInstanceTags_[Orthanc::DICOM_TAG_INSTANCE_NUMBER] = TagInformation(DataType_Integer, "InstanceNumber"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
137 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
|
138 ohifInstanceTags_[Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION] = TagInformation(DataType_String, "PhotometricInterpretation"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
139 ohifInstanceTags_[Orthanc::DICOM_TAG_BITS_ALLOCATED] = TagInformation(DataType_Integer, "BitsAllocated"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
140 ohifInstanceTags_[Orthanc::DICOM_TAG_BITS_STORED] = TagInformation(DataType_Integer, "BitsStored"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
141 ohifInstanceTags_[Orthanc::DICOM_TAG_PIXEL_REPRESENTATION] = TagInformation(DataType_Integer, "PixelRepresentation"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
142 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
|
143 ohifInstanceTags_[Orthanc::DICOM_TAG_PIXEL_SPACING] = TagInformation(DataType_ListOfFloats, "PixelSpacing"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
144 ohifInstanceTags_[Orthanc::DICOM_TAG_HIGH_BIT] = TagInformation(DataType_Integer, "HighBit"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
145 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
|
146 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
|
147 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
|
148 ohifInstanceTags_[Orthanc::DicomTag(0x0008, 0x0008)] = TagInformation(DataType_ListOfStrings, "ImageType"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
149 ohifInstanceTags_[Orthanc::DICOM_TAG_MODALITY] = TagInformation(DataType_String, "Modality"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
150 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
|
151 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
|
152 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
|
153 ohifInstanceTags_[Orthanc::DICOM_TAG_WINDOW_CENTER] = TagInformation(DataType_Float, "WindowCenter"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
154 ohifInstanceTags_[Orthanc::DICOM_TAG_WINDOW_WIDTH] = TagInformation(DataType_Float, "WindowWidth"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
155 ohifInstanceTags_[Orthanc::DICOM_TAG_SERIES_DATE] = TagInformation(DataType_String, "SeriesDate"); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
156 |
|
7
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
157 /** |
|
eab054ee7537
added modal in Orthanc Explorer to choose between the OHIF viewers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
6
diff
changeset
|
158 * 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
|
159 * 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
|
160 * "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
|
161 **/ |
|
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
162 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
|
163 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
|
164 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
|
165 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
|
166 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
|
167 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
|
168 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
|
169 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
|
170 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
|
171 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
|
172 ohifInstanceTags_[RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE] = TagInformation(DataType_None, "RadiopharmaceuticalInformationSequence"); |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
173 |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
174 // UNTESTED |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
175 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
|
176 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
|
177 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
|
178 |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
179 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
|
180 { |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
181 assert(allTags_.find(it->first) == allTags_.end() || |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
182 allTags_[it->first] == it->second); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
183 allTags_[it->first] = it->second; |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
184 } |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
185 |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
186 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
|
187 { |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
188 assert(allTags_.find(it->first) == allTags_.end() || |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
189 allTags_[it->first] == it->second); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
190 allTags_[it->first] = it->second; |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
191 } |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
192 |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
193 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
|
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 |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
201 |
| 0 | 202 // Forward declaration |
| 203 void ReadStaticAsset(std::string& target, | |
| 204 const std::string& path); | |
| 205 | |
| 206 | |
| 207 /** | |
| 208 * As the OHIF static assets are gzipped by the "EmbedStaticAssets.py" | |
| 209 * script, we use a cache to maintain the uncompressed assets in order | |
| 210 * to avoid multiple gzip decodings. | |
| 211 **/ | |
| 212 class ResourcesCache : public boost::noncopyable | |
| 213 { | |
| 214 private: | |
| 215 typedef std::map<std::string, std::string*> Content; | |
| 216 | |
| 217 boost::shared_mutex mutex_; | |
| 218 Content content_; | |
| 219 | |
| 220 public: | |
| 221 ~ResourcesCache() | |
| 222 { | |
| 223 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) | |
| 224 { | |
| 225 assert(it->second != NULL); | |
| 226 delete it->second; | |
| 227 } | |
| 228 } | |
| 229 | |
| 230 void Answer(OrthancPluginContext* context, | |
| 231 OrthancPluginRestOutput* output, | |
| 232 const std::string& path) | |
| 233 { | |
| 234 const std::string mime = Orthanc::EnumerationToString(Orthanc::SystemToolbox::AutodetectMimeType(path)); | |
| 235 | |
| 236 { | |
| 237 // Check whether the cache already contains the resource | |
| 238 boost::shared_lock<boost::shared_mutex> lock(mutex_); | |
| 239 | |
| 240 Content::const_iterator found = content_.find(path); | |
| 241 | |
| 242 if (found != content_.end()) | |
| 243 { | |
| 244 assert(found->second != NULL); | |
| 245 OrthancPluginAnswerBuffer(context, output, found->second->c_str(), found->second->size(), mime.c_str()); | |
| 246 return; | |
| 247 } | |
| 248 } | |
| 249 | |
| 250 // This resource has not been cached yet | |
| 251 | |
| 252 std::unique_ptr<std::string> item(new std::string); | |
| 253 ReadStaticAsset(*item, path); | |
|
33
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
254 |
|
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
255 // patch OHIF for https://github.com/OHIF/Viewers/issues/3928 |
| 37 | 256 // 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
|
257 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
|
258 { |
|
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
259 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
|
260 } |
|
1c8515124f27
patch OHIF for https://github.com/OHIF/Viewers/issues/3928
Alain Mazy <am@osimis.io>
parents:
30
diff
changeset
|
261 |
| 0 | 262 OrthancPluginAnswerBuffer(context, output, item->c_str(), item->size(), mime.c_str()); |
| 263 | |
| 264 { | |
| 265 // Store the resource into the cache | |
| 266 boost::unique_lock<boost::shared_mutex> lock(mutex_); | |
| 267 | |
| 268 if (content_.find(path) == content_.end()) | |
| 269 { | |
| 270 content_[path] = item.release(); | |
| 271 } | |
| 272 } | |
| 273 } | |
| 274 }; | |
| 275 | |
| 276 | |
|
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
277 static bool ParseTagFromOrthanc(Json::Value& target, |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
278 const Orthanc::DicomTag& tag, |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
279 const std::string& name, |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
280 DataType type, |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
281 const Json::Value& source) |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
282 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
283 const std::string formattedTag = tag.Format(); |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
284 |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
285 if (source.isMember(formattedTag)) |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
286 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
287 const Json::Value& value = source[formattedTag]; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
288 |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
289 /** |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
290 * The cases below derive from "Toolbox::SimplifyDicomAsJson()" |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
291 * 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
|
292 * API call to "/instances/.../tags?short". |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
293 **/ |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
294 |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
295 switch (value.type()) |
|
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 case Json::nullValue: |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
298 return false; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
299 |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
300 case Json::arrayValue: |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
301 // 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
|
302 return false; |
|
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 case Json::stringValue: |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
305 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
306 switch (type) |
|
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 case DataType_String: |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
309 target[name] = value; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
310 return true; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
311 |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
312 case DataType_Integer: |
|
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 int32_t v; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
315 if (Orthanc::SerializationToolbox::ParseInteger32(v, value.asString())) |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
316 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
317 target[name] = v; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
318 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
319 return true; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
320 } |
|
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_Float: |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
323 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
324 float v; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
325 if (Orthanc::SerializationToolbox::ParseFloat(v, value.asString())) |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
326 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
327 target[name] = v; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
328 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
329 return true; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
330 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
331 |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
332 case DataType_ListOfStrings: |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
333 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
334 std::vector<std::string> tokens; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
335 Orthanc::Toolbox::TokenizeString(tokens, value.asString(), '\\'); |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
336 target[name] = Json::arrayValue; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
337 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
|
338 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
339 target[name].append(tokens[i]); |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
340 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
341 return true; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
342 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
343 |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
344 case DataType_ListOfFloats: |
|
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 std::vector<std::string> tokens; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
347 Orthanc::Toolbox::TokenizeString(tokens, value.asString(), '\\'); |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
348 target[name] = Json::arrayValue; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
349 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
|
350 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
351 float v; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
352 if (Orthanc::SerializationToolbox::ParseFloat(v, tokens[i])) |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
353 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
354 target[name].append(v); |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
355 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
356 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
357 return true; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
358 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
359 |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
360 default: |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
361 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
362 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
363 } |
|
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 default: |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
366 // This should never happen |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
367 return false; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
368 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
369 } |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
370 else |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
371 { |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
372 return false; |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
373 } |
|
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 |
|
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
376 |
|
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
377 static bool EncodeOhifInstance(Json::Value& target, |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
378 const std::string& instanceId) |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
379 { |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
380 Json::Value source; |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
381 if (!OrthancPlugins::RestApiGet(source, "/instances/" + instanceId + "/tags?short", false)) |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
382 { |
|
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
383 return false; |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
384 } |
|
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
385 else if (source.type() != Json::objectValue) |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
386 { |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
387 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
388 } |
|
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
389 else |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
390 { |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
391 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
|
392 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
393 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
|
394 { |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
395 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
|
396 } |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
397 |
|
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
398 /** |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
399 * 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
|
400 * used in function "getPTImageIdInstanceMetadata()" of |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
401 * "extensions/default/src/getPTImageIdInstanceMetadata.ts" |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
402 **/ |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
403 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
|
404 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
|
405 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
|
406 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
|
407 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
408 if (source.isMember(RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE.Format())) |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
409 { |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
410 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
|
411 if (pharma.type() == Json::arrayValue && |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
412 pharma.size() > 0 && |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
413 pharma[0].type() == Json::objectValue) |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
414 { |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
415 Json::Value info; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
416 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
|
417 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
|
418 (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
|
419 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
|
420 { |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
421 Json::Value sequence = Json::arrayValue; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
422 sequence.append(info); |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
423 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
424 target[RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE.Format()] = sequence; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
425 } |
|
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 } |
|
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 return true; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
430 } |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
431 } |
|
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 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
434 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
|
435 { |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
436 return "/instances/" + instanceId + "/metadata/" + METADATA_OHIF; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
437 } |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
438 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
439 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
440 static void CacheAsMetadata(const Json::Value& instanceTags, |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
441 const std::string& instanceId) |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
442 { |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
443 std::string uncompressed; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
444 Orthanc::Toolbox::WriteFastJson(uncompressed, instanceTags); |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
445 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
446 std::string compressed; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
447 Orthanc::GzipCompressor compressor; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
448 Orthanc::IBufferCompressor::Compress(compressed, compressor, uncompressed); |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
449 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
450 std::string metadata; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
451 Orthanc::Toolbox::EncodeBase64(metadata, compressed); |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
452 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
453 Json::Value answer; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
454 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
|
455 } |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
456 |
|
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 static bool GetOhifInstance(Json::Value& target, |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
459 const std::string& instanceId) |
|
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 const std::string uri = GetCacheUri(instanceId); |
|
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 std::string metadata; |
|
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 if (OrthancPlugins::RestApiGetString(metadata, uri, false)) |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
466 { |
|
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
467 try |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
468 { |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
469 std::string compressed; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
470 Orthanc::Toolbox::DecodeBase64(compressed, metadata); |
|
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 std::string uncompressed; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
473 Orthanc::GzipCompressor compressor; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
474 Orthanc::IBufferCompressor::Uncompress(uncompressed, compressor, compressed); |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
475 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
476 if (Orthanc::Toolbox::ReadJson(target, uncompressed) && |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
477 target.isMember(KEY_VERSION) && |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
478 target[KEY_VERSION].type() == Json::intValue && |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
479 target[KEY_VERSION].asInt() == METADATA_VERSION) |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
480 { |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
481 // Success, we can reuse the cached value |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
482 return true; |
|
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 } |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
485 catch (Orthanc::OrthancException&) |
|
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 } |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
488 |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
489 // 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
|
490 OrthancPlugins::RestApiDelete(uri, false); |
|
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
491 } |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
492 |
|
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
493 if (EncodeOhifInstance(target, instanceId)) |
|
8
cc4c81d08bf0
added missing tags for PET
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
494 { |
|
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
495 CacheAsMetadata(target, instanceId); |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
496 return true; |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
497 } |
|
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
498 else |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
499 { |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
500 return false; |
|
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
501 } |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
502 } |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
503 |
|
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
504 |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
505 static ResourcesCache cache_; |
|
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
506 static std::string userConfiguration_; |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
507 static std::string routerBasename_; |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
508 static DataSource dataSource_; |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
509 static bool preload_; |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
510 static boost::thread metadataThread_; |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
511 static Orthanc::SharedMessageQueue pendingInstances_; |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
512 static bool continueThread_; |
| 0 | 513 |
| 514 void ServeFile(OrthancPluginRestOutput* output, | |
| 515 const char* url, | |
| 516 const OrthancPluginHttpRequest* request) | |
| 517 { | |
| 518 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); | |
| 519 | |
| 520 // The next 3 HTTP headers are required to enable SharedArrayBuffer | |
| 521 // (https://web.dev/coop-coep/) | |
| 522 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Embedder-Policy", "require-corp"); | |
| 523 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Opener-Policy", "same-origin"); | |
| 524 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Resource-Policy", "same-origin"); | |
| 525 | |
|
6
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
526 std::string uri; |
|
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
527 if (request->groupsCount > 0) |
|
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
528 { |
|
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
529 uri = request->groups[0]; |
|
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
530 } |
| 0 | 531 |
| 532 if (uri == "app-config.js") | |
| 533 { | |
|
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
534 std::string system; |
| 0 | 535 Orthanc::EmbeddedResources::GetFileResource(system, Orthanc::EmbeddedResources::APP_CONFIG_SYSTEM); |
|
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
536 |
|
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
537 std::map<std::string, std::string> dictionary; |
|
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
538 dictionary["ROUTER_BASENAME"] = routerBasename_; |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
539 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
|
540 |
|
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
541 system = Orthanc::Toolbox::SubstituteVariables(system, dictionary); |
|
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
542 |
|
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
543 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
|
544 OrthancPluginAnswerBuffer(context, output, s.c_str(), s.size(), "text/javascript"); |
| 0 | 545 } |
|
36
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
546 else if (uri == "" || // Study list |
|
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
547 uri == "tmtv" || // Total metabolic tumor volume |
|
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
548 uri == "viewer" || // Default viewer (including MPR) |
|
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
549 uri == "segmentation" || // Segmentation mode |
|
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
550 uri == "microscopy" // Microscopy mode |
|
5f8d66f7fa06
Enabled support for segmentation and microscopy modes
Alain Mazy <am@osimis.io>
parents:
33
diff
changeset
|
551 ) |
|
6
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
552 { |
|
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
553 // 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
|
554 // https://v3-docs.ohif.org/platform/modes/ |
| 0 | 555 cache_.Answer(context, output, "index.html"); |
| 556 } | |
| 557 else | |
| 558 { | |
| 559 cache_.Answer(context, output, uri); | |
| 560 } | |
| 561 } | |
| 562 | |
| 563 | |
|
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
564 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
|
565 const std::string& studyId) |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
566 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
567 // 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
|
568 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
|
569 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
|
570 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
|
571 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
|
572 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
|
573 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
574 Json::Value instancesIds; |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
575 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
|
576 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
577 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
|
578 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
579 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
580 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
|
581 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
582 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
|
583 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
584 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
585 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
|
586 instancesTags.reserve(instancesIds.size()); |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
587 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
588 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
|
589 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
590 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
|
591 !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
|
592 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
|
593 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
594 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
|
595 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
596 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
597 Json::Value t; |
|
9
e8dea04df69b
caching OHIF dicom-json as metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
598 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
|
599 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
600 instancesTags.push_back(t); |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
601 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
602 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
603 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
604 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
|
605 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
|
606 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
607 MapOfResources studies; |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
608 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
|
609 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
610 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
|
611 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
612 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
|
613 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
614 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
|
615 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
616 else |
|
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 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
|
619 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
|
620 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
621 } |
|
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 target["studies"] = Json::arrayValue; |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
625 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
626 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
|
627 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
628 if (!it->second.empty()) |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
629 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
630 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
|
631 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
|
632 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
633 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
|
634 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
|
635 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
636 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
|
637 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
638 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
|
639 } |
|
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 MapOfResources seriesInStudy; |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
643 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
|
644 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
645 assert(*it2 != NULL); |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
646 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
|
647 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
648 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
|
649 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
650 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
|
651 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
652 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
|
653 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
654 else |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
655 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
656 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
|
657 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
|
658 } |
|
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 study["series"] = Json::arrayValue; |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
663 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
664 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
|
665 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
666 if (!it3->second.empty()) |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
667 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
668 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
|
669 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
|
670 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
671 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
|
672 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
|
673 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
674 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
|
675 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
676 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
|
677 } |
|
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 series["instances"] = Json::arrayValue; |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
681 |
|
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 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
|
683 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
684 assert(*it4 != 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& instanceInSeries = **it4; |
|
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 Json::Value metadata; |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
688 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
|
689 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
690 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
|
691 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
692 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
|
693 } |
|
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 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
696 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
|
697 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
|
698 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
|
699 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
|
700 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
701 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
|
702 instance["metadata"] = metadata; |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
703 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
|
704 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
705 series["instances"].append(instance); |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
706 } |
|
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 study["series"].append(series); |
|
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 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
711 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
712 target["studies"].append(study); |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
713 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
714 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
715 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
716 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
717 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
718 void GetOhifStudy(OrthancPluginRestOutput* output, |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
719 const char* url, |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
720 const OrthancPluginHttpRequest* request) |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
721 { |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
722 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
723 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
724 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
|
725 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
726 Json::Value v; |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
727 GenerateOhifStudy(v, studyId); |
|
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 std::string s; |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
730 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
|
731 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
732 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
|
733 } |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
734 |
|
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
735 |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
736 static void MetadataThread() |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
737 { |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
738 while (continueThread_) |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
739 { |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
740 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
|
741 if (instance.get() != NULL) |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
742 { |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
743 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
|
744 const std::string uri = GetCacheUri(instanceId); |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
745 |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
746 Json::Value instanceTags; |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
747 std::string metadata; |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
748 if (!OrthancPlugins::RestApiGetString(metadata, uri, false) && |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
749 EncodeOhifInstance(instanceTags, instanceId)) |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
750 { |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
751 CacheAsMetadata(instanceTags, instanceId); |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
752 } |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
753 } |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
754 } |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
755 } |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
756 |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
757 |
| 0 | 758 OrthancPluginErrorCode OnChangeCallback(OrthancPluginChangeType changeType, |
| 759 OrthancPluginResourceType resourceType, | |
| 760 const char* resourceId) | |
| 761 { | |
| 762 try | |
| 763 { | |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
764 switch (changeType) |
| 0 | 765 { |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
766 case OrthancPluginChangeType_OrthancStarted: |
|
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
767 { |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
768 continueThread_ = true; |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
769 |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
770 switch (dataSource_) |
|
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
771 { |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
772 case DataSource_DicomWeb: |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
773 { |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
774 Json::Value info; |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
775 if (!OrthancPlugins::RestApiGet(info, "/plugins/dicom-web", false)) |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
776 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
777 throw Orthanc::OrthancException( |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
778 Orthanc::ErrorCode_InternalError, |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
779 "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
|
780 } |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
781 |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
782 if (info.type() != Json::objectValue || |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
783 !info.isMember("ID") || |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
784 !info.isMember("Version") || |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
785 info["ID"].type() != Json::stringValue || |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
786 info["Version"].type() != Json::stringValue || |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
787 info["ID"].asString() != "dicom-web") |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
788 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
789 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
790 "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
|
791 } |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
792 |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
793 break; |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
794 } |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
795 |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
796 case DataSource_DicomJson: |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
797 { |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
798 if (preload_) |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
799 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
800 metadataThread_ = boost::thread(MetadataThread); |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
801 LOG(INFO) << "Started the OHIF preload thread"; |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
802 } |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
803 else |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
804 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
805 LOG(INFO) << "The OHIF preload thread was not started, as indicated in the configuration file"; |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
806 } |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
807 break; |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
808 } |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
809 |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
810 default: |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
811 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
812 } |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
813 |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
814 break; |
|
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 case OrthancPluginChangeType_OrthancStopped: |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
818 { |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
819 continueThread_ = false; |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
820 |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
821 if (metadataThread_.joinable()) |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
822 { |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
823 LOG(INFO) << "Stopping the OHIF preload thread"; |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
824 metadataThread_.join(); |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
825 } |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
826 break; |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
827 } |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
828 |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
829 case OrthancPluginChangeType_NewInstance: |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
830 { |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
831 if (metadataThread_.joinable() && |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
832 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
|
833 { |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
834 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
|
835 } |
|
4
c34ecc350b32
upgraded the node docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3
diff
changeset
|
836 |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
837 break; |
| 0 | 838 } |
|
10
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
839 |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
840 default: |
|
5d5caf89eb5b
added thread to precompute metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
9
diff
changeset
|
841 break; |
| 0 | 842 } |
| 843 } | |
| 844 catch (Orthanc::OrthancException& e) | |
| 845 { | |
| 846 LOG(ERROR) << "Exception: " << e.What(); | |
| 847 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode()); | |
| 848 } | |
| 849 | |
| 850 return OrthancPluginErrorCode_Success; | |
| 851 } | |
| 852 | |
| 853 | |
| 854 extern "C" | |
| 855 { | |
| 856 ORTHANC_PLUGINS_API int32_t OrthancPluginInitialize(OrthancPluginContext* context) | |
| 857 { | |
| 858 OrthancPlugins::SetGlobalContext(context); | |
| 859 | |
| 860 /* Check the version of the Orthanc core */ | |
| 861 if (OrthancPluginCheckVersion(context) == 0) | |
| 862 { | |
| 863 char info[1024]; | |
| 864 sprintf(info, "Your version of Orthanc (%s) must be above %d.%d.%d to run this plugin", | |
| 865 context->orthancVersion, | |
| 866 ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER, | |
| 867 ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER, | |
| 868 ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER); | |
| 869 OrthancPluginLogError(context, info); | |
| 870 return -1; | |
| 871 } | |
| 872 | |
| 873 #if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 7, 2) | |
| 874 Orthanc::Logging::InitializePluginContext(context); | |
| 875 #else | |
| 876 Orthanc::Logging::Initialize(context); | |
| 877 #endif | |
| 878 | |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
879 try |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
880 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
881 InitializeOhifTags(); |
|
3
fdb8c6c420d0
skeleton for optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2
diff
changeset
|
882 |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
883 OrthancPlugins::OrthancConfiguration configuration; |
|
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
884 |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
885 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
886 OrthancPlugins::OrthancConfiguration globalConfiguration; |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
887 globalConfiguration.GetSection(configuration, "OHIF"); |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
888 } |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
889 |
|
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
890 routerBasename_ = configuration.GetStringValue("RouterBasename", "/ohif/"); |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
891 std::string s = configuration.GetStringValue("DataSource", "dicom-json"); |
|
13
4ef286d0f78e
renamed "Configuration" as "UserConfiguration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
892 std::string userConfigurationPath = configuration.GetStringValue("UserConfiguration", ""); |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
893 preload_ = configuration.GetBooleanValue("Preload", true); |
|
2
cbc4be362700
added configuration option "RouterBasename"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
894 |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
895 if (s == "dicom-web") |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
896 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
897 dataSource_ = DataSource_DicomWeb; |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
898 } |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
899 else if (s == "dicom-json") |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
900 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
901 dataSource_ = DataSource_DicomJson; |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
902 } |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
903 else |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
904 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
905 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange, |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
906 "Configuration option \"OHIF.DataSource\" must be either " |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
907 "\"dicomweb\" or \"dicom-json\", but found: " + s); |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
908 } |
|
6
e8e7ba4371e3
fix access to OHIF study list
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5
diff
changeset
|
909 |
|
12
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
910 if (userConfigurationPath.empty()) |
|
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
911 { |
|
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
912 Orthanc::EmbeddedResources::GetFileResource(userConfiguration_, Orthanc::EmbeddedResources::APP_CONFIG_USER); |
|
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
913 } |
|
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
914 else |
|
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
915 { |
|
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
916 Orthanc::SystemToolbox::ReadFile(userConfiguration_, userConfigurationPath); |
|
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
917 } |
|
6115cfbece79
added option "Configuration"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
11
diff
changeset
|
918 |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
919 // 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
|
920 if (routerBasename_.empty() || |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
921 routerBasename_[routerBasename_.size() - 1] != '/') |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
922 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
923 routerBasename_ += "/"; |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
924 } |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
925 |
|
38
fae02fc69b46
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
37
diff
changeset
|
926 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
|
927 |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
928 OrthancPlugins::RegisterRestCallback<ServeFile>("/ohif", true); |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
929 OrthancPlugins::RegisterRestCallback<ServeFile>("/ohif/(.*)", true); |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
930 OrthancPlugins::RegisterRestCallback<GetOhifStudy>("/studies/([0-9a-f-]+)/ohif-dicom-json", true); |
| 0 | 931 |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
932 OrthancPluginRegisterOnChangeCallback(context, OnChangeCallback); |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
933 |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
934 { |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
935 // 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
|
936 std::string explorer; |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
937 Orthanc::EmbeddedResources::GetFileResource(explorer, Orthanc::EmbeddedResources::ORTHANC_EXPLORER); |
| 0 | 938 |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
939 std::map<std::string, std::string> dictionary; |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
940 dictionary["USE_DICOM_WEB"] = (dataSource_ == DataSource_DicomWeb ? "true" : "false"); |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
941 explorer = Orthanc::Toolbox::SubstituteVariables(explorer, dictionary); |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
942 |
| 39 | 943 OrthancPlugins::ExtendOrthancExplorer(ORTHANC_PLUGIN_NAME, explorer); |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
944 } |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
945 } |
|
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
946 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
|
947 { |
|
11
16b9f1ff491d
added configuration option "Preload"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
10
diff
changeset
|
948 return -1; |
|
5
8c1fe0ca24f5
added the possibility to replace DICOMweb by DICOM JSON
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4
diff
changeset
|
949 } |
| 0 | 950 |
| 951 return 0; | |
| 952 } | |
| 953 | |
| 954 | |
| 955 ORTHANC_PLUGINS_API void OrthancPluginFinalize() | |
| 956 { | |
| 957 } | |
| 958 | |
| 959 | |
| 960 ORTHANC_PLUGINS_API const char* OrthancPluginGetName() | |
| 961 { | |
|
38
fae02fc69b46
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
37
diff
changeset
|
962 return ORTHANC_PLUGIN_NAME; |
| 0 | 963 } |
| 964 | |
| 965 | |
| 966 ORTHANC_PLUGINS_API const char* OrthancPluginGetVersion() | |
| 967 { | |
| 968 return ORTHANC_OHIF_VERSION; | |
| 969 } | |
| 970 } |