orthanc-ohif: Sources/Plugin.cpp annotate

annotate Sources/Plugin.cpp @ 7:eab054ee7537

added modal in Orthanc Explorer to choose between the OHIF viewers

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sun, 18 Jun 2023 10:37:21 +0200
parents	e8e7ba4371e3
children	cc4c81d08bf0

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

Mercurial > hg > orthanc-ohif

annotate Sources/Plugin.cpp @ 7:eab054ee7537