orthanc-ohif: Sources/Plugin.cpp annotate

annotate Sources/Plugin.cpp @ 10:5d5caf89eb5b

added thread to precompute metadata

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sun, 18 Jun 2023 15:08:58 +0200
parents	e8dea04df69b
children	16b9f1ff491d

rev	line source
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * SPDX-FileCopyrightText: 2023 Sebastien Jodogne, UCLouvain, Belgium
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * SPDX-License-Identifier: GPL-3.0-or-later
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 */
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 /**
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * OHIF plugin for Orthanc
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * Copyright (C) 2023 Sebastien Jodogne, UCLouvain, Belgium
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 *
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * This program is free software: you can redistribute it and/or
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * modify it under the terms of the GNU General Public License as
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * published by the Free Software Foundation, either version 3 of the
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * License, or (at your option) any later version.
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 *
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * This program is distributed in the hope that it will be useful, but
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * WITHOUT ANY WARRANTY; without even the implied warranty of
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * General Public License for more details.
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 *
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * You should have received a copy of the GNU General Public License
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * along with this program. If not, see <http://www.gnu.org/licenses/>.
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 **/
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	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 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 #include <Logging.h>
10 5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	31 #include <MultiThreading/SharedMessageQueue.h>
4 c34ecc350b32 upgraded the node docker image Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	32 #include <SerializationToolbox.h>
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	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 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include <EmbeddedResources.h>
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37
10 5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	38 #include <boost/thread.hpp>
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 #include <boost/thread/shared_mutex.hpp>
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	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
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	46 // Reference: https://v3-docs.ohif.org/configuration/dataSources/dicom-json
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	47
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	48 enum DataType
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	49 {
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	50 DataType_String,
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	51 DataType_Integer,
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	52 DataType_Float,
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	53 DataType_ListOfFloats,
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	54 DataType_ListOfStrings,
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	55 DataType_None
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	56 };
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 class TagInformation
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	59 {
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	60 private:
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	61 DataType type_;
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	62 std::string name_;
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	63
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	64 public:
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	65 TagInformation() :
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	66 type_(DataType_None)
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 }
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	69
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	70 TagInformation(DataType type,
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	71 const std::string& name) :
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	72 type_(type),
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	73 name_(name)
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	74 {
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	75 }
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	76
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	77 DataType GetType() const
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	78 {
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	79 return type_;
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	80 }
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	81
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	82 const std::string& GetName() const
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 return name_;
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	85 }
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	86
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	87 bool operator== (const TagInformation& other) const
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	88 {
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	89 return (type_ == other.type_ &&
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	90 name_ == other.name_);
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 };
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 typedef std::map<Orthanc::DicomTag, TagInformation> TagsDictionary;
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	95
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	96 static TagsDictionary ohifStudyTags_, ohifSeriesTags_, ohifInstanceTags_, allTags_;
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	97
8 cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	98
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	99 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	100
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	101 static void InitializeOhifTags()
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	102 {
7 eab054ee7537 added modal in Orthanc Explorer to choose between the OHIF viewers Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	103 /**
eab054ee7537 added modal in Orthanc Explorer to choose between the OHIF viewers Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	104 * 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	105 * "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	106 * 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	107 **/
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	108 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	109 ohifStudyTags_[Orthanc::DICOM_TAG_STUDY_DATE] = TagInformation(DataType_String, "StudyDate");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	110 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	111 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	112 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_NAME] = TagInformation(DataType_String, "PatientName");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	113 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_ID] = TagInformation(DataType_String, "PatientID");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	114 ohifStudyTags_[Orthanc::DICOM_TAG_ACCESSION_NUMBER] = TagInformation(DataType_String, "AccessionNumber");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	115 ohifStudyTags_[Orthanc::DicomTag(0x0010, 0x1010)] = TagInformation(DataType_String, "PatientAge");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	116 ohifStudyTags_[Orthanc::DICOM_TAG_PATIENT_SEX] = TagInformation(DataType_String, "PatientSex");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	117
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	118 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	119 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	120 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	121 ohifSeriesTags_[Orthanc::DICOM_TAG_MODALITY] = TagInformation(DataType_String, "Modality");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	122 ohifSeriesTags_[Orthanc::DICOM_TAG_SLICE_THICKNESS] = TagInformation(DataType_Float, "SliceThickness");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	123
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	124 ohifInstanceTags_[Orthanc::DICOM_TAG_COLUMNS] = TagInformation(DataType_Integer, "Columns");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	125 ohifInstanceTags_[Orthanc::DICOM_TAG_ROWS] = TagInformation(DataType_Integer, "Rows");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	126 ohifInstanceTags_[Orthanc::DICOM_TAG_INSTANCE_NUMBER] = TagInformation(DataType_Integer, "InstanceNumber");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	127 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	128 ohifInstanceTags_[Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION] = TagInformation(DataType_String, "PhotometricInterpretation");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	129 ohifInstanceTags_[Orthanc::DICOM_TAG_BITS_ALLOCATED] = TagInformation(DataType_Integer, "BitsAllocated");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	130 ohifInstanceTags_[Orthanc::DICOM_TAG_BITS_STORED] = TagInformation(DataType_Integer, "BitsStored");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	131 ohifInstanceTags_[Orthanc::DICOM_TAG_PIXEL_REPRESENTATION] = TagInformation(DataType_Integer, "PixelRepresentation");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	132 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	133 ohifInstanceTags_[Orthanc::DICOM_TAG_PIXEL_SPACING] = TagInformation(DataType_ListOfFloats, "PixelSpacing");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	134 ohifInstanceTags_[Orthanc::DICOM_TAG_HIGH_BIT] = TagInformation(DataType_Integer, "HighBit");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	135 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	136 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	137 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	138 ohifInstanceTags_[Orthanc::DicomTag(0x0008, 0x0008)] = TagInformation(DataType_ListOfStrings, "ImageType");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	139 ohifInstanceTags_[Orthanc::DICOM_TAG_MODALITY] = TagInformation(DataType_String, "Modality");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	140 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	141 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	142 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	143 ohifInstanceTags_[Orthanc::DICOM_TAG_WINDOW_CENTER] = TagInformation(DataType_Float, "WindowCenter");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	144 ohifInstanceTags_[Orthanc::DICOM_TAG_WINDOW_WIDTH] = TagInformation(DataType_Float, "WindowWidth");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	145 ohifInstanceTags_[Orthanc::DICOM_TAG_SERIES_DATE] = TagInformation(DataType_String, "SeriesDate");
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	146
7 eab054ee7537 added modal in Orthanc Explorer to choose between the OHIF viewers Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	147 /**
eab054ee7537 added modal in Orthanc Explorer to choose between the OHIF viewers Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	148 * 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	149 * 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	150 * "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	151 **/
8 cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	152 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	153 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	154 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	155 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	156 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	157 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	158 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	159 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	160 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	161 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	162 ohifInstanceTags_[RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE] = TagInformation(DataType_None, "RadiopharmaceuticalInformationSequence");
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	163
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	164 // UNTESTED
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	165 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	166 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	167 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	168
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	169 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	170 {
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	171 assert(allTags_.find(it->first) == allTags_.end() \|\|
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	172 allTags_[it->first] == it->second);
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	173 allTags_[it->first] = it->second;
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	174 }
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	175
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	176 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	177 {
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	178 assert(allTags_.find(it->first) == allTags_.end() \|\|
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	179 allTags_[it->first] == it->second);
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 }
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 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	184 {
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	185 assert(allTags_.find(it->first) == allTags_.end() \|\|
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	186 allTags_[it->first] == it->second);
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 }
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
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192 // Forward declaration
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193 void ReadStaticAsset(std::string& target,
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194 const std::string& path);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	195
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 /**
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 * As the OHIF static assets are gzipped by the "EmbedStaticAssets.py"
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 * script, we use a cache to maintain the uncompressed assets in order
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200 * to avoid multiple gzip decodings.
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 **/
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 class ResourcesCache : public boost::noncopyable
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 private:
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 typedef std::map<std::string, std::string*> Content;
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 boost::shared_mutex mutex_;
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 Content content_;
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 public:
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 ~ResourcesCache()
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213 for (Content::iterator it = content_.begin(); it != content_.end(); ++it)
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 assert(it->second != NULL);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 delete it->second;
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 void Answer(OrthancPluginContext* context,
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 OrthancPluginRestOutput* output,
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 const std::string& path)
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 const std::string mime = Orthanc::EnumerationToString(Orthanc::SystemToolbox::AutodetectMimeType(path));
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 // Check whether the cache already contains the resource
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 boost::shared_lock<boost::shared_mutex> lock(mutex_);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 Content::const_iterator found = content_.find(path);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 if (found != content_.end())
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 assert(found->second != NULL);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 OrthancPluginAnswerBuffer(context, output, found->second->c_str(), found->second->size(), mime.c_str());
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 return;
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 // This resource has not been cached yet
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 std::unique_ptr<std::string> item(new std::string);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 ReadStaticAsset(*item, path);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 OrthancPluginAnswerBuffer(context, output, item->c_str(), item->size(), mime.c_str());
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 // Store the resource into the cache
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 boost::unique_lock<boost::shared_mutex> lock(mutex_);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 if (content_.find(path) == content_.end())
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 content_[path] = item.release();
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 };
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258
8 cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	259 static bool ParseTagFromOrthanc(Json::Value& target,
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	260 const Orthanc::DicomTag& tag,
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	261 const std::string& name,
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	262 DataType type,
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	263 const Json::Value& source)
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	264 {
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	265 const std::string formattedTag = tag.Format();
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	266
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	267 if (source.isMember(formattedTag))
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	268 {
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	269 const Json::Value& value = source[formattedTag];
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	270
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	271 /**
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	272 * The cases below derive from "Toolbox::SimplifyDicomAsJson()"
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	273 * 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	274 * API call to "/instances/.../tags?short".
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	275 **/
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	276
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	277 switch (value.type())
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	278 {
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	279 case Json::nullValue:
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	280 return false;
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 case Json::arrayValue:
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	283 // 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	284 return false;
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 case Json::stringValue:
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	287 {
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	288 switch (type)
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	289 {
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	290 case DataType_String:
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	291 target[name] = value;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	292 return true;
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 DataType_Integer:
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	295 {
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	296 int32_t v;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	297 if (Orthanc::SerializationToolbox::ParseInteger32(v, value.asString()))
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	298 {
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	299 target[name] = v;
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 return true;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	302 }
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	303
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	304 case DataType_Float:
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	305 {
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	306 float v;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	307 if (Orthanc::SerializationToolbox::ParseFloat(v, value.asString()))
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 target[name] = v;
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 return true;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	312 }
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	313
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	314 case DataType_ListOfStrings:
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 std::vector<std::string> tokens;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	317 Orthanc::Toolbox::TokenizeString(tokens, value.asString(), '\\');
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	318 target[name] = Json::arrayValue;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	319 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	320 {
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	321 target[name].append(tokens[i]);
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	322 }
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	323 return true;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	324 }
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	325
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	326 case DataType_ListOfFloats:
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 std::vector<std::string> tokens;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	329 Orthanc::Toolbox::TokenizeString(tokens, value.asString(), '\\');
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	330 target[name] = Json::arrayValue;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	331 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	332 {
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	333 float v;
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	334 if (Orthanc::SerializationToolbox::ParseFloat(v, tokens[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(v);
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 }
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	339 return true;
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
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	342 default:
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	343 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	344 }
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	345 }
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	346
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	347 default:
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	348 // This should never happen
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	349 return false;
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 }
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	352 else
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 false;
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
cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	358
9 e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	359 static bool EncodeOhifInstance(Json::Value& target,
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	360 const std::string& instanceId)
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	361 {
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	362 Json::Value source;
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	363 if (!OrthancPlugins::RestApiGet(source, "/instances/" + instanceId + "/tags?short", false))
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	364 {
5 8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	365 return false;
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	366 }
9 e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	367 else if (source.type() != Json::objectValue)
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	368 {
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	369 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	370 }
9 e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	371 else
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	372 {
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	373 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	374
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	375 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	376 {
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	377 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	378 }
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	379
9 e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	380 /**
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	381 * 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	382 * used in function "getPTImageIdInstanceMetadata()" of
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	383 * "extensions/default/src/getPTImageIdInstanceMetadata.ts"
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	384 **/
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	385 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	386 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	387 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	388 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	389
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	390 if (source.isMember(RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE.Format()))
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 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	393 if (pharma.type() == Json::arrayValue &&
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	394 pharma.size() > 0 &&
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	395 pharma[0].type() == Json::objectValue)
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	396 {
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	397 Json::Value info;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	398 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	399 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	400 (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	401 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	402 {
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	403 Json::Value sequence = Json::arrayValue;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	404 sequence.append(info);
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	405
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	406 target[RADIOPHARMACEUTICAL_INFORMATION_SEQUENCE.Format()] = sequence;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	407 }
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	408 }
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	409 }
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	410
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	411 return true;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	412 }
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	413 }
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	414
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	415
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	416 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	417 {
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	418 return "/instances/" + instanceId + "/metadata/" + METADATA_OHIF;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	419 }
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
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	422 static void CacheAsMetadata(const Json::Value& instanceTags,
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	423 const std::string& instanceId)
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 std::string uncompressed;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	426 Orthanc::Toolbox::WriteFastJson(uncompressed, instanceTags);
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 std::string compressed;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	429 Orthanc::GzipCompressor compressor;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	430 Orthanc::IBufferCompressor::Compress(compressed, compressor, uncompressed);
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	431
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	432 std::string metadata;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	433 Orthanc::Toolbox::EncodeBase64(metadata, compressed);
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 Json::Value answer;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	436 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	437 }
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	438
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	439
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	440 static bool GetOhifInstance(Json::Value& target,
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	441 const std::string& instanceId)
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	442 {
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	443 const std::string uri = GetCacheUri(instanceId);
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	444
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	445 std::string metadata;
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 if (OrthancPlugins::RestApiGetString(metadata, uri, false))
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	448 {
9 e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	449 try
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	450 {
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	451 std::string compressed;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	452 Orthanc::Toolbox::DecodeBase64(compressed, metadata);
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 std::string uncompressed;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	455 Orthanc::GzipCompressor compressor;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	456 Orthanc::IBufferCompressor::Uncompress(uncompressed, compressor, compressed);
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 if (Orthanc::Toolbox::ReadJson(target, uncompressed) &&
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	459 target.isMember(KEY_VERSION) &&
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	460 target[KEY_VERSION].type() == Json::intValue &&
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	461 target[KEY_VERSION].asInt() == METADATA_VERSION)
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	462 {
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	463 // Success, we can reuse the cached value
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	464 return true;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	465 }
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	466 }
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	467 catch (Orthanc::OrthancException&)
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 }
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	470
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	471 // 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	472 OrthancPlugins::RestApiDelete(uri, false);
8 cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	473 }
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	474
9 e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	475 if (EncodeOhifInstance(target, instanceId))
8 cc4c81d08bf0 added missing tags for PET Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	476 {
9 e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	477 CacheAsMetadata(target, instanceId);
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	478 return true;
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	479 }
9 e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	480 else
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 return false;
e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	483 }
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	484 }
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	485
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	486
10 5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	487 static ResourcesCache cache_;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	488 static std::string routerBasename_;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	489 static bool useDicomWeb_;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	490 static boost::thread metadataThread_;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	491 static Orthanc::SharedMessageQueue pendingInstances_;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	492 static bool continueThread_;
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	493
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	494 void ServeFile(OrthancPluginRestOutput* output,
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495 const char* url,
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496 const OrthancPluginHttpRequest* request)
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext();
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 // The next 3 HTTP headers are required to enable SharedArrayBuffer
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 // (https://web.dev/coop-coep/)
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Embedder-Policy", "require-corp");
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	503 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Opener-Policy", "same-origin");
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504 OrthancPluginSetHttpHeader(context, output, "Cross-Origin-Resource-Policy", "same-origin");
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505
6 e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	506 std::string uri;
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	507 if (request->groupsCount > 0)
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	508 {
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	509 uri = request->groups[0];
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	510 }
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	511
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	512 if (uri == "app-config.js")
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 std::string system, user;
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	515 Orthanc::EmbeddedResources::GetFileResource(system, Orthanc::EmbeddedResources::APP_CONFIG_SYSTEM);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516 Orthanc::EmbeddedResources::GetFileResource(user, Orthanc::EmbeddedResources::APP_CONFIG_USER);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	517
2 cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	518 std::map<std::string, std::string> dictionary;
cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	519 dictionary["ROUTER_BASENAME"] = routerBasename_;
5 8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	520 dictionary["USE_DICOM_WEB"] = (useDicomWeb_ ? "true" : "false");
2 cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	521
cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	522 system = Orthanc::Toolbox::SubstituteVariables(system, dictionary);
cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	523
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 std::string s = (user + "\n" + system);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	525 OrthancPluginAnswerBuffer(context, output, s.c_str(), s.size(), "application/json");
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	526 }
6 e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	527 else if (uri == "" \|\| // Study list
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	528 uri == "tmtv" \|\| // Total metabolic tumor volume
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	529 uri == "viewer") // Default viewer (including MPR)
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	530 {
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	531 // 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	532 // https://v3-docs.ohif.org/platform/modes/
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	533 cache_.Answer(context, output, "index.html");
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	535 else
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	537 cache_.Answer(context, output, uri);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	538 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	539 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541
5 8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	542 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	543 const std::string& studyId)
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	544 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	545 // 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	546 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	547 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	548 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	549 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	550 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	551
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	552 Json::Value instancesIds;
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	553 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	554 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	555 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	556 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	557
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	558 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	559 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	560 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	561 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	562
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	563 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	564 instancesTags.reserve(instancesIds.size());
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	565
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	566 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	567 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	568 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	569 !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	570 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	571 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	572 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	573 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	574
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	575 Json::Value t;
9 e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	576 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	577 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	578 instancesTags.push_back(t);
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	579 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	580 }
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 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	583 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	584
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	585 MapOfResources studies;
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	586 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	587 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	588 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	589 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	590 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	591 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	592 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	593 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	594 else
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 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	597 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	598 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	599 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	600 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	601
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	602 target["studies"] = Json::arrayValue;
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 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	605 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	606 if (!it->second.empty())
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 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	609 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	610
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	611 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	612 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	613 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	614 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	615 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	616 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	617 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	618 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	619
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	620 MapOfResources seriesInStudy;
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	621 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	622 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	623 assert(*it2 != NULL);
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	624 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	625
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	626 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	627 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	628 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	629 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	630 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	631 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	632 else
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 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	635 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	636 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	637 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	638 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	639
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	640 study["series"] = Json::arrayValue;
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 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	643 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	644 if (!it3->second.empty())
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 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	647 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	648
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	649 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	650 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	651 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	652 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	653 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	654 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	655 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	656 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	657
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	658 series["instances"] = Json::arrayValue;
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 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	661 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	662 assert(*it4 != 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& instanceInSeries = **it4;
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 metadata;
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 = 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	667 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	668 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	669 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	670 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	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 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	675 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	676 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	677 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	678
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	679 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	680 instance["metadata"] = metadata;
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	681 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	682
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	683 series["instances"].append(instance);
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	684 }
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 study["series"].append(series);
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 target["studies"].append(study);
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	691 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	692 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	693 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	694
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	695
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	696 void GetOhifStudy(OrthancPluginRestOutput* output,
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	697 const char* url,
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	698 const OrthancPluginHttpRequest* request)
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	699 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	700 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext();
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 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	703
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	704 Json::Value v;
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	705 GenerateOhifStudy(v, studyId);
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	706
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	707 std::string s;
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	708 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	709
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	710 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	711 }
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	712
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	713
10 5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	714 static void MetadataThread()
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	715 {
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	716 while (continueThread_)
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	717 {
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	718 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	719 if (instance.get() != NULL)
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	720 {
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	721 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	722 const std::string uri = GetCacheUri(instanceId);
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	723
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	724 Json::Value instanceTags;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	725 std::string metadata;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	726 if (!OrthancPlugins::RestApiGetString(metadata, uri, false) &&
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	727 EncodeOhifInstance(instanceTags, instanceId))
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	728 {
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	729 CacheAsMetadata(instanceTags, instanceId);
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	730 }
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 }
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
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	735
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736 OrthancPluginErrorCode OnChangeCallback(OrthancPluginChangeType changeType,
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	737 OrthancPluginResourceType resourceType,
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738 const char* resourceId)
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 try
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	741 {
10 5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	742 switch (changeType)
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	743 {
10 5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	744 case OrthancPluginChangeType_OrthancStarted:
5 8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	745 {
10 5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	746 continueThread_ = true;
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 if (useDicomWeb_)
5 8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	749 {
10 5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	750 Json::Value info;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	751 if (!OrthancPlugins::RestApiGet(info, "/plugins/dicom-web", false))
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	752 {
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	753 throw Orthanc::OrthancException(
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	754 Orthanc::ErrorCode_InternalError,
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	755 "The OHIF plugin requires the DICOMweb plugin to be installed");
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	756 }
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	757
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	758 if (info.type() != Json::objectValue \|\|
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	759 !info.isMember("ID") \|\|
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	760 !info.isMember("Version") \|\|
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	761 info["ID"].type() != Json::stringValue \|\|
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	762 info["Version"].type() != Json::stringValue \|\|
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	763 info["ID"].asString() != "dicom-web")
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	764 {
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	765 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError,
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	766 "The DICOMweb plugin is required by OHIF, but is not properly installed");
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	767 }
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	768 }
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	769 else
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	770 {
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	771 metadataThread_ = boost::thread(MetadataThread);
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	772 }
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	773 break;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	774 }
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	775
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	776 case OrthancPluginChangeType_OrthancStopped:
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	777 {
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	778 continueThread_ = false;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	779
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	780 if (metadataThread_.joinable())
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	781 {
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	782 metadataThread_.join();
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	783 }
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	784 break;
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	785 }
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	786
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	787 case OrthancPluginChangeType_NewInstance:
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 if (metadataThread_.joinable() &&
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	790 pendingInstances_.GetSize() < MAX_INSTANCES_IN_QUEUE)
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	791 {
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	792 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	793 }
4 c34ecc350b32 upgraded the node docker image Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	794
10 5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	795 break;
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796 }
10 5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	797
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	798 default:
5d5caf89eb5b added thread to precompute metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 9 diff changeset	799 break;
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	800 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	801 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	802 catch (Orthanc::OrthancException& e)
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	803 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804 LOG(ERROR) << "Exception: " << e.What();
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	805 return static_cast<OrthancPluginErrorCode>(e.GetErrorCode());
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	806 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	808 return OrthancPluginErrorCode_Success;
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	809 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	810
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	811
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	812 extern "C"
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	813 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	814 ORTHANC_PLUGINS_API int32_t OrthancPluginInitialize(OrthancPluginContext* context)
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	815 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	816 OrthancPlugins::SetGlobalContext(context);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	818 /* Check the version of the Orthanc core */
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	819 if (OrthancPluginCheckVersion(context) == 0)
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	820 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	821 char info[1024];
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	822 sprintf(info, "Your version of Orthanc (%s) must be above %d.%d.%d to run this plugin",
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	823 context->orthancVersion,
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	824 ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER,
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	825 ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER,
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	826 ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	827 OrthancPluginLogError(context, info);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828 return -1;
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	831 #if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 7, 2)
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	832 Orthanc::Logging::InitializePluginContext(context);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833 #else
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	834 Orthanc::Logging::Initialize(context);
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835 #endif
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	836
3 fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	837 InitializeOhifTags();
fdb8c6c420d0 skeleton for optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	838
2 cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	839 OrthancPlugins::OrthancConfiguration configuration;
cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	840
cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	841 {
cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	842 OrthancPlugins::OrthancConfiguration globalConfiguration;
cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	843 globalConfiguration.GetSection(configuration, "OHIF");
cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	844 }
cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	845
cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	846 routerBasename_ = configuration.GetStringValue("RouterBasename", "/ohif");
5 8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	847 useDicomWeb_ = configuration.GetBooleanValue("DicomWeb", false);
2 cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	848
6 e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	849 // Make sure that the router basename ends with a trailing slash
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	850 if (routerBasename_.empty() \|\|
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	851 routerBasename_[routerBasename_.size() - 1] != '/')
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	852 {
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	853 routerBasename_ += "/";
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	854 }
e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	855
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	856 OrthancPluginSetDescription(context, "OHIF plugin for Orthanc.");
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857
6 e8e7ba4371e3 fix access to OHIF study list Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	858 OrthancPlugins::RegisterRestCallback<ServeFile>("/ohif", true);
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	859 OrthancPlugins::RegisterRestCallback<ServeFile>("/ohif/(.*)", true);
9 e8dea04df69b caching OHIF dicom-json as metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	860 OrthancPlugins::RegisterRestCallback<GetOhifStudy>("/studies/([0-9a-f-]+)/ohif-dicom-json", true);
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862 OrthancPluginRegisterOnChangeCallback(context, OnChangeCallback);
2 cbc4be362700 added configuration option "RouterBasename" Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	863
5 8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	864 {
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	865 // Extend the default Orthanc Explorer with custom JavaScript for OHIF
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	866 std::string explorer;
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	867 Orthanc::EmbeddedResources::GetFileResource(explorer, Orthanc::EmbeddedResources::ORTHANC_EXPLORER);
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	868
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	869 std::map<std::string, std::string> dictionary;
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	870 dictionary["USE_DICOM_WEB"] = (useDicomWeb_ ? "true" : "false");
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	871 explorer = Orthanc::Toolbox::SubstituteVariables(explorer, dictionary);
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	872
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	873 OrthancPluginExtendOrthancExplorer(context, explorer.c_str());
8c1fe0ca24f5 added the possibility to replace DICOMweb by DICOM JSON Sebastien Jodogne <s.jodogne@gmail.com> parents: 4 diff changeset	874 }
0 39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	875
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876 return 0;
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	878
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	879
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	880 ORTHANC_PLUGINS_API void OrthancPluginFinalize()
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	881 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	882 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	883
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	884
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	885 ORTHANC_PLUGINS_API const char* OrthancPluginGetName()
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	886 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	887 return "ohif";
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	888 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	889
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	890
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	891 ORTHANC_PLUGINS_API const char* OrthancPluginGetVersion()
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	892 {
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	893 return ORTHANC_OHIF_VERSION;
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	894 }
39585ba26f20 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	895 }

Mercurial > hg > orthanc-ohif

annotate Sources/Plugin.cpp @ 10:5d5caf89eb5b