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