orthanc-stone: Samples/Sdl/Loader.cpp annotate

annotate Samples/Sdl/Loader.cpp @ 763:53167294d870

merge

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 23 May 2019 11:27:37 +0200
parents	26f4345e771e 07adcffba38c
children	f36a6f7e7bdf

rev	line source
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Stone of Orthanc
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU Affero General Public License
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * as published by the Free Software Foundation, either version 3 of
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * the License, or (at your option) any later version.
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * This program is distributed in the hope that it will be useful, but
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * Affero General Public License for more details.
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 *
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * You should have received a copy of the GNU Affero General Public License
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 **/
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	21
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	22 #include "../../Framework/Toolbox/DicomInstanceParameters.h"
748 ab236bb5dbc7 ThreadedOracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 746 diff changeset	23 #include "../../Framework/Oracle/ThreadedOracle.h"
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	24 #include "../../Framework/Oracle/GetOrthancWebViewerJpegCommand.h"
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	25 #include "../../Framework/Oracle/GetOrthancImageCommand.h"
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	26 #include "../../Framework/Oracle/OrthancRestApiCommand.h"
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	27 #include "../../Framework/Oracle/SleepOracleCommand.h"
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	28 #include "../../Framework/Oracle/OracleCommandExceptionMessage.h"
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	29
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 // From Stone
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	31 #include "../../Framework/Loaders/BasicFetchingItemsSorter.h"
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	32 #include "../../Framework/Loaders/BasicFetchingStrategy.h"
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	33 #include "../../Framework/Scene2D/CairoCompositor.h"
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	34 #include "../../Framework/Scene2D/Scene2D.h"
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	35 #include "../../Framework/StoneInitialization.h"
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	36 #include "../../Framework/Toolbox/GeometryToolbox.h"
683 dbc1d8bfc68a reorganizing ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 681 diff changeset	37 #include "../../Framework/Toolbox/SlicesSorter.h"
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	38 #include "../../Framework/Volumes/ImageBuffer3D.h"
742 fa5febe0f0c2 moved OrientedBoundingBox in the Volumes folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 735 diff changeset	39 #include "../../Framework/Volumes/VolumeImageGeometry.h"
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 // From Orthanc framework
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	42 #include <Core/DicomFormat/DicomArray.h>
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	43 #include <Core/Images/Image.h>
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 #include <Core/Images/ImageProcessing.h>
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	45 #include <Core/Images/PngWriter.h>
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 #include <Core/Logging.h>
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 #include <Core/OrthancException.h>
683 dbc1d8bfc68a reorganizing ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 681 diff changeset	48 #include <Core/SystemToolbox.h>
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	49 #include <Core/Toolbox.h>
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	52 namespace OrthancStone
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 {
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	54 class IVolumeSlicer : public boost::noncopyable
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	55 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	56 public:
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	57 class ExtractedSlice : public boost::noncopyable
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	58 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	59 public:
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	60 virtual ~ExtractedSlice()
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	61 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	62 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	63
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	64 virtual bool IsValid() = 0;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	65
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	66 // Must be a cheap call
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	67 virtual uint64_t GetRevision() = 0;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	68
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	69 // This call can take some time
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	70 virtual ISceneLayer* CreateSceneLayer() = 0;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	71 };
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	72
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	73 virtual ~IVolumeSlicer()
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	74 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	75 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	76
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	77 virtual ExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane) const = 0;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	78 };
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	79
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	80
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	81 class InvalidExtractedSlice : public IVolumeSlicer::ExtractedSlice
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	82 {
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	83 public:
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	84 virtual bool IsValid()
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	85 {
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	86 return false;
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	87 }
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	88
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	89 virtual uint64_t GetRevision()
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	90 {
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	91 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	92 }
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	93
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	94 virtual ISceneLayer* CreateSceneLayer()
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	95 {
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	96 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	97 }
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	98 };
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	99
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	100
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	101 class DicomVolumeImageOrthogonalSlice : public IVolumeSlicer::ExtractedSlice
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	102 {
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	103 private:
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	104 const ImageBuffer3D& image_;
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	105 const VolumeImageGeometry& geometry_;
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	106 bool valid_;
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	107 VolumeProjection projection_;
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	108 unsigned int sliceIndex_;
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	109
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	110 void CheckValid() const
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	111 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	112 if (!valid_)
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	113 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	114 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	115 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	116 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	117
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	118 protected:
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	119 virtual uint64_t GetRevisionInternal(VolumeProjection projection,
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	120 unsigned int sliceIndex) const = 0;
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	121
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	122 virtual const DicomInstanceParameters& GetDicomParameters(VolumeProjection projection,
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	123 unsigned int sliceIndex) const = 0;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	124
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	125 public:
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	126 DicomVolumeImageOrthogonalSlice(const ImageBuffer3D& image,
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	127 const VolumeImageGeometry& geometry,
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	128 const CoordinateSystem3D& cuttingPlane) :
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	129 image_(image),
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	130 geometry_(geometry)
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	131 {
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	132 valid_ = geometry_.DetectSlice(projection_, sliceIndex_, cuttingPlane);
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	133 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	134
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	135 VolumeProjection GetProjection() const
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	136 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	137 CheckValid();
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	138 return projection_;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	139 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	140
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	141 unsigned int GetSliceIndex() const
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	142 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	143 CheckValid();
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	144 return sliceIndex_;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	145 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	146
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	147 virtual bool IsValid()
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	148 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	149 return valid_;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	150 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	151
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	152 virtual uint64_t GetRevision()
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	153 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	154 CheckValid();
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	155 return GetRevisionInternal(projection_, sliceIndex_);
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	156 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	157
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	158 virtual ISceneLayer* CreateSceneLayer()
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	159 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	160 CheckValid();
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	161
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	162 std::auto_ptr<TextureBaseSceneLayer> texture;
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	163
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	164 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	165 const DicomInstanceParameters& parameters = GetDicomParameters(projection_, sliceIndex_);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	166 ImageBuffer3D::SliceReader reader(image_, projection_, sliceIndex_);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	167 texture.reset(parameters.CreateTexture(reader.GetAccessor()));
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	168 }
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	169
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	170 const CoordinateSystem3D& system = geometry_.GetProjectionGeometry(projection_);
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	171
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	172 double x0, y0, x1, y1;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	173 system.ProjectPoint(x0, y0, system.GetOrigin());
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	174 system.ProjectPoint(x1, y1, system.GetOrigin() + system.GetAxisX());
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	175 texture->SetOrigin(x0, y0);
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	176
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	177 double dx = x1 - x0;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	178 double dy = y1 - y0;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	179 if (!LinearAlgebra::IsCloseToZero(dx) \|\|
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	180 !LinearAlgebra::IsCloseToZero(dy))
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	181 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	182 texture->SetAngle(atan2(dy, dx));
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	183 }
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	184
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	185 Vector tmp = geometry_.GetVoxelDimensions(projection_);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	186 texture->SetPixelSpacing(tmp[0], tmp[1]);
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	187
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	188 return texture.release();
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	189 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	190 };
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	191
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	192
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	193 // This class combines a 3D image buffer, a 3D volume geometry and
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	194 // information about the DICOM parameters of each slice.
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	195 class DicomSeriesVolumeImage : public boost::noncopyable
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	196 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	197 public:
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	198 class ExtractedOrthogonalSlice : public DicomVolumeImageOrthogonalSlice
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	199 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	200 private:
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	201 const DicomSeriesVolumeImage& that_;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	202
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	203 protected:
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	204 virtual uint64_t GetRevisionInternal(VolumeProjection projection,
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	205 unsigned int sliceIndex) const
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	206 {
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	207 if (projection == VolumeProjection_Axial)
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	208 {
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	209 return that_.GetSliceRevision(sliceIndex);
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	210 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	211 else
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	212 {
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	213 // For coronal and sagittal projections, we take the global
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	214 // revision of the volume
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	215 return that_.GetRevision();
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	216 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	217 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	218
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	219 virtual const DicomInstanceParameters& GetDicomParameters(VolumeProjection projection,
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	220 unsigned int sliceIndex) const
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	221 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	222 return that_.GetSliceParameters(projection == VolumeProjection_Axial ? sliceIndex : 0);
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	223 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	224
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	225 public:
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	226 ExtractedOrthogonalSlice(const DicomSeriesVolumeImage& that,
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	227 const CoordinateSystem3D& plane) :
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	228 DicomVolumeImageOrthogonalSlice(that.GetImage(), that.GetGeometry(), plane),
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	229 that_(that)
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	230 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	231 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	232 };
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	233
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	234
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	235 private:
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	236 std::auto_ptr<ImageBuffer3D> image_;
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	237 std::auto_ptr<VolumeImageGeometry> geometry_;
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	238 std::vector<DicomInstanceParameters*> slices_;
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	239 uint64_t revision_;
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	240 std::vector<uint64_t> slicesRevision_;
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	241 std::vector<unsigned int> slicesQuality_;
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	242
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	243 void CheckSlice(size_t index,
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	244 const DicomInstanceParameters& reference) const
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	245 {
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	246 const DicomInstanceParameters& slice = *slices_[index];
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	247
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	248 if (!GeometryToolbox::IsParallel(
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	249 reference.GetGeometry().GetNormal(),
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	250 slice.GetGeometry().GetNormal()))
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	251 {
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	252 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	253 "A slice in the volume image is not parallel to the others");
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	254 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	255
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	256 if (reference.GetExpectedPixelFormat() != slice.GetExpectedPixelFormat())
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	257 {
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	258 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat,
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	259 "The pixel format changes across the slices of the volume image");
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	260 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	261
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	262 if (reference.GetImageInformation().GetWidth() != slice.GetImageInformation().GetWidth() \|\|
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	263 reference.GetImageInformation().GetHeight() != slice.GetImageInformation().GetHeight())
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	264 {
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	265 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize,
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	266 "The width/height of slices are not constant in the volume image");
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	267 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	268
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	269 if (!LinearAlgebra::IsNear(reference.GetPixelSpacingX(), slice.GetPixelSpacingX()) \|\|
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	270 !LinearAlgebra::IsNear(reference.GetPixelSpacingY(), slice.GetPixelSpacingY()))
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	271 {
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	272 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	273 "The pixel spacing of the slices change across the volume image");
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	274 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	275 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	276
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	277
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	278 void CheckVolume() const
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	279 {
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	280 for (size_t i = 0; i < slices_.size(); i++)
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	281 {
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	282 assert(slices_[i] != NULL);
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	283 if (slices_[i]->GetImageInformation().GetNumberOfFrames() != 1)
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	284 {
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	285 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	286 "This class does not support multi-frame images");
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	287 }
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	288 }
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	289
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	290 if (slices_.size() != 0)
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	291 {
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	292 const DicomInstanceParameters& reference = *slices_[0];
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	293
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	294 for (size_t i = 1; i < slices_.size(); i++)
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	295 {
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	296 CheckSlice(i, reference);
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	297 }
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	298 }
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	299 }
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	300
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	301
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	302 void Clear()
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	303 {
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	304 image_.reset();
735 c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	305 geometry_.reset();
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	306
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	307 for (size_t i = 0; i < slices_.size(); i++)
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	308 {
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	309 assert(slices_[i] != NULL);
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	310 delete slices_[i];
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	311 }
709 7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	312
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	313 slices_.clear();
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	314 slicesRevision_.clear();
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	315 slicesQuality_.clear();
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	316 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	317
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	318
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	319 void CheckSliceIndex(size_t index) const
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	320 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	321 assert(slices_.size() == image_->GetDepth() &&
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	322 slices_.size() == slicesRevision_.size());
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	323
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	324 if (!HasGeometry())
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	325 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	326 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	327 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	328 else if (index >= slices_.size())
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	329 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	330 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	331 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	332 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	333
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	334
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	335 public:
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	336 DicomSeriesVolumeImage()
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	337 {
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	338 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	339
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	340 ~DicomSeriesVolumeImage()
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	341 {
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	342 Clear();
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	343 }
3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	344
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	345 // WARNING: The payload of "slices" must be of class "DicomInstanceParameters"
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	346 void SetGeometry(SlicesSorter& slices)
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	347 {
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	348 Clear();
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	349
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	350 if (!slices.Sort())
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	351 {
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	352 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange,
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	353 "Cannot sort the 3D slices of a DICOM series");
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	354 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	355
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	356 geometry_.reset(new VolumeImageGeometry);
735 c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	357
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	358 if (slices.GetSlicesCount() == 0)
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	359 {
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	360 // Empty volume
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	361 image_.reset(new ImageBuffer3D(Orthanc::PixelFormat_Grayscale8, 0, 0, 0,
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	362 false /* don't compute range */));
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	363 }
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	364 else
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	365 {
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	366 slices_.reserve(slices.GetSlicesCount());
709 7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	367 slicesRevision_.resize(slices.GetSlicesCount(), 0);
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	368 slicesQuality_.resize(slices.GetSlicesCount(), 0);
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	369
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	370 for (size_t i = 0; i < slices.GetSlicesCount(); i++)
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	371 {
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	372 const DicomInstanceParameters& slice =
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	373 dynamic_cast<const DicomInstanceParameters&>(slices.GetSlicePayload(i));
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	374 slices_.push_back(new DicomInstanceParameters(slice));
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	375 }
669 3805ffa2833d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	376
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	377 CheckVolume();
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	378
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	379 const double spacingZ = slices.ComputeSpacingBetweenSlices();
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	380 LOG(INFO) << "Computed spacing between slices: " << spacingZ << "mm";
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	381
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	382 const DicomInstanceParameters& parameters = *slices_[0];
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	383
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	384 image_.reset(new ImageBuffer3D(parameters.GetExpectedPixelFormat(),
761 07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb Benjamin Golinvaux <bgo@osimis.io> parents: 760 diff changeset	385 parameters.GetImageInformation().GetWidth(),
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb Benjamin Golinvaux <bgo@osimis.io> parents: 760 diff changeset	386 parameters.GetImageInformation().GetHeight(),
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb Benjamin Golinvaux <bgo@osimis.io> parents: 760 diff changeset	387 static_cast<unsigned int>(slices.GetSlicesCount()),
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb Benjamin Golinvaux <bgo@osimis.io> parents: 760 diff changeset	388 false /* don't compute range */));
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	389
735 c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	390 geometry_->SetSize(image_->GetWidth(), image_->GetHeight(), image_->GetDepth());
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	391 geometry_->SetAxialGeometry(slices.GetSliceGeometry(0));
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	392 geometry_->SetVoxelDimensions(parameters.GetPixelSpacingX(),
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	393 parameters.GetPixelSpacingY(), spacingZ);
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	394 }
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	395
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	396 image_->Clear();
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	397
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	398 revision_++;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	399 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	400
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	401 uint64_t GetRevision() const
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	402 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	403 return revision_;
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	404 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	405
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	406 bool HasGeometry() const
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	407 {
735 c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	408 return (image_.get() != NULL &&
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	409 geometry_.get() != NULL);
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	410 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	411
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	412 const ImageBuffer3D& GetImage() const
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	413 {
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	414 if (!HasGeometry())
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	415 {
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	416 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	417 }
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	418 else
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	419 {
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	420 return *image_;
e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	421 }
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	422 }
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	423
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	424 const VolumeImageGeometry& GetGeometry() const
735 c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	425 {
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	426 if (!HasGeometry())
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	427 {
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	428 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	429 }
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	430 else
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	431 {
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	432 return *geometry_;
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	433 }
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	434 }
c3bbb130abc4 removing dependencies in ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 713 diff changeset	435
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	436 size_t GetSlicesCount() const
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	437 {
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	438 if (!HasGeometry())
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	439 {
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	440 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	441 }
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	442 else
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	443 {
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	444 return slices_.size();
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	445 }
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	446 }
6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	447
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	448 const DicomInstanceParameters& GetSliceParameters(size_t index) const
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	449 {
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	450 CheckSliceIndex(index);
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	451 return *slices_[index];
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	452 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	453
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	454 uint64_t GetSliceRevision(size_t index) const
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	455 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	456 CheckSliceIndex(index);
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	457 return slicesRevision_[index];
678 6f10f9a6676a turning DicomVolumeImage into a bean class Sebastien Jodogne <s.jodogne@gmail.com> parents: 669 diff changeset	458 }
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	459
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	460 void SetSliceContent(size_t index,
709 7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	461 const Orthanc::ImageAccessor& image,
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	462 unsigned int quality)
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	463 {
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	464 CheckSliceIndex(index);
709 7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	465
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	466 // If a better image quality is already available, don't update the content
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	467 if (quality >= slicesQuality_[index])
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	468 {
709 7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	469 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	470 ImageBuffer3D::SliceWriter writer
761 07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb Benjamin Golinvaux <bgo@osimis.io> parents: 760 diff changeset	471 (*image_, VolumeProjection_Axial, static_cast<unsigned int>(index));
709 7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	472 Orthanc::ImageProcessing::Copy(writer.GetAccessor(), image);
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	473 }
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	474
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	475 revision_ ++;
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	476 slicesRevision_[index] += 1;
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	477 }
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	478 }
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	479 };
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	480
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	481
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	482
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	483 class OrthancSeriesVolumeProgressiveLoader :
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	484 public IObserver
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	485 {
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	486 private:
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	487 static const unsigned int LOW_QUALITY = 0;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	488 static const unsigned int MIDDLE_QUALITY = 1;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	489 static const unsigned int BEST_QUALITY = 2;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	490
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	491
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	492 static unsigned int GetSliceIndexPayload(const OracleCommandWithPayload& command)
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	493 {
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	494 return dynamic_cast< const Orthanc::SingleValueObject<unsigned int>& >(command.GetPayload()).GetValue();
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	495 }
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	496
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	497
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	498 void ScheduleNextSliceDownload()
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	499 {
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	500 assert(strategy_.get() != NULL);
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	501
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	502 unsigned int sliceIndex, quality;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	503
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	504 if (strategy_->GetNext(sliceIndex, quality))
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	505 {
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	506 assert(quality <= BEST_QUALITY);
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	507
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	508 const DicomInstanceParameters& slice = volume_.GetSliceParameters(sliceIndex);
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	509
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	510 const std::string& instance = slice.GetOrthancInstanceIdentifier();
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	511 if (instance.empty())
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	512 {
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	513 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	514 }
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	515
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	516 std::auto_ptr<OracleCommandWithPayload> command;
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	517
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	518 if (quality == BEST_QUALITY)
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	519 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	520 std::auto_ptr<GetOrthancImageCommand> tmp(new GetOrthancImageCommand);
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	521 tmp->SetHttpHeader("Accept-Encoding", "gzip");
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	522 tmp->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	523 tmp->SetInstanceUri(instance, slice.GetExpectedPixelFormat());
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	524 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat());
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	525 command.reset(tmp.release());
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	526 }
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	527 else
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	528 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	529 std::auto_ptr<GetOrthancWebViewerJpegCommand> tmp(new GetOrthancWebViewerJpegCommand);
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	530 tmp->SetHttpHeader("Accept-Encoding", "gzip");
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	531 tmp->SetInstance(instance);
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	532 tmp->SetQuality((quality == 0 ? 50 : 90));
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	533 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat());
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	534 command.reset(tmp.release());
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	535 }
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	536
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	537 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(sliceIndex));
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	538 oracle_.Schedule(*this, command.release());
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	539 }
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	540 }
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	541
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	542
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	543 void LoadGeometry(const OrthancRestApiCommand::SuccessMessage& message)
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	544 {
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	545 Json::Value body;
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	546 message.ParseJsonBody(body);
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	547
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	548 if (body.type() != Json::objectValue)
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	549 {
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	550 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	551 }
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	552
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	553 {
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	554 Json::Value::Members instances = body.getMemberNames();
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	555
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	556 SlicesSorter slices;
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	557
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	558 for (size_t i = 0; i < instances.size(); i++)
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	559 {
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	560 Orthanc::DicomMap dicom;
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	561 dicom.FromDicomAsJson(body[instances[i]]);
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	562
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	563 std::auto_ptr<DicomInstanceParameters> instance(new DicomInstanceParameters(dicom));
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	564 instance->SetOrthancInstanceIdentifier(instances[i]);
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	565
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	566 CoordinateSystem3D geometry = instance->GetGeometry();
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	567 slices.AddSlice(geometry, instance.release());
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	568 }
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	569
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	570 volume_.SetGeometry(slices);
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	571 }
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	572
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	573 if (volume_.GetSlicesCount() != 0)
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	574 {
761 07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb Benjamin Golinvaux <bgo@osimis.io> parents: 760 diff changeset	575 strategy_.reset(new BasicFetchingStrategy(sorter_->CreateSorter(
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb Benjamin Golinvaux <bgo@osimis.io> parents: 760 diff changeset	576 static_cast<unsigned int>(volume_.GetSlicesCount())), BEST_QUALITY));
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	577
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	578 assert(simultaneousDownloads_ != 0);
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	579 for (unsigned int i = 0; i < simultaneousDownloads_; i++)
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	580 {
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	581 ScheduleNextSliceDownload();
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	582 }
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	583 }
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	584 }
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	585
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	586
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	587 void LoadBestQualitySliceContent(const GetOrthancImageCommand::SuccessMessage& message)
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	588 {
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	589 volume_.SetSliceContent(GetSliceIndexPayload(message.GetOrigin()),
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	590 message.GetImage(), BEST_QUALITY);
709 7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	591
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	592 ScheduleNextSliceDownload();
709 7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	593 }
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	594
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	595
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	596 void LoadJpegSliceContent(const GetOrthancWebViewerJpegCommand::SuccessMessage& message)
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	597 {
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	598 unsigned int quality;
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	599
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	600 switch (message.GetOrigin().GetQuality())
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	601 {
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	602 case 50:
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	603 quality = LOW_QUALITY;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	604 break;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	605
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	606 case 90:
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	607 quality = MIDDLE_QUALITY;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	608 break;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	609
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	610 default:
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	611 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	612 }
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	613
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	614 volume_.SetSliceContent(GetSliceIndexPayload(message.GetOrigin()), message.GetImage(), quality);
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	615
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	616 ScheduleNextSliceDownload();
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	617 }
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	618
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	619
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	620 IOracle& oracle_;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	621 bool active_;
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	622 DicomSeriesVolumeImage volume_;
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	623 unsigned int simultaneousDownloads_;
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	624
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	625 std::auto_ptr<IFetchingItemsSorter::IFactory> sorter_;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	626 std::auto_ptr<IFetchingStrategy> strategy_;
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	627
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	628
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	629 IVolumeSlicer::ExtractedSlice* ExtractOrthogonalSlice(const CoordinateSystem3D& cuttingPlane) const
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	630 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	631 if (volume_.HasGeometry() &&
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	632 volume_.GetSlicesCount() != 0)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	633 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	634 std::auto_ptr<DicomVolumeImageOrthogonalSlice> slice
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	635 (new DicomSeriesVolumeImage::ExtractedOrthogonalSlice(volume_, cuttingPlane));
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	636
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	637 assert(slice.get() != NULL &&
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	638 strategy_.get() != NULL);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	639
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	640 if (slice->GetProjection() == VolumeProjection_Axial)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	641 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	642 strategy_->SetCurrent(slice->GetSliceIndex());
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	643 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	644
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	645 return slice.release();
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	646 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	647 else
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	648 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	649 return new InvalidExtractedSlice;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	650 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	651 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	652
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	653
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	654 public:
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	655 class MPRSlicer : public IVolumeSlicer
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	656 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	657 private:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	658 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> that_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	659
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	660 public:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	661 MPRSlicer(const boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader>& that) :
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	662 that_(that)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	663 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	664 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	665
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	666 virtual IVolumeSlicer::ExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane) const
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	667 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	668 return that_->ExtractOrthogonalSlice(cuttingPlane);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	669 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	670
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	671 const DicomSeriesVolumeImage& GetVolume() const
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	672 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	673 return that_->GetVolume();
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	674 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	675 };
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	676
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	677 OrthancSeriesVolumeProgressiveLoader(IOracle& oracle,
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	678 IObservable& oracleObservable) :
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	679 IObserver(oracleObservable.GetBroker()),
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	680 oracle_(oracle),
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	681 active_(false),
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	682 simultaneousDownloads_(4),
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	683 sorter_(new BasicFetchingItemsSorter::Factory)
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	684 {
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	685 oracleObservable.RegisterObserverCallback(
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	686 new Callable<OrthancSeriesVolumeProgressiveLoader, OrthancRestApiCommand::SuccessMessage>
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	687 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadGeometry));
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	688
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	689 oracleObservable.RegisterObserverCallback(
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	690 new Callable<OrthancSeriesVolumeProgressiveLoader, GetOrthancImageCommand::SuccessMessage>
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	691 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadBestQualitySliceContent));
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	692
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	693 oracleObservable.RegisterObserverCallback(
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	694 new Callable<OrthancSeriesVolumeProgressiveLoader, GetOrthancWebViewerJpegCommand::SuccessMessage>
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	695 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent));
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	696 }
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	697
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	698 void SetSimultaneousDownloads(unsigned int count)
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	699 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	700 if (active_)
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	701 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	702 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	703 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	704 else if (count == 0)
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	705 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	706 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	707 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	708 else
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	709 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	710 simultaneousDownloads_ = count;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	711 }
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	712 }
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	713
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	714 void LoadSeries(const std::string& seriesId)
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	715 {
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	716 if (active_)
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	717 {
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	718 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	719 }
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	720 else
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	721 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	722 active_ = true;
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	723
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	724 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	725 command->SetUri("/series/" + seriesId + "/instances-tags");
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	726
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	727 oracle_.Schedule(*this, command.release());
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	728 }
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	729 }
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	730
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	731
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	732 const DicomSeriesVolumeImage& GetVolume() const
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	733 {
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	734 return volume_;
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	735 }
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	736 };
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	737
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	738
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	739
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	740 class OrthancMultiframeVolumeLoader : public IObserver
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	741 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	742 private:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	743 class Handler : public Orthanc::IDynamicObject
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	744 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	745 private:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	746 OrthancMultiframeVolumeLoader& that_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	747 std::string instanceId_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	748
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	749 protected:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	750 void Schedule(OrthancRestApiCommand* command) const
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	751 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	752 that_.oracle_.Schedule(that_, command);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	753 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	754
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	755 const std::string& GetInstanceId() const
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	756 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	757 return instanceId_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	758 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	759
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	760 OrthancMultiframeVolumeLoader& GetTarget() const
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	761 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	762 return that_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	763 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	764
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	765 public:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	766 Handler(OrthancMultiframeVolumeLoader& that,
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	767 const std::string& instanceId) :
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	768 that_(that),
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	769 instanceId_(instanceId)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	770 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	771 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	772
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	773 Handler(const Handler& previous) :
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	774 that_(previous.that_),
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	775 instanceId_(previous.instanceId_)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	776 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	777 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	778
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	779 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const = 0;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	780 };
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	781
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	782 void Handle(const OrthancRestApiCommand::SuccessMessage& message)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	783 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	784 dynamic_cast<const Handler&>(message.GetOrigin().GetPayload()).Handle(message);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	785 }
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	786
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	787
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	788 class LoadRTDoseGeometry : public Handler
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	789 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	790 private:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	791 std::auto_ptr<Orthanc::DicomMap> dicom_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	792
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	793 public:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	794 LoadRTDoseGeometry(const Handler& previous,
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	795 Orthanc::DicomMap* dicom) :
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	796 Handler(previous),
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	797 dicom_(dicom)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	798 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	799 if (dicom == NULL)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	800 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	801 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	802 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	803 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	804
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	805 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	806 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	807 // Complete the DICOM tags with just-received "Grid Frame Offset Vector"
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	808 std::string s = Orthanc::Toolbox::StripSpaces(message.GetAnswer());
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	809 dicom_->SetValue(Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR, s, false);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	810
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	811 GetTarget().SetGeometry(*dicom_);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	812 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	813 };
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	814
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	815
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	816 class LoadGeometry : public Handler
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	817 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	818 public:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	819 LoadGeometry(OrthancMultiframeVolumeLoader& that,
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	820 const std::string& instanceId) :
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	821 Handler(that, instanceId)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	822 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	823 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	824
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	825 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	826 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	827 Json::Value body;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	828 message.ParseJsonBody(body);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	829
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	830 if (body.type() != Json::objectValue)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	831 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	832 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	833 }
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	834
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	835 std::auto_ptr<Orthanc::DicomMap> dicom(new Orthanc::DicomMap);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	836 dicom->FromDicomAsJson(body);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	837
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	838 std::string s;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	839 if (!dicom->CopyToString(s, Orthanc::DICOM_TAG_SOP_CLASS_UID, false))
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	840 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	841 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	842 "DICOM file without SOP class UID");
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	843 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	844
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	845 if (StringToSopClassUid(s) == SopClassUid_RTDose)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	846 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	847 // Download the "Grid Frame Offset Vector" DICOM tag, that is
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	848 // mandatory for RT-DOSE, but is too long to be returned by default
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	849
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	850 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	851 command->SetUri("/instances/" + GetInstanceId() + "/content/" +
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	852 Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR.Format());
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	853 command->SetPayload(new LoadRTDoseGeometry(*this, dicom.release()));
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	854
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	855 Schedule(command.release());
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	856 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	857 else
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	858 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	859 GetTarget().SetGeometry(*dicom);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	860 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	861 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	862 };
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	863
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	864
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	865
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	866 IOracle& oracle_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	867 bool active_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	868
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	869 std::auto_ptr<ImageBuffer3D> image_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	870 std::auto_ptr<DicomInstanceParameters> dicom_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	871 std::auto_ptr<VolumeImageGeometry> geometry_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	872
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	873
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	874 void SetGeometry(const Orthanc::DicomMap& dicom)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	875 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	876 dicom_.reset(new DicomInstanceParameters(dicom));
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	877
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	878 Orthanc::PixelFormat format;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	879 if (!dicom_->GetImageInformation().ExtractPixelFormat(format, true))
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	880 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	881 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	882 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	883
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	884 const unsigned int width = dicom_->GetImageInformation().GetWidth();
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	885 const unsigned int height = dicom_->GetImageInformation().GetHeight();
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	886 const unsigned int depth = dicom_->GetImageInformation().GetNumberOfFrames();
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	887
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	888 geometry_.reset(new VolumeImageGeometry);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	889 geometry_->SetSize(width, height, depth);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	890 geometry_->SetAxialGeometry(dicom_->GetGeometry());
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	891 geometry_->SetVoxelDimensions(dicom_->GetPixelSpacingX(),
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	892 dicom_->GetPixelSpacingY(),
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	893 dicom_->GetThickness());
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	894
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	895 image_.reset(new ImageBuffer3D(format, width, height, depth,
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	896 false /* don't compute range */));
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	897
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	898 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	899 Orthanc::DicomArray a(dicom);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	900 a.Print(stdout);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	901 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	902 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	903
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	904
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	905 public:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	906 OrthancMultiframeVolumeLoader(IOracle& oracle,
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	907 IObservable& oracleObservable) :
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	908 IObserver(oracleObservable.GetBroker()),
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	909 oracle_(oracle),
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	910 active_(false)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	911 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	912 oracleObservable.RegisterObserverCallback(
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	913 new Callable<OrthancMultiframeVolumeLoader, OrthancRestApiCommand::SuccessMessage>
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	914 (*this, &OrthancMultiframeVolumeLoader::Handle));
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	915 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	916
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	917 void LoadInstance(const std::string& instanceId)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	918 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	919 if (active_)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	920 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	921 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	922 }
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	923 else
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	924 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	925 active_ = true;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	926
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	927 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	928 command->SetUri("/instances/" + instanceId + "/tags");
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	929 command->SetPayload(new LoadGeometry(*this, instanceId));
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	930
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	931 oracle_.Schedule(*this, command.release());
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	932 }
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	933 }
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	934 };
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	935
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	936
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	937
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	938 class VolumeSceneLayerSource : public boost::noncopyable
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	939 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	940 private:
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	941 int layerDepth_;
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	942 boost::shared_ptr<IVolumeSlicer> slicer_;
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	943 bool linearInterpolation_;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	944 std::auto_ptr<CoordinateSystem3D> lastPlane_;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	945 uint64_t lastRevision_;
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	946
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	947 static bool IsSameCuttingPlane(const CoordinateSystem3D& a,
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	948 const CoordinateSystem3D& b)
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	949 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	950 double distance;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	951 return (CoordinateSystem3D::ComputeDistance(distance, a, b) &&
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	952 LinearAlgebra::IsCloseToZero(distance));
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	953 }
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	954
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	955 public:
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	956 VolumeSceneLayerSource(int layerDepth,
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	957 IVolumeSlicer* slicer) : // Takes ownership
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	958 layerDepth_(layerDepth),
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	959 slicer_(slicer),
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	960 linearInterpolation_(false)
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	961 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	962 if (slicer == NULL)
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	963 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	964 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	965 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	966 }
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	967
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	968 const IVolumeSlicer& GetSlicer() const
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	969 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	970 return *slicer_;
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	971 }
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	972
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	973 void SetLinearInterpolation(bool enabled)
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	974 {
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	975 linearInterpolation_ = enabled;
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	976 }
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	977
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	978 bool IsLinearInterpolation() const
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	979 {
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	980 return linearInterpolation_;
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	981 }
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	982
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	983 void Update(Scene2D& scene,
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	984 const CoordinateSystem3D& plane)
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	985 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	986 assert(slicer_.get() != NULL);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	987 std::auto_ptr<IVolumeSlicer::ExtractedSlice> slice(slicer_->ExtractSlice(plane));
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	988
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	989 if (slice.get() == NULL)
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	990 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	991 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	992 }
032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	993
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	994 if (!slice->IsValid())
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	995 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	996 // The slicer cannot handle this cutting plane: Clear the layer
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	997 scene.DeleteLayer(layerDepth_);
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	998 lastPlane_.reset(NULL);
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	999 }
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1000 else if (lastPlane_.get() != NULL &&
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1001 IsSameCuttingPlane(*lastPlane_, plane) &&
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1002 lastRevision_ == slice->GetRevision())
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1003 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1004 // The content of the slice has not changed: Do nothing
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1005 }
032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1006 else
032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1007 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1008 // Content has changed: An update is needed
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1009 lastPlane_.reset(new CoordinateSystem3D(plane));
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1010 lastRevision_ = slice->GetRevision();
692 10910827f235 simplification in DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 691 diff changeset	1011
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1012 std::auto_ptr<ISceneLayer> layer(slice->CreateSceneLayer());
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1013 if (layer.get() == NULL)
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1014 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1015 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1016 }
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1017
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1018 if (layer->GetType() == ISceneLayer::Type_ColorTexture \|\|
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1019 layer->GetType() == ISceneLayer::Type_FloatTexture)
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1020 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1021 dynamic_cast<TextureBaseSceneLayer&>(*layer).SetLinearInterpolation(linearInterpolation_);
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1022 }
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1023
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1024 scene.SetLayer(layerDepth_, layer.release());
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1025 }
032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1026 }
032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1027 };
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1028
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1029
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1030
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1031
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1032
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1033 class NativeApplicationContext : public IMessageEmitter
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1034 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1035 private:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1036 boost::shared_mutex mutex_;
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1037 MessageBroker broker_;
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1038 IObservable oracleObservable_;
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1039
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1040 public:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1041 NativeApplicationContext() :
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1042 oracleObservable_(broker_)
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1043 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1044 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1045
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1046
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1047 virtual void EmitMessage(const IObserver& observer,
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1048 const IMessage& message)
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1049 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1050 try
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1051 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1052 boost::unique_lock<boost::shared_mutex> lock(mutex_);
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1053 oracleObservable_.EmitMessage(observer, message);
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1054 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1055 catch (Orthanc::OrthancException& e)
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1056 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1057 LOG(ERROR) << "Exception while emitting a message: " << e.What();
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1058 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1059 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1060
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1061
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1062 class ReaderLock : public boost::noncopyable
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1063 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1064 private:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1065 NativeApplicationContext& that_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1066 boost::shared_lock<boost::shared_mutex> lock_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1067
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1068 public:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1069 ReaderLock(NativeApplicationContext& that) :
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1070 that_(that),
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1071 lock_(that.mutex_)
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1072 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1073 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1074 };
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1075
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1076
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1077 class WriterLock : public boost::noncopyable
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1078 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1079 private:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1080 NativeApplicationContext& that_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1081 boost::unique_lock<boost::shared_mutex> lock_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1082
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1083 public:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1084 WriterLock(NativeApplicationContext& that) :
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1085 that_(that),
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1086 lock_(that.mutex_)
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1087 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1088 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1089
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1090 MessageBroker& GetBroker()
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1091 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1092 return that_.broker_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1093 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1094
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1095 IObservable& GetOracleObservable()
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1096 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1097 return that_.oracleObservable_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1098 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1099 };
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1100 };
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1101 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1102
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1103
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1104
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1105 class Toto : public OrthancStone::IObserver
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1106 {
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1107 private:
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1108 OrthancStone::IOracle& oracle_;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1109 OrthancStone::Scene2D scene_;
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1110 std::auto_ptr<OrthancStone::VolumeSceneLayerSource> source_;
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1111
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1112 void Handle(const OrthancStone::SleepOracleCommand::TimeoutMessage& message)
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1113 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1114 if (message.GetOrigin().HasPayload())
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1115 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1116 printf("TIMEOUT! %d\n", dynamic_cast<const Orthanc::SingleValueObject<unsigned int>& >(message.GetOrigin().GetPayload()).GetValue());
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1117 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1118 else
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1119 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1120 printf("TIMEOUT\n");
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1121
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1122 if (source_.get() != NULL)
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1123 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1124 OrthancStone::CoordinateSystem3D plane;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1125
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1126 const OrthancStone::OrthancSeriesVolumeProgressiveLoader::MPRSlicer& loader =
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1127 dynamic_cast<const OrthancStone::OrthancSeriesVolumeProgressiveLoader::MPRSlicer&>(source_->GetSlicer());
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1128
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1129 if (loader.GetVolume().HasGeometry())
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1130 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1131 plane = loader.GetVolume().GetGeometry().GetSagittalGeometry();
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1132 plane.SetOrigin(loader.GetVolume().GetGeometry().GetCoordinates(0.5f, 0.5f, 0.5f));
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1133 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1134
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1135 source_->Update(scene_, plane);
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1136 scene_.FitContent(1024, 768);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1137
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1138 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1139 OrthancStone::CairoCompositor compositor(scene_, 1024, 768);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1140 compositor.Refresh();
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1141
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1142 Orthanc::ImageAccessor accessor;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1143 compositor.GetCanvas().GetReadOnlyAccessor(accessor);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1144
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1145 Orthanc::Image tmp(Orthanc::PixelFormat_RGB24, accessor.GetWidth(), accessor.GetHeight(), false);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1146 Orthanc::ImageProcessing::Convert(tmp, accessor);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1147
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1148 static unsigned int count = 0;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1149 char buf[64];
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1150 sprintf(buf, "scene-%06d.png", count++);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1151
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1152 Orthanc::PngWriter writer;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1153 writer.WriteToFile(buf, tmp);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1154 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1155 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1156
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1157 oracle_.Schedule(*this, new OrthancStone::SleepOracleCommand(message.GetOrigin().GetDelay()));
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1158 }
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1159 }
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1160
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1161 void Handle(const OrthancStone::OrthancRestApiCommand::SuccessMessage& message)
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1162 {
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1163 Json::Value v;
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	1164 message.ParseJsonBody(v);
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1165
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1166 printf("ICI [%s]\n", v.toStyledString().c_str());
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1167 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1168
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1169 void Handle(const OrthancStone::GetOrthancImageCommand::SuccessMessage& message)
637 afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1170 {
afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1171 printf("IMAGE %dx%d\n", message.GetImage().GetWidth(), message.GetImage().GetHeight());
afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1172 }
afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1173
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1174 void Handle(const OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage& message)
642 7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1175 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1176 printf("WebViewer %dx%d\n", message.GetImage().GetWidth(), message.GetImage().GetHeight());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1177 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1178
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1179 void Handle(const OrthancStone::OracleCommandExceptionMessage& message)
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1180 {
639 d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1181 printf("EXCEPTION: [%s] on command type %d\n", message.GetException().What(), message.GetCommand().GetType());
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1182
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1183 switch (message.GetCommand().GetType())
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1184 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1185 case OrthancStone::IOracleCommand::Type_GetOrthancWebViewerJpeg:
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1186 printf("URI: [%s]\n", dynamic_cast<const OrthancStone::GetOrthancWebViewerJpegCommand&>
639 d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1187 (message.GetCommand()).GetUri().c_str());
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1188 break;
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1189
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1190 default:
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1191 break;
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1192 }
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1193 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1194
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1195 public:
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1196 Toto(OrthancStone::IOracle& oracle,
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1197 OrthancStone::IObservable& oracleObservable) :
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1198 IObserver(oracleObservable.GetBroker()),
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1199 oracle_(oracle)
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1200 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1201 oracleObservable.RegisterObserverCallback
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	1202 (new OrthancStone::Callable
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1203 <Toto, OrthancStone::SleepOracleCommand::TimeoutMessage>(*this, &Toto::Handle));
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1204
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1205 oracleObservable.RegisterObserverCallback
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1206 (new OrthancStone::Callable
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1207 <Toto, OrthancStone::OrthancRestApiCommand::SuccessMessage>(*this, &Toto::Handle));
637 afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1208
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1209 oracleObservable.RegisterObserverCallback
637 afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1210 (new OrthancStone::Callable
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1211 <Toto, OrthancStone::GetOrthancImageCommand::SuccessMessage>(*this, &Toto::Handle));
639 d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1212
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1213 oracleObservable.RegisterObserverCallback
639 d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1214 (new OrthancStone::Callable
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1215 <Toto, OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage>(*this, &Toto::Handle));
642 7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1216
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1217 oracleObservable.RegisterObserverCallback
642 7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1218 (new OrthancStone::Callable
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1219 <Toto, OrthancStone::OracleCommandExceptionMessage>(*this, &Toto::Handle));
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1220 }
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1221
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1222 void SetVolume(int depth,
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1223 OrthancStone::IVolumeSlicer* volume)
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1224 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1225 source_.reset(new OrthancStone::VolumeSceneLayerSource(0, volume));
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1226 }
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1227 };
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1228
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1229
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1230 void Run(OrthancStone::NativeApplicationContext& context,
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1231 OrthancStone::IOracle& oracle)
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1232 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1233 boost::shared_ptr<Toto> toto;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1234 boost::shared_ptr<OrthancStone::OrthancSeriesVolumeProgressiveLoader> loader1, loader2;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1235 boost::shared_ptr<OrthancStone::OrthancMultiframeVolumeLoader> loader3;
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1236
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1237 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1238 OrthancStone::NativeApplicationContext::WriterLock lock(context);
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1239 toto.reset(new Toto(oracle, lock.GetOracleObservable()));
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	1240 loader1.reset(new OrthancStone::OrthancSeriesVolumeProgressiveLoader(oracle, lock.GetOracleObservable()));
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	1241 loader2.reset(new OrthancStone::OrthancSeriesVolumeProgressiveLoader(oracle, lock.GetOracleObservable()));
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1242 loader3.reset(new OrthancStone::OrthancMultiframeVolumeLoader(oracle, lock.GetOracleObservable()));
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	1243 }
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	1244
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1245 oracle.Schedule(*toto, new OrthancStone::SleepOracleCommand(100));
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1246
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1247 if (0)
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1248 {
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1249 Json::Value v = Json::objectValue;
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1250 v["Level"] = "Series";
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1251 v["Query"] = Json::objectValue;
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1252
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1253 std::auto_ptr<OrthancStone::OrthancRestApiCommand> command(new OrthancStone::OrthancRestApiCommand);
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1254 command->SetMethod(Orthanc::HttpMethod_Post);
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1255 command->SetUri("/tools/find");
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1256 command->SetBody(v);
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1257
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	1258 oracle.Schedule(*toto, command.release());
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1259 }
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	1260
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1261 if (0)
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1262 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1263 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1264 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)));
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1265 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1266 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1267 }
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1268
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1269 if (0)
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1270 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1271 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1272 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png)));
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1273 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1274 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1275 }
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1276
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1277 if (0)
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1278 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1279 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1280 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png)));
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1281 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1282 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1283 }
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1284
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1285 if (0)
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1286 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1287 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1288 command->SetHttpHeader("Accept-Encoding", "gzip");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1289 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1290 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1291 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1292 }
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1293
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1294 if (0)
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1295 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1296 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1297 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1298 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1299 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1300 }
638 e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	1301
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1302 if (0)
638 e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	1303 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1304 std::auto_ptr<OrthancStone::GetOrthancWebViewerJpegCommand> command(new OrthancStone::GetOrthancWebViewerJpegCommand);
638 e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	1305 command->SetHttpHeader("Accept-Encoding", "gzip");
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	1306 command->SetInstance("e6c7c20b-c9f65d7e-0d76f2e2-830186f2-3e3c600e");
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	1307 command->SetQuality(90);
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	1308 oracle.Schedule(*toto, command.release());
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	1309 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	1310
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	1311
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1312 if (0)
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1313 {
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1314 for (unsigned int i = 0; i < 10; i++)
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1315 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1316 std::auto_ptr<OrthancStone::SleepOracleCommand> command(new OrthancStone::SleepOracleCommand(i * 1000));
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1317 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(42 * i));
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1318 oracle.Schedule(*toto, command.release());
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1319 }
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1320 }
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1321
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	1322 // 2017-11-17-Anonymized
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1323 //loader1->LoadSeries("cb3ea4d1-d08f3856-ad7b6314-74d88d77-60b05618"); // CT
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1324 loader3->LoadInstance("41029085-71718346-811efac4-420e2c15-d39f99b6"); // RT-DOSE
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1325
661 970949ff868a fix warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 648 diff changeset	1326 // Delphine
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1327 //loader1->LoadSeries("5990e39c-51e5f201-fe87a54c-31a55943-e59ef80e"); // CT
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1328 //loader1->LoadSeries("67f1b334-02c16752-45026e40-a5b60b6b-030ecab5"); // Lung 1/10mm
661 970949ff868a fix warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 648 diff changeset	1329
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1330
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1331 toto->SetVolume(0, new OrthancStone::OrthancSeriesVolumeProgressiveLoader::MPRSlicer(loader1));
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1332
642 7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1333 LOG(WARNING) << "...Waiting for Ctrl-C...";
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1334 Orthanc::SystemToolbox::ServerBarrier();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1335 //boost::this_thread::sleep(boost::posix_time::seconds(1));
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1336 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1337
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1338
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1339
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1340 /**
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1341 * IMPORTANT: The full arguments to "main()" are needed for SDL on
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1342 * Windows. Otherwise, one gets the linking error "undefined reference
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1343 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1344 **/
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1345 int main(int argc, char* argv[])
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1346 {
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1347 OrthancStone::StoneInitialize();
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1348 Orthanc::Logging::EnableInfoLevel(true);
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1349
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1350 try
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1351 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1352 OrthancStone::NativeApplicationContext context;
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1353
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1354 OrthancStone::ThreadedOracle oracle(context);
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1355 oracle.SetThreadsCount(1);
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1356
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1357 {
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1358 Orthanc::WebServiceParameters p;
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1359 //p.SetUrl("http://localhost:8043/");
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1360 p.SetCredentials("orthanc", "orthanc");
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1361 oracle.SetOrthancParameters(p);
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1362 }
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1363
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1364 oracle.Start();
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1365
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1366 Run(context, oracle);
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1367
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	1368 oracle.Stop();
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1369 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1370 catch (Orthanc::OrthancException& e)
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1371 {
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1372 LOG(ERROR) << "EXCEPTION: " << e.What();
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1373 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1374
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1375 OrthancStone::StoneFinalize();
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1376
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1377 return 0;
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1378 }

Mercurial > hg > orthanc-stone

annotate Samples/Sdl/Loader.cpp @ 763:53167294d870