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

annotate Samples/Sdl/Loader.cpp @ 793:f72b49954f62

DicomVolumeImageMPRSlicer

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 28 May 2019 10:39:42 +0200
parents	4fe4b221a31f
children	04f518ebd132

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"
767 dce5b067d040 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 766 diff changeset	35 #include "../../Framework/Scene2D/PolylineSceneLayer.h"
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 767 diff changeset	36 #include "../../Framework/Scene2D/LookupTableTextureSceneLayer.h"
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	37 #include "../../Framework/StoneInitialization.h"
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	38 #include "../../Framework/Toolbox/GeometryToolbox.h"
683 dbc1d8bfc68a reorganizing ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 681 diff changeset	39 #include "../../Framework/Toolbox/SlicesSorter.h"
784 9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	40 #include "../../Framework/Toolbox/DicomStructureSet.h"
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	41 #include "../../Framework/Volumes/ImageBuffer3D.h"
742 fa5febe0f0c2 moved OrientedBoundingBox in the Volumes folder Sebastien Jodogne <s.jodogne@gmail.com> parents: 735 diff changeset	42 #include "../../Framework/Volumes/VolumeImageGeometry.h"
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	43 #include "../../Framework/Volumes/VolumeReslicer.h"
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 // From Orthanc framework
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	46 #include <Core/DicomFormat/DicomArray.h>
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	47 #include <Core/Images/Image.h>
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 #include <Core/Images/ImageProcessing.h>
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	49 #include <Core/Images/PngWriter.h>
787 1a28fce57ff3 Fixed Visual Studio 2008 build Benjamin Golinvaux <bgo@osimis.io> parents: 769 diff changeset	50 #include <Core/Endianness.h>
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 #include <Core/Logging.h>
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 #include <Core/OrthancException.h>
683 dbc1d8bfc68a reorganizing ImageBuffer3D Sebastien Jodogne <s.jodogne@gmail.com> parents: 681 diff changeset	53 #include <Core/SystemToolbox.h>
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	54 #include <Core/Toolbox.h>
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 767 diff changeset	57 #include <EmbeddedResources.h>
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 767 diff changeset	58
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 767 diff changeset	59
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	60 namespace OrthancStone
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 {
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	62 // Application-configurable, can be shared between 3D/2D
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	63 class ILayerStyleConfigurator
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	64 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	65 public:
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	66 virtual ~ILayerStyleConfigurator()
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	67 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	68 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	69
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	70 virtual uint64_t GetRevision() const = 0;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	71
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	72 virtual TextureBaseSceneLayer* CreateTextureFromImage(const Orthanc::ImageAccessor& image) const = 0;
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	73
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	74 virtual TextureBaseSceneLayer* CreateTextureFromDicom(const Orthanc::ImageAccessor& frame,
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	75 const DicomInstanceParameters& parameters) const = 0;
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	76
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	77 virtual void ApplyStyle(ISceneLayer& layer) const = 0;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	78 };
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	79
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	80
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	81
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	82 class LookupTableStyleConfigurator : public ILayerStyleConfigurator
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	83 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	84 private:
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	85 uint64_t revision_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	86 bool hasLut_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	87 std::string lut_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	88 bool hasRange_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	89 float minValue_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	90 float maxValue_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	91
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	92 public:
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	93 LookupTableStyleConfigurator() :
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	94 revision_(0),
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	95 hasLut_(false),
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	96 hasRange_(false)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	97 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	98 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	99
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	100 void SetLookupTable(Orthanc::EmbeddedResources::FileResourceId resource)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	101 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	102 hasLut_ = true;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	103 Orthanc::EmbeddedResources::GetFileResource(lut_, resource);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	104 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	105
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	106 void SetLookupTable(const std::string& lut)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	107 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	108 hasLut_ = true;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	109 lut_ = lut;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	110 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	111
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	112 void SetRange(float minValue,
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	113 float maxValue)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	114 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	115 if (minValue > maxValue)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	116 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	117 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	118 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	119 else
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	120 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	121 hasRange_ = true;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	122 minValue_ = minValue;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	123 maxValue_ = maxValue;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	124 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	125 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	126
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	127 virtual uint64_t GetRevision() const
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	128 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	129 return revision_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	130 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	131
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	132 virtual TextureBaseSceneLayer* CreateTextureFromImage(const Orthanc::ImageAccessor& image) const
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	133 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	134 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	135 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	136
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	137 virtual TextureBaseSceneLayer* CreateTextureFromDicom(const Orthanc::ImageAccessor& frame,
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	138 const DicomInstanceParameters& parameters) const
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	139 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	140 return parameters.CreateLookupTableTexture(frame);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	141 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	142
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	143 virtual void ApplyStyle(ISceneLayer& layer) const
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	144 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	145 LookupTableTextureSceneLayer& l = dynamic_cast<LookupTableTextureSceneLayer&>(layer);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	146
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	147 if (hasLut_)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	148 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	149 l.SetLookupTable(lut_);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	150 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	151
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	152 if (hasRange_)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	153 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	154 l.SetRange(minValue_, maxValue_);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	155 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	156 else
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	157 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	158 l.FitRange();
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	159 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	160 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	161 };
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	162
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	163
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	164 class GrayscaleStyleConfigurator : public ILayerStyleConfigurator
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	165 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	166 private:
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	167 uint64_t revision_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	168
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	169 public:
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	170 GrayscaleStyleConfigurator() :
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	171 revision_(0)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	172 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	173 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	174
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	175 virtual uint64_t GetRevision() const
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	176 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	177 return revision_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	178 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	179
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	180 virtual TextureBaseSceneLayer* CreateTextureFromImage(const Orthanc::ImageAccessor& image) const
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	181 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	182 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	183 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	184
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	185 virtual TextureBaseSceneLayer* CreateTextureFromDicom(const Orthanc::ImageAccessor& frame,
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	186 const DicomInstanceParameters& parameters) const
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	187 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	188 return parameters.CreateTexture(frame);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	189 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	190
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	191 virtual void ApplyStyle(ISceneLayer& layer) const
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	192 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	193 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	194 };
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	195
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	196
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	197 class IVolumeSlicer : public boost::noncopyable
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	198 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	199 public:
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	200 class IExtractedSlice : public boost::noncopyable
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	201 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	202 public:
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	203 virtual ~IExtractedSlice()
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	204 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	205 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	206
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	207 virtual bool IsValid() = 0;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	208
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	209 // Must be a cheap call
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	210 virtual uint64_t GetRevision() = 0;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	211
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	212 // This call can take some time
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	213 virtual ISceneLayer* CreateSceneLayer(const ILayerStyleConfigurator* configurator, // possibly absent
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	214 const CoordinateSystem3D& cuttingPlane) = 0;
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	215 };
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	216
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	217
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	218 class InvalidSlice : public IExtractedSlice
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	219 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	220 public:
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	221 virtual bool IsValid()
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	222 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	223 return false;
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	224 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	225
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	226 virtual uint64_t GetRevision()
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	227 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	228 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	229 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	230
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	231 virtual ISceneLayer* CreateSceneLayer(const ILayerStyleConfigurator* configurator,
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	232 const CoordinateSystem3D& cuttingPlane)
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	233 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	234 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	235 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	236 };
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	237
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	238
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	239 virtual ~IVolumeSlicer()
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	240 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	241 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	242
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	243 virtual IExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane) = 0;
759 774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	244 };
774681b2c77c simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 757 diff changeset	245
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	246
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	247
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	248 // This class combines a 3D image buffer, a 3D volume geometry and
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	249 // information about the DICOM parameters of the series.
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	250 class DicomVolumeImage : public boost::noncopyable
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	251 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	252 public:
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	253 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, GeometryReadyMessage, DicomVolumeImage);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	254 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, ContentUpdatedMessage, DicomVolumeImage);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	255
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	256 private:
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	257 uint64_t revision_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	258 std::auto_ptr<VolumeImageGeometry> geometry_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	259 std::auto_ptr<ImageBuffer3D> image_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	260 std::auto_ptr<DicomInstanceParameters> parameters_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	261
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	262 void CheckHasGeometry() const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	263 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	264 if (!HasGeometry())
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	265 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	266 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	267 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	268 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	269
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	270 public:
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	271 DicomVolumeImage() :
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	272 revision_(0)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	273 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	274 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	275
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	276 void IncrementRevision()
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	277 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	278 revision_ ++;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	279 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	280
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	281 void Initialize(const VolumeImageGeometry& geometry,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	282 Orthanc::PixelFormat format)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	283 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	284 geometry_.reset(new VolumeImageGeometry(geometry));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	285 image_.reset(new ImageBuffer3D(format, geometry_->GetWidth(), geometry_->GetHeight(),
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	286 geometry_->GetDepth(), false /* don't compute range */));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	287
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	288 revision_ ++;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	289 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	290
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	291 void SetDicomParameters(const DicomInstanceParameters& parameters)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	292 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	293 parameters_.reset(parameters.Clone());
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	294 revision_ ++;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	295 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	296
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	297 uint64_t GetRevision() const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	298 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	299 return revision_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	300 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	301
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	302 bool HasGeometry() const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	303 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	304 return (geometry_.get() != NULL &&
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	305 image_.get() != NULL);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	306 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	307
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	308 ImageBuffer3D& GetPixelData()
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	309 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	310 CheckHasGeometry();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	311 return *image_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	312 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	313
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	314 const ImageBuffer3D& GetPixelData() const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	315 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	316 CheckHasGeometry();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	317 return *image_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	318 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	319
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	320 const VolumeImageGeometry& GetGeometry() const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	321 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	322 CheckHasGeometry();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	323 return *geometry_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	324 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	325
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	326 bool HasDicomParameters() const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	327 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	328 return parameters_.get() != NULL;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	329 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	330
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	331 const DicomInstanceParameters& GetDicomParameters() const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	332 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	333 if (HasDicomParameters())
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	334 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	335 return *parameters_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	336 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	337 else
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	338 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	339 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	340 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	341 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	342 };
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	343
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	344
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	345
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	346 class DicomVolumeImageMPRSlicer : public IVolumeSlicer
667 e9339f2b5de7 refactoring of VolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	347 {
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	348 public:
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	349 class Slice : public IExtractedSlice
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	350 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	351 private:
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	352 const DicomVolumeImage& volume_;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	353 bool valid_;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	354 VolumeProjection projection_;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	355 unsigned int sliceIndex_;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	356
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	357 void CheckValid() const
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	358 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	359 if (!valid_)
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	360 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	361 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	362 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	363 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	364
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	365 protected:
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	366 // Can be overloaded in subclasses
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	367 virtual uint64_t GetRevisionInternal(VolumeProjection projection,
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	368 unsigned int sliceIndex) const
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	369 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	370 return volume_.GetRevision();
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	371 }
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	372
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	373 public:
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	374 Slice(const DicomVolumeImage& volume,
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	375 const CoordinateSystem3D& cuttingPlane) :
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	376 volume_(volume)
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	377 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	378 valid_ = (volume_.HasDicomParameters() &&
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	379 volume_.GetGeometry().DetectSlice(projection_, sliceIndex_, cuttingPlane));
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	380 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	381
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	382 VolumeProjection GetProjection() const
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	383 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	384 CheckValid();
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	385 return projection_;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	386 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	387
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	388 unsigned int GetSliceIndex() const
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	389 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	390 CheckValid();
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	391 return sliceIndex_;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	392 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	393
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	394 virtual bool IsValid()
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	395 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	396 return valid_;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	397 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	398
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	399 virtual uint64_t GetRevision()
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	400 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	401 CheckValid();
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	402 return GetRevisionInternal(projection_, sliceIndex_);
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	403 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	404
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	405 virtual ISceneLayer* CreateSceneLayer(const ILayerStyleConfigurator* configurator,
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	406 const CoordinateSystem3D& cuttingPlane)
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	407 {
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	408 CheckValid();
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	409
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	410 if (configurator == NULL)
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	411 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	412 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer,
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	413 "A style configurator is mandatory for textures");
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	414 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	415
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	416 std::auto_ptr<TextureBaseSceneLayer> texture;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	417
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	418 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	419 const DicomInstanceParameters& parameters = volume_.GetDicomParameters();
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	420 ImageBuffer3D::SliceReader reader(volume_.GetPixelData(), projection_, sliceIndex_);
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	421 texture.reset(dynamic_cast<TextureBaseSceneLayer*>
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	422 (configurator->CreateTextureFromDicom(reader.GetAccessor(), parameters)));
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	423 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	424
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	425 const CoordinateSystem3D& system = volume_.GetGeometry().GetProjectionGeometry(projection_);
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	426
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	427 double x0, y0, x1, y1;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	428 cuttingPlane.ProjectPoint(x0, y0, system.GetOrigin());
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	429 cuttingPlane.ProjectPoint(x1, y1, system.GetOrigin() + system.GetAxisX());
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	430 texture->SetOrigin(x0, y0);
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	431
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	432 double dx = x1 - x0;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	433 double dy = y1 - y0;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	434 if (!LinearAlgebra::IsCloseToZero(dx) \|\|
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	435 !LinearAlgebra::IsCloseToZero(dy))
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	436 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	437 texture->SetAngle(atan2(dy, dx));
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	438 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	439
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	440 Vector tmp = volume_.GetGeometry().GetVoxelDimensions(projection_);
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	441 texture->SetPixelSpacing(tmp[0], tmp[1]);
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	442
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	443 return texture.release();
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	444
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	445 #if 0
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	446 double w = texture->GetTexture().GetWidth() * tmp[0];
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	447 double h = texture->GetTexture().GetHeight() * tmp[1];
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	448 printf("%.1f %.1f %.1f => %.1f %.1f => %.1f %.1f\n",
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	449 system.GetOrigin() [0],
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	450 system.GetOrigin() [1],
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	451 system.GetOrigin() [2],
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	452 x0, y0, x0 + w, y0 + h);
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	453
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	454 std::auto_ptr<PolylineSceneLayer> toto(new PolylineSceneLayer);
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	455
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	456 PolylineSceneLayer::Chain c;
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	457 c.push_back(ScenePoint2D(x0, y0));
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	458 c.push_back(ScenePoint2D(x0 + w, y0));
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	459 c.push_back(ScenePoint2D(x0 + w, y0 + h));
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	460 c.push_back(ScenePoint2D(x0, y0 + h));
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	461
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	462 toto->AddChain(c, true);
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	463
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	464 return toto.release();
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	465 #endif
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	466 }
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	467 };
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	468
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	469 private:
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	470 boost::shared_ptr<DicomVolumeImage> volume_;
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	471
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	472 public:
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	473 DicomVolumeImageMPRSlicer(const boost::shared_ptr<DicomVolumeImage>& volume) :
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	474 volume_(volume)
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	475 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	476 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	477
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	478 virtual IExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane)
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	479 {
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	480 if (volume_->HasGeometry())
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	481 {
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	482 return new Slice(*volume_, cuttingPlane);
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	483 }
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	484 else
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	485 {
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	486 return new IVolumeSlicer::InvalidSlice;
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	487 }
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	488 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	489 };
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	490
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	491
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	492
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	493
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	494
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	495 class OrthancSeriesVolumeProgressiveLoader :
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	496 public IObserver,
78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	497 public IObservable,
78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	498 public IVolumeSlicer
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	499 {
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	500 private:
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	501 static const unsigned int LOW_QUALITY = 0;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	502 static const unsigned int MIDDLE_QUALITY = 1;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	503 static const unsigned int BEST_QUALITY = 2;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	504
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	505
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	506 // Helper class internal to OrthancSeriesVolumeProgressiveLoader
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	507 class SeriesGeometry : public boost::noncopyable
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	508 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	509 private:
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	510 void CheckSlice(size_t index,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	511 const DicomInstanceParameters& reference) const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	512 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	513 const DicomInstanceParameters& slice = *slices_[index];
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	514
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	515 if (!GeometryToolbox::IsParallel(
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	516 reference.GetGeometry().GetNormal(),
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	517 slice.GetGeometry().GetNormal()))
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	518 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	519 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	520 "A slice in the volume image is not parallel to the others");
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	521 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	522
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	523 if (reference.GetExpectedPixelFormat() != slice.GetExpectedPixelFormat())
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	524 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	525 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	526 "The pixel format changes across the slices of the volume image");
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	527 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	528
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	529 if (reference.GetImageInformation().GetWidth() != slice.GetImageInformation().GetWidth() \|\|
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	530 reference.GetImageInformation().GetHeight() != slice.GetImageInformation().GetHeight())
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	531 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	532 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	533 "The width/height of slices are not constant in the volume image");
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	534 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	535
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	536 if (!LinearAlgebra::IsNear(reference.GetPixelSpacingX(), slice.GetPixelSpacingX()) \|\|
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	537 !LinearAlgebra::IsNear(reference.GetPixelSpacingY(), slice.GetPixelSpacingY()))
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	538 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	539 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	540 "The pixel spacing of the slices change across the volume image");
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	541 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	542 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	543
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	544
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	545 void CheckVolume() const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	546 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	547 for (size_t i = 0; i < slices_.size(); i++)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	548 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	549 assert(slices_[i] != NULL);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	550 if (slices_[i]->GetImageInformation().GetNumberOfFrames() != 1)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	551 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	552 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	553 "This class does not support multi-frame images");
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	554 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	555 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	556
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	557 if (slices_.size() != 0)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	558 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	559 const DicomInstanceParameters& reference = *slices_[0];
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	560
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	561 for (size_t i = 1; i < slices_.size(); i++)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	562 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	563 CheckSlice(i, reference);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	564 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	565 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	566 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	567
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	568
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	569 void Clear()
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	570 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	571 for (size_t i = 0; i < slices_.size(); i++)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	572 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	573 assert(slices_[i] != NULL);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	574 delete slices_[i];
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	575 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	576
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	577 slices_.clear();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	578 slicesRevision_.clear();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	579 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	580
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	581
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	582 void CheckSliceIndex(size_t index) const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	583 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	584 if (!HasGeometry())
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	585 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	586 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	587 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	588 else if (index >= slices_.size())
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	589 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	590 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	591 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	592 else
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	593 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	594 assert(slices_.size() == GetImageGeometry().GetDepth() &&
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	595 slices_.size() == slicesRevision_.size());
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	596 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	597 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	598
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	599
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	600 std::auto_ptr<VolumeImageGeometry> geometry_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	601 std::vector<DicomInstanceParameters*> slices_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	602 std::vector<uint64_t> slicesRevision_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	603
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	604 public:
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	605 ~SeriesGeometry()
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	606 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	607 Clear();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	608 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	609
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	610 // WARNING: The payload of "slices" must be of class "DicomInstanceParameters"
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	611 void ComputeGeometry(SlicesSorter& slices)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	612 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	613 Clear();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	614
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	615 if (!slices.Sort())
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	616 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	617 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	618 "Cannot sort the 3D slices of a DICOM series");
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	619 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	620
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	621 if (slices.GetSlicesCount() == 0)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	622 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	623 geometry_.reset(new VolumeImageGeometry);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	624 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	625 else
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	626 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	627 slices_.reserve(slices.GetSlicesCount());
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	628 slicesRevision_.resize(slices.GetSlicesCount(), 0);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	629
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	630 for (size_t i = 0; i < slices.GetSlicesCount(); i++)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	631 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	632 const DicomInstanceParameters& slice =
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	633 dynamic_cast<const DicomInstanceParameters&>(slices.GetSlicePayload(i));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	634 slices_.push_back(new DicomInstanceParameters(slice));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	635 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	636
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	637 CheckVolume();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	638
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	639 const double spacingZ = slices.ComputeSpacingBetweenSlices();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	640 LOG(INFO) << "Computed spacing between slices: " << spacingZ << "mm";
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	641
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	642 const DicomInstanceParameters& parameters = *slices_[0];
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	643
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	644 geometry_.reset(new VolumeImageGeometry);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	645 geometry_->SetSize(parameters.GetImageInformation().GetWidth(),
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	646 parameters.GetImageInformation().GetHeight(),
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	647 static_cast<unsigned int>(slices.GetSlicesCount()));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	648 geometry_->SetAxialGeometry(slices.GetSliceGeometry(0));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	649 geometry_->SetVoxelDimensions(parameters.GetPixelSpacingX(),
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	650 parameters.GetPixelSpacingY(), spacingZ);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	651 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	652 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	653
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	654 bool HasGeometry() const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	655 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	656 return geometry_.get() != NULL;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	657 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	658
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	659 const VolumeImageGeometry& GetImageGeometry() const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	660 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	661 if (!HasGeometry())
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	662 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	663 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	664 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	665 else
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	666 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	667 assert(slices_.size() == geometry_->GetDepth());
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	668 return *geometry_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	669 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	670 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	671
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	672 const DicomInstanceParameters& GetSliceParameters(size_t index) const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	673 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	674 CheckSliceIndex(index);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	675 return *slices_[index];
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	676 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	677
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	678 uint64_t GetSliceRevision(size_t index) const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	679 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	680 CheckSliceIndex(index);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	681 return slicesRevision_[index];
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	682 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	683
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	684 void IncrementSliceRevision(size_t index)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	685 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	686 CheckSliceIndex(index);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	687 slicesRevision_[index] ++;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	688 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	689 };
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	690
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	691
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	692 class ExtractedSlice : public DicomVolumeImageMPRSlicer::Slice
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	693 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	694 private:
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	695 const OrthancSeriesVolumeProgressiveLoader& that_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	696
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	697 protected:
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	698 virtual uint64_t GetRevisionInternal(VolumeProjection projection,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	699 unsigned int sliceIndex) const
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	700 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	701 if (projection == VolumeProjection_Axial)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	702 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	703 return that_.seriesGeometry_.GetSliceRevision(sliceIndex);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	704 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	705 else
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	706 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	707 // For coronal and sagittal projections, we take the global
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	708 // revision of the volume
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	709 return that_.volume_->GetRevision();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	710 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	711 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	712
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	713 public:
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	714 ExtractedSlice(const OrthancSeriesVolumeProgressiveLoader& that,
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	715 const CoordinateSystem3D& plane) :
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	716 DicomVolumeImageMPRSlicer::Slice(*that.volume_, plane),
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	717 that_(that)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	718 {
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	719 if (that_.strategy_.get() != NULL &&
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	720 IsValid() &&
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	721 GetProjection() == VolumeProjection_Axial)
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	722 {
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	723 that_.strategy_->SetCurrent(GetSliceIndex());
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	724 }
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	725 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	726 };
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	727
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	728
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	729
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	730 static unsigned int GetSliceIndexPayload(const OracleCommandWithPayload& command)
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	731 {
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	732 return dynamic_cast< const Orthanc::SingleValueObject<unsigned int>& >(command.GetPayload()).GetValue();
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	733 }
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	734
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	735
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	736 void ScheduleNextSliceDownload()
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	737 {
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	738 assert(strategy_.get() != NULL);
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	739
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	740 unsigned int sliceIndex, quality;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	741
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	742 if (strategy_->GetNext(sliceIndex, quality))
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	743 {
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	744 assert(quality <= BEST_QUALITY);
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	745
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	746 const DicomInstanceParameters& slice = seriesGeometry_.GetSliceParameters(sliceIndex);
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	747
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	748 const std::string& instance = slice.GetOrthancInstanceIdentifier();
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	749 if (instance.empty())
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	750 {
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	751 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	752 }
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	753
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	754 std::auto_ptr<OracleCommandWithPayload> command;
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	755
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	756 if (quality == BEST_QUALITY)
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	757 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	758 std::auto_ptr<GetOrthancImageCommand> tmp(new GetOrthancImageCommand);
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	759 tmp->SetHttpHeader("Accept-Encoding", "gzip");
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	760 tmp->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	761 tmp->SetInstanceUri(instance, slice.GetExpectedPixelFormat());
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	762 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat());
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	763 command.reset(tmp.release());
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	764 }
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	765 else
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	766 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	767 std::auto_ptr<GetOrthancWebViewerJpegCommand> tmp(new GetOrthancWebViewerJpegCommand);
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	768 tmp->SetHttpHeader("Accept-Encoding", "gzip");
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	769 tmp->SetInstance(instance);
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	770 tmp->SetQuality((quality == 0 ? 50 : 90));
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	771 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat());
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	772 command.reset(tmp.release());
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	773 }
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	774
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	775 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(sliceIndex));
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	776 oracle_.Schedule(*this, command.release());
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	777 }
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	778 }
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	779
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	780
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	781 void LoadGeometry(const OrthancRestApiCommand::SuccessMessage& message)
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	782 {
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	783 Json::Value body;
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	784 message.ParseJsonBody(body);
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	785
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	786 if (body.type() != Json::objectValue)
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	787 {
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	788 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	789 }
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	790
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	791 {
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	792 Json::Value::Members instances = body.getMemberNames();
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	793
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	794 SlicesSorter slices;
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	795
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	796 for (size_t i = 0; i < instances.size(); i++)
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	797 {
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	798 Orthanc::DicomMap dicom;
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	799 dicom.FromDicomAsJson(body[instances[i]]);
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	800
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	801 std::auto_ptr<DicomInstanceParameters> instance(new DicomInstanceParameters(dicom));
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	802 instance->SetOrthancInstanceIdentifier(instances[i]);
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	803
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	804 CoordinateSystem3D geometry = instance->GetGeometry();
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	805 slices.AddSlice(geometry, instance.release());
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	806 }
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	807
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	808 seriesGeometry_.ComputeGeometry(slices);
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	809 }
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	810
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	811 size_t slicesCount = seriesGeometry_.GetImageGeometry().GetDepth();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	812
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	813 if (slicesCount == 0)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	814 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	815 volume_->Initialize(seriesGeometry_.GetImageGeometry(), Orthanc::PixelFormat_Grayscale8);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	816 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	817 else
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	818 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	819 const DicomInstanceParameters& parameters = seriesGeometry_.GetSliceParameters(0);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	820
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	821 volume_->Initialize(seriesGeometry_.GetImageGeometry(), parameters.GetExpectedPixelFormat());
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	822 volume_->SetDicomParameters(parameters);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	823 volume_->GetPixelData().Clear();
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	824
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	825 strategy_.reset(new BasicFetchingStrategy(sorter_->CreateSorter(slicesCount), BEST_QUALITY));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	826
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	827 assert(simultaneousDownloads_ != 0);
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	828 for (unsigned int i = 0; i < simultaneousDownloads_; i++)
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	829 {
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	830 ScheduleNextSliceDownload();
3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	831 }
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	832 }
779 e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	833
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	834 slicesQuality_.resize(slicesCount, 0);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	835
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	836 BroadcastMessage(DicomVolumeImage::GeometryReadyMessage(*volume_));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	837 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	838
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	839
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	840 void SetSliceContent(unsigned int sliceIndex,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	841 const Orthanc::ImageAccessor& image,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	842 unsigned int quality)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	843 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	844 assert(sliceIndex < slicesQuality_.size() &&
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	845 slicesQuality_.size() == volume_->GetPixelData().GetDepth());
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	846
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	847 if (quality >= slicesQuality_[sliceIndex])
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	848 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	849 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	850 ImageBuffer3D::SliceWriter writer(volume_->GetPixelData(), VolumeProjection_Axial, sliceIndex);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	851 Orthanc::ImageProcessing::Copy(writer.GetAccessor(), image);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	852 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	853
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	854 volume_->IncrementRevision();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	855 seriesGeometry_.IncrementSliceRevision(sliceIndex);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	856 slicesQuality_[sliceIndex] = quality;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	857
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	858 BroadcastMessage(DicomVolumeImage::ContentUpdatedMessage(*volume_));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	859 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	860
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	861 ScheduleNextSliceDownload();
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	862 }
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	863
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	864
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	865 void LoadBestQualitySliceContent(const GetOrthancImageCommand::SuccessMessage& message)
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	866 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	867 SetSliceContent(GetSliceIndexPayload(message.GetOrigin()), message.GetImage(), BEST_QUALITY);
709 7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	868 }
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	869
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy Sebastien Jodogne <s.jodogne@gmail.com> parents: 692 diff changeset	870
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	871 void LoadJpegSliceContent(const GetOrthancWebViewerJpegCommand::SuccessMessage& message)
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	872 {
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	873 unsigned int quality;
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	874
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	875 switch (message.GetOrigin().GetQuality())
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	876 {
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	877 case 50:
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	878 quality = LOW_QUALITY;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	879 break;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	880
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	881 case 90:
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	882 quality = MIDDLE_QUALITY;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	883 break;
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	884
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	885 default:
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	886 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	887 }
70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	888
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	889 SetSliceContent(GetSliceIndexPayload(message.GetOrigin()), message.GetImage(), quality);
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	890 }
711 70d1c28560b3 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 710 diff changeset	891
710 3046a603eebf reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 709 diff changeset	892
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	893 IOracle& oracle_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	894 bool active_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	895 unsigned int simultaneousDownloads_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	896 SeriesGeometry seriesGeometry_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	897
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	898 boost::shared_ptr<DicomVolumeImage> volume_;
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	899 std::auto_ptr<IFetchingItemsSorter::IFactory> sorter_;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	900 std::auto_ptr<IFetchingStrategy> strategy_;
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	901 std::vector<unsigned int> slicesQuality_;
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	902
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	903
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	904 public:
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	905 OrthancSeriesVolumeProgressiveLoader(const boost::shared_ptr<DicomVolumeImage>& volume,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	906 IOracle& oracle,
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	907 IObservable& oracleObservable) :
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	908 IObserver(oracleObservable.GetBroker()),
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	909 IObservable(oracleObservable.GetBroker()),
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	910 oracle_(oracle),
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	911 active_(false),
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	912 simultaneousDownloads_(4),
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	913 volume_(volume),
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	914 sorter_(new BasicFetchingItemsSorter::Factory)
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	915 {
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	916 oracleObservable.RegisterObserverCallback(
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	917 new Callable<OrthancSeriesVolumeProgressiveLoader, OrthancRestApiCommand::SuccessMessage>
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	918 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadGeometry));
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	919
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	920 oracleObservable.RegisterObserverCallback(
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	921 new Callable<OrthancSeriesVolumeProgressiveLoader, GetOrthancImageCommand::SuccessMessage>
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	922 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadBestQualitySliceContent));
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	923
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	924 oracleObservable.RegisterObserverCallback(
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	925 new Callable<OrthancSeriesVolumeProgressiveLoader, GetOrthancWebViewerJpegCommand::SuccessMessage>
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	926 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent));
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	927 }
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	928
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	929 void SetSimultaneousDownloads(unsigned int count)
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	930 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	931 if (active_)
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	932 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	933 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	934 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	935 else if (count == 0)
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	936 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	937 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	938 }
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	939 else
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	940 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	941 simultaneousDownloads_ = count;
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	942 }
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	943 }
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	944
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	945 void LoadSeries(const std::string& seriesId)
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	946 {
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	947 if (active_)
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	948 {
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	949 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	950 }
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	951 else
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	952 {
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	953 active_ = true;
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	954
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	955 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	956 command->SetUri("/series/" + seriesId + "/instances-tags");
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	957
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	958 oracle_.Schedule(*this, command.release());
f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 748 diff changeset	959 }
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	960 }
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	961
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	962
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	963 virtual IExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane)
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	964 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	965 if (volume_->HasGeometry())
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	966 {
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	967 return new ExtractedSlice(*this, cuttingPlane);
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	968 }
78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	969 else
78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	970 {
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	971 return new IVolumeSlicer::InvalidSlice;
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	972 }
78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	973 }
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	974 };
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	975
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	976
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	977
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	978 class OrthancMultiframeVolumeLoader :
78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	979 public IObserver,
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	980 public IObservable
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	981 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	982 private:
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	983 class State : public Orthanc::IDynamicObject
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	984 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	985 private:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	986 OrthancMultiframeVolumeLoader& that_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	987
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	988 protected:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	989 void Schedule(OrthancRestApiCommand* command) const
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	990 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	991 that_.oracle_.Schedule(that_, command);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	992 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	993
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	994 OrthancMultiframeVolumeLoader& GetTarget() const
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	995 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	996 return that_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	997 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	998
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	999 public:
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1000 State(OrthancMultiframeVolumeLoader& that) :
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1001 that_(that)
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1002 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1003 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1004
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1005 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const = 0;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1006 };
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1007
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1008 void Handle(const OrthancRestApiCommand::SuccessMessage& message)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1009 {
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1010 dynamic_cast<const State&>(message.GetOrigin().GetPayload()).Handle(message);
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1011 }
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1012
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1013
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1014 class LoadRTDoseGeometry : public State
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1015 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1016 private:
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1017 std::auto_ptr<Orthanc::DicomMap> dicom_;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1018
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1019 public:
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1020 LoadRTDoseGeometry(OrthancMultiframeVolumeLoader& that,
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1021 Orthanc::DicomMap* dicom) :
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1022 State(that),
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1023 dicom_(dicom)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1024 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1025 if (dicom == NULL)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1026 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1027 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1028 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1029 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1030
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1031 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1032 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1033 // 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	1034 std::string s = Orthanc::Toolbox::StripSpaces(message.GetAnswer());
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1035 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	1036
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1037 GetTarget().SetGeometry(*dicom_);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1038 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1039 };
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1040
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1041
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1042 static std::string GetSopClassUid(const Orthanc::DicomMap& dicom)
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1043 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1044 std::string s;
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1045 if (!dicom.CopyToString(s, Orthanc::DICOM_TAG_SOP_CLASS_UID, false))
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1046 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1047 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1048 "DICOM file without SOP class UID");
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1049 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1050 else
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1051 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1052 return s;
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1053 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1054 }
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1055
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1056
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1057 class LoadGeometry : public State
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1058 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1059 public:
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1060 LoadGeometry(OrthancMultiframeVolumeLoader& that) :
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1061 State(that)
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1062 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1063 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1064
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1065 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1066 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1067 Json::Value body;
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1068 message.ParseJsonBody(body);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1069
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1070 if (body.type() != Json::objectValue)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1071 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1072 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1073 }
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1074
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1075 std::auto_ptr<Orthanc::DicomMap> dicom(new Orthanc::DicomMap);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1076 dicom->FromDicomAsJson(body);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1077
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1078 if (StringToSopClassUid(GetSopClassUid(*dicom)) == SopClassUid_RTDose)
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1079 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1080 // Download the "Grid Frame Offset Vector" DICOM tag, that is
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1081 // 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	1082
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1083 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1084 command->SetUri("/instances/" + GetTarget().GetInstanceId() + "/content/" +
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1085 Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR.Format());
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1086 command->SetPayload(new LoadRTDoseGeometry(GetTarget(), dicom.release()));
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1087
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1088 Schedule(command.release());
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1089 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1090 else
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1091 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1092 GetTarget().SetGeometry(*dicom);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1093 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1094 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1095 };
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1096
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1097
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1098
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1099 class LoadTransferSyntax : public State
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1100 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1101 public:
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1102 LoadTransferSyntax(OrthancMultiframeVolumeLoader& that) :
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1103 State(that)
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1104 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1105 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1106
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1107 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1108 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1109 GetTarget().SetTransferSyntax(message.GetAnswer());
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1110 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1111 };
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1112
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1113
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1114 class LoadUncompressedPixelData : public State
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1115 {
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1116 public:
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1117 LoadUncompressedPixelData(OrthancMultiframeVolumeLoader& that) :
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1118 State(that)
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1119 {
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1120 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1121
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1122 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1123 {
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1124 GetTarget().SetUncompressedPixelData(message.GetAnswer());
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1125 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1126 };
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1127
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1128
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1129
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1130 boost::shared_ptr<DicomVolumeImage> volume_;
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1131 IOracle& oracle_;
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1132 bool active_;
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1133 std::string instanceId_;
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1134 std::string transferSyntaxUid_;
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1135
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1136
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1137 const std::string& GetInstanceId() const
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1138 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1139 if (active_)
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1140 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1141 return instanceId_;
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1142 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1143 else
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1144 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1145 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1146 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1147 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1148
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1149
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1150 void ScheduleFrameDownloads()
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1151 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1152 if (transferSyntaxUid_.empty() \|\|
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1153 !volume_->HasGeometry())
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1154 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1155 return;
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1156 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1157
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1158 if (transferSyntaxUid_ == "1.2.840.10008.1.2" \|\|
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1159 transferSyntaxUid_ == "1.2.840.10008.1.2.1" \|\|
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1160 transferSyntaxUid_ == "1.2.840.10008.1.2.2")
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1161 {
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1162 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1163 command->SetHttpHeader("Accept-Encoding", "gzip");
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1164 command->SetUri("/instances/" + instanceId_ + "/content/" +
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1165 Orthanc::DICOM_TAG_PIXEL_DATA.Format() + "/0");
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1166 command->SetPayload(new LoadUncompressedPixelData(*this));
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1167 oracle_.Schedule(*this, command.release());
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1168 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1169 else
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1170 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1171 throw Orthanc::OrthancException(
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1172 Orthanc::ErrorCode_NotImplemented,
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1173 "No support for multiframe instances with transfer syntax: " + transferSyntaxUid_);
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1174 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1175 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1176
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1177
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1178 void SetTransferSyntax(const std::string& transferSyntax)
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1179 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1180 transferSyntaxUid_ = Orthanc::Toolbox::StripSpaces(transferSyntax);
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1181 ScheduleFrameDownloads();
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1182 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1183
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1184
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1185 void SetGeometry(const Orthanc::DicomMap& dicom)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1186 {
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1187 DicomInstanceParameters parameters(dicom);
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1188 volume_->SetDicomParameters(parameters);
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1189
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1190 Orthanc::PixelFormat format;
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1191 if (!parameters.GetImageInformation().ExtractPixelFormat(format, true))
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1192 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1193 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1194 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1195
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1196 double spacingZ;
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1197 switch (parameters.GetSopClassUid())
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1198 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1199 case SopClassUid_RTDose:
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1200 spacingZ = parameters.GetThickness();
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1201 break;
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1202
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1203 default:
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1204 throw Orthanc::OrthancException(
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1205 Orthanc::ErrorCode_NotImplemented,
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1206 "No support for multiframe instances with SOP class UID: " + GetSopClassUid(dicom));
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1207 }
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1208
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1209 const unsigned int width = parameters.GetImageInformation().GetWidth();
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1210 const unsigned int height = parameters.GetImageInformation().GetHeight();
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1211 const unsigned int depth = parameters.GetImageInformation().GetNumberOfFrames();
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1212
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1213 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1214 VolumeImageGeometry geometry;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1215 geometry.SetSize(width, height, depth);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1216 geometry.SetAxialGeometry(parameters.GetGeometry());
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1217 geometry.SetVoxelDimensions(parameters.GetPixelSpacingX(),
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1218 parameters.GetPixelSpacingY(), spacingZ);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1219 volume_->Initialize(geometry, format);
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1220 }
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1221
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1222 volume_->GetPixelData().Clear();
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1223
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1224 ScheduleFrameDownloads();
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1225
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1226 BroadcastMessage(DicomVolumeImage::GeometryReadyMessage(*volume_));
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1227 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1228
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1229
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1230 ORTHANC_FORCE_INLINE
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1231 static void CopyPixel(uint32_t& target,
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1232 const void* source)
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1233 {
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1234 // TODO - check alignement?
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1235 target = le32toh(reinterpret_cast<const uint32_t>(source));
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1236 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1237
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1238
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1239 template <typename T>
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1240 void CopyPixelData(const std::string& pixelData)
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1241 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1242 ImageBuffer3D& target = volume_->GetPixelData();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1243
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1244 const unsigned int bpp = target.GetBytesPerPixel();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1245 const unsigned int width = target.GetWidth();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1246 const unsigned int height = target.GetHeight();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1247 const unsigned int depth = target.GetDepth();
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1248
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1249 if (pixelData.size() != bpp * width * height * depth)
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1250 {
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1251 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1252 "The pixel data has not the proper size");
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1253 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1254
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1255 if (pixelData.empty())
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1256 {
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1257 return;
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1258 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1259
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1260 const uint8_t* source = reinterpret_cast<const uint8_t*>(pixelData.c_str());
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1261
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1262 for (unsigned int z = 0; z < depth; z++)
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1263 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1264 ImageBuffer3D::SliceWriter writer(target, VolumeProjection_Axial, z);
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1265
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1266 assert (writer.GetAccessor().GetWidth() == width &&
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1267 writer.GetAccessor().GetHeight() == height);
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1268
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1269 for (unsigned int y = 0; y < height; y++)
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1270 {
792 4fe4b221a31f deprecating MessagingToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 789 diff changeset	1271 assert(sizeof(T) == Orthanc::GetBytesPerPixel(target.GetFormat()));
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1272
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1273 T* target = reinterpret_cast<T*>(writer.GetAccessor().GetRow(y));
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1274
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1275 for (unsigned int x = 0; x < width; x++)
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1276 {
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1277 CopyPixel(*target, source);
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1278
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1279 target ++;
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1280 source += bpp;
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1281 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1282 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1283 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1284 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1285
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1286
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1287 void SetUncompressedPixelData(const std::string& pixelData)
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1288 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1289 switch (volume_->GetPixelData().GetFormat())
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1290 {
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1291 case Orthanc::PixelFormat_Grayscale32:
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1292 CopyPixelData<uint32_t>(pixelData);
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1293 break;
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1294
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1295 default:
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1296 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1297 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1298
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1299 volume_->IncrementRevision();
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1300
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1301 BroadcastMessage(DicomVolumeImage::ContentUpdatedMessage(*volume_));
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1302 }
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1303
766 d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1304
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1305 public:
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1306 OrthancMultiframeVolumeLoader(const boost::shared_ptr<DicomVolumeImage>& volume,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1307 IOracle& oracle,
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1308 IObservable& oracleObservable) :
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1309 IObserver(oracleObservable.GetBroker()),
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1310 IObservable(oracleObservable.GetBroker()),
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1311 volume_(volume),
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1312 oracle_(oracle),
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1313 active_(false)
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1314 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1315 if (volume.get() == NULL)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1316 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1317 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1318 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1319
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1320 oracleObservable.RegisterObserverCallback(
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1321 new Callable<OrthancMultiframeVolumeLoader, OrthancRestApiCommand::SuccessMessage>
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1322 (*this, &OrthancMultiframeVolumeLoader::Handle));
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1323 }
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1324
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1325
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1326 void LoadInstance(const std::string& instanceId)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1327 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1328 if (active_)
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1329 {
26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1330 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1331 }
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1332 else
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1333 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1334 active_ = true;
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1335 instanceId_ = instanceId;
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1336
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1337 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1338 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1339 command->SetHttpHeader("Accept-Encoding", "gzip");
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1340 command->SetUri("/instances/" + instanceId + "/tags");
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1341 command->SetPayload(new LoadGeometry(*this));
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1342 oracle_.Schedule(*this, command.release());
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1343 }
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1344
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1345 {
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1346 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1347 command->SetUri("/instances/" + instanceId + "/metadata/TransferSyntax");
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1348 command->SetPayload(new LoadTransferSyntax(*this));
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1349 oracle_.Schedule(*this, command.release());
f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	1350 }
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1351 }
f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1352 }
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	1353 };
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	1354
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1355
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1356
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1357 class VolumeImageReslicer : public IVolumeSlicer
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1358 {
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1359 private:
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1360 class Slice : public IExtractedSlice
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1361 {
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1362 private:
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1363 VolumeImageReslicer& that_;
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1364 CoordinateSystem3D cuttingPlane_;
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1365
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1366 public:
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1367 Slice(VolumeImageReslicer& that,
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1368 const CoordinateSystem3D& cuttingPlane) :
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1369 that_(that),
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1370 cuttingPlane_(cuttingPlane)
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1371 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1372 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1373
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1374 virtual bool IsValid()
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1375 {
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1376 return true;
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1377 }
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1378
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1379 virtual uint64_t GetRevision()
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1380 {
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1381 return that_.volume_->GetRevision();
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1382 }
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1383
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1384 virtual ISceneLayer* CreateSceneLayer(const ILayerStyleConfigurator* configurator, // possibly absent
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1385 const CoordinateSystem3D& cuttingPlane)
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1386 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1387 VolumeReslicer& reslicer = that_.reslicer_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1388
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1389 if (configurator == NULL)
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1390 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1391 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError,
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1392 "Must provide a layer style configurator");
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1393 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1394
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1395 reslicer.SetOutputFormat(that_.volume_->GetPixelData().GetFormat());
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1396 reslicer.Apply(that_.volume_->GetPixelData(),
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1397 that_.volume_->GetGeometry(),
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1398 cuttingPlane);
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1399
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1400 if (reslicer.IsSuccess())
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1401 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1402 std::auto_ptr<TextureBaseSceneLayer> layer
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1403 (configurator->CreateTextureFromDicom(reslicer.GetOutputSlice(),
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1404 that_.volume_->GetDicomParameters()));
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1405 if (layer.get() == NULL)
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1406 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1407 return NULL;
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1408 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1409
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1410 double s = reslicer.GetPixelSpacing();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1411 layer->SetPixelSpacing(s, s);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1412 layer->SetOrigin(reslicer.GetOutputExtent().GetX1() + 0.5 * s,
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1413 reslicer.GetOutputExtent().GetY1() + 0.5 * s);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1414
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1415 // TODO - Angle!!
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1416
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1417 return layer.release();
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1418 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1419 else
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1420 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1421 return NULL;
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1422 }
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1423 }
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1424 };
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1425
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1426 boost::shared_ptr<DicomVolumeImage> volume_;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1427 VolumeReslicer reslicer_;
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1428
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1429 public:
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1430 VolumeImageReslicer(const boost::shared_ptr<DicomVolumeImage>& volume) :
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1431 volume_(volume)
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1432 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1433 if (volume.get() == NULL)
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1434 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1435 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1436 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1437 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1438
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1439 ImageInterpolation GetInterpolation() const
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1440 {
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1441 return reslicer_.GetInterpolation();
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1442 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1443
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1444 void SetInterpolation(ImageInterpolation interpolation)
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1445 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1446 reslicer_.SetInterpolation(interpolation);
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1447 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1448
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1449 bool IsFastMode() const
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1450 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1451 return reslicer_.IsFastMode();
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1452 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1453
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1454 void SetFastMode(bool fast)
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1455 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1456 reslicer_.EnableFastMode(fast);
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1457 }
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1458
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1459 virtual IExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane)
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1460 {
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1461 if (volume_->HasGeometry())
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1462 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1463 return new Slice(*this, cuttingPlane);
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1464 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1465 else
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1466 {
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1467 return new IVolumeSlicer::InvalidSlice;
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1468 }
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1469 }
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1470 };
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1471
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1472
2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1473
784 9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1474 class DicomStructureSetLoader :
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1475 public IObserver,
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1476 public IVolumeSlicer
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1477 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1478 private:
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1479 enum State
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1480 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1481 State_Setup,
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1482 State_Loading,
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1483 State_Ready
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1484 };
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1485
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1486
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1487 std::auto_ptr<DicomStructureSet> content_;
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1488 IOracle& oracle_;
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1489 State state_;
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1490 std::string instanceId_;
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1491
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1492 void Handle(const OrthancRestApiCommand::SuccessMessage& message)
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1493 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1494 if (state_ != State_Loading)
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1495 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1496 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1497 }
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1498
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1499 const boost::posix_time::ptime start = boost::posix_time::microsec_clock::local_time();
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1500
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1501 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1502 OrthancPlugins::FullOrthancDataset dicom(message.GetAnswer());
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1503 content_.reset(new DicomStructureSet(dicom));
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1504 }
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1505
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1506 const boost::posix_time::ptime end = boost::posix_time::microsec_clock::local_time();
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1507
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1508 printf("LOADED: %d\n", (end - start).total_milliseconds());
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1509 state_ = State_Ready;
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1510 }
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1511
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1512
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1513 public:
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1514 DicomStructureSetLoader(IOracle& oracle,
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1515 IObservable& oracleObservable) :
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1516 IObserver(oracleObservable.GetBroker()),
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1517 oracle_(oracle),
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1518 state_(State_Setup)
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1519 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1520 oracleObservable.RegisterObserverCallback(
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1521 new Callable<DicomStructureSetLoader, OrthancRestApiCommand::SuccessMessage>
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1522 (*this, &DicomStructureSetLoader::Handle));
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1523 }
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1524
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1525
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1526 void LoadInstance(const std::string& instanceId)
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1527 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1528 if (state_ != State_Setup)
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1529 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1530 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1531 }
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1532 else
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1533 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1534 state_ = State_Loading;
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1535 instanceId_ = instanceId;
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1536
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1537 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1538 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1539 command->SetHttpHeader("Accept-Encoding", "gzip");
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1540 command->SetUri("/instances/" + instanceId + "/tags?ignore-length=3006-0050");
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1541 oracle_.Schedule(*this, command.release());
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1542 }
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1543 }
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1544 }
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1545
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1546 virtual IExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane)
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1547 {
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1548 return NULL;
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1549 }
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1550 };
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1551
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1552
9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1553
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1554 class VolumeSceneLayerSource : public boost::noncopyable
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1555 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1556 private:
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1557 Scene2D& scene_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1558 int layerDepth_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1559 boost::shared_ptr<IVolumeSlicer> slicer_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1560 std::auto_ptr<ILayerStyleConfigurator> configurator_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1561 std::auto_ptr<CoordinateSystem3D> lastPlane_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1562 uint64_t lastRevision_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1563 uint64_t lastConfiguratorRevision_;
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1564
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1565 static bool IsSameCuttingPlane(const CoordinateSystem3D& a,
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1566 const CoordinateSystem3D& b)
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1567 {
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1568 // TODO - What if the normal is reversed?
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1569 double distance;
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1570 return (CoordinateSystem3D::ComputeDistance(distance, a, b) &&
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1571 LinearAlgebra::IsCloseToZero(distance));
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1572 }
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1573
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1574 void ClearLayer()
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1575 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1576 scene_.DeleteLayer(layerDepth_);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1577 lastPlane_.reset(NULL);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1578 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1579
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1580 public:
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1581 VolumeSceneLayerSource(Scene2D& scene,
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1582 int layerDepth,
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1583 const boost::shared_ptr<IVolumeSlicer>& slicer) :
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1584 scene_(scene),
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1585 layerDepth_(layerDepth),
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1586 slicer_(slicer)
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1587 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1588 if (slicer == NULL)
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1589 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1590 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1591 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1592 }
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1593
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1594 const IVolumeSlicer& GetSlicer() const
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1595 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1596 return *slicer_;
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1597 }
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1598
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1599 void RemoveConfigurator()
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1600 {
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1601 configurator_.reset();
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1602 lastPlane_.reset();
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1603 }
e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1604
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1605 void SetConfigurator(ILayerStyleConfigurator* configurator) // Takes ownership
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1606 {
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1607 if (configurator == NULL)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1608 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1609 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1610 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1611
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1612 configurator_.reset(configurator);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1613
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1614 // Invalidate the layer
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1615 lastPlane_.reset(NULL);
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1616 }
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1617
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1618 bool HasConfigurator() const
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1619 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1620 return configurator_.get() != NULL;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1621 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1622
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1623 ILayerStyleConfigurator& GetConfigurator() const
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1624 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1625 if (configurator_.get() == NULL)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1626 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1627 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1628 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1629
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1630 return *configurator_;
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1631 }
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1632
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1633 void Update(const CoordinateSystem3D& plane)
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1634 {
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1635 assert(slicer_.get() != NULL);
781 2bb72826fa3f IVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 780 diff changeset	1636 std::auto_ptr<IVolumeSlicer::IExtractedSlice> slice(slicer_->ExtractSlice(plane));
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1637
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1638 if (slice.get() == NULL)
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1639 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1640 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1641 }
032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1642
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1643 if (!slice->IsValid())
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1644 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1645 // The slicer cannot handle this cutting plane: Clear the layer
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1646 ClearLayer();
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1647 }
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1648 else if (lastPlane_.get() != NULL &&
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1649 IsSameCuttingPlane(*lastPlane_, plane) &&
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1650 lastRevision_ == slice->GetRevision())
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1651 {
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1652 // The content of the slice has not changed: Don't update the
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1653 // layer content, but possibly update its style
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1654
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1655 if (configurator_.get() != NULL &&
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1656 configurator_->GetRevision() != lastConfiguratorRevision_ &&
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1657 scene_.HasLayer(layerDepth_))
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1658 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1659 configurator_->ApplyStyle(scene_.GetLayer(layerDepth_));
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1660 }
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1661 }
032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1662 else
032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1663 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1664 // Content has changed: An update is needed
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1665 lastPlane_.reset(new CoordinateSystem3D(plane));
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1666 lastRevision_ = slice->GetRevision();
692 10910827f235 simplification in DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 691 diff changeset	1667
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1668 std::auto_ptr<ISceneLayer> layer(slice->CreateSceneLayer(configurator_.get(), plane));
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1669 if (layer.get() == NULL)
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1670 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1671 ClearLayer();
712 f334b098b243 IDicomVolumeSource Sebastien Jodogne <s.jodogne@gmail.com> parents: 711 diff changeset	1672 }
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1673 else
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1674 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1675 if (configurator_.get() != NULL)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1676 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1677 lastConfiguratorRevision_ = configurator_->GetRevision();
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1678 configurator_->ApplyStyle(*layer);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1679 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1680
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1681 scene_.SetLayer(layerDepth_, layer.release());
713 e63c8b9b7b02 setting texture geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1682 }
691 032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1683 }
032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1684 }
032a94cca5c4 DicomVolumeSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 684 diff changeset	1685 };
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1686
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1687
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1688
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1689
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1690
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1691 class NativeApplicationContext : public IMessageEmitter
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1692 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1693 private:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1694 boost::shared_mutex mutex_;
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1695 MessageBroker broker_;
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1696 IObservable oracleObservable_;
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1697
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1698 public:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1699 NativeApplicationContext() :
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1700 oracleObservable_(broker_)
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1701 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1702 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1703
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1704
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1705 virtual void EmitMessage(const IObserver& observer,
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1706 const IMessage& message)
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1707 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1708 try
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1709 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1710 boost::unique_lock<boost::shared_mutex> lock(mutex_);
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1711 oracleObservable_.EmitMessage(observer, message);
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1712 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1713 catch (Orthanc::OrthancException& e)
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1714 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1715 LOG(ERROR) << "Exception while emitting a message: " << e.What();
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1716 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1717 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1718
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1719
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1720 class ReaderLock : public boost::noncopyable
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1721 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1722 private:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1723 NativeApplicationContext& that_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1724 boost::shared_lock<boost::shared_mutex> lock_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1725
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1726 public:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1727 ReaderLock(NativeApplicationContext& that) :
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1728 that_(that),
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1729 lock_(that.mutex_)
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1730 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1731 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1732 };
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1733
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1734
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1735 class WriterLock : public boost::noncopyable
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1736 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1737 private:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1738 NativeApplicationContext& that_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1739 boost::unique_lock<boost::shared_mutex> lock_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1740
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1741 public:
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1742 WriterLock(NativeApplicationContext& that) :
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1743 that_(that),
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1744 lock_(that.mutex_)
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1745 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1746 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1747
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1748 MessageBroker& GetBroker()
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1749 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1750 return that_.broker_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1751 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1752
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1753 IObservable& GetOracleObservable()
681 9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1754 {
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1755 return that_.oracleObservable_;
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1756 }
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1757 };
9723fceccb9f revision counters in DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 680 diff changeset	1758 };
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1759 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1760
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1761
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1762
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1763 class Toto : public OrthancStone::IObserver
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1764 {
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1765 private:
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1766 OrthancStone::CoordinateSystem3D plane_;
78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1767 OrthancStone::IOracle& oracle_;
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1768 OrthancStone::Scene2D scene_;
766 d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1769 std::auto_ptr<OrthancStone::VolumeSceneLayerSource> source1_, source2_;
d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1770
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1771
779 e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1772 void Refresh()
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1773 {
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1774 if (source1_.get() != NULL)
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1775 {
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1776 source1_->Update(plane_);
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1777 }
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1778
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1779 if (source2_.get() != NULL)
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1780 {
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1781 source2_->Update(plane_);
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1782 }
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1783
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1784 scene_.FitContent(1024, 768);
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1785
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1786 {
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1787 OrthancStone::CairoCompositor compositor(scene_, 1024, 768);
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1788 compositor.Refresh();
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1789
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1790 Orthanc::ImageAccessor accessor;
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1791 compositor.GetCanvas().GetReadOnlyAccessor(accessor);
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1792
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1793 Orthanc::Image tmp(Orthanc::PixelFormat_RGB24, accessor.GetWidth(), accessor.GetHeight(), false);
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1794 Orthanc::ImageProcessing::Convert(tmp, accessor);
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1795
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1796 static unsigned int count = 0;
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1797 char buf[64];
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1798 sprintf(buf, "scene-%06d.png", count++);
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1799
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1800 Orthanc::PngWriter writer;
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1801 writer.WriteToFile(buf, tmp);
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1802 }
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1803 }
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1804
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1805
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1806 void Handle(const OrthancStone::DicomVolumeImage::GeometryReadyMessage& message)
766 d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1807 {
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1808 printf("Geometry ready\n");
78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1809
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1810 //plane_ = message.GetOrigin().GetGeometry().GetSagittalGeometry();
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1811 //plane_ = message.GetOrigin().GetGeometry().GetAxialGeometry();
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1812 plane_ = message.GetOrigin().GetGeometry().GetCoronalGeometry();
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1813 plane_.SetOrigin(message.GetOrigin().GetGeometry().GetCoordinates(0.5f, 0.5f, 0.5f));
779 e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1814
e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1815 Refresh();
766 d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1816 }
d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1817
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1818
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1819 void Handle(const OrthancStone::SleepOracleCommand::TimeoutMessage& message)
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1820 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1821 if (message.GetOrigin().HasPayload())
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1822 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1823 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	1824 }
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1825 else
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1826 {
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1827 printf("TIMEOUT\n");
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1828
779 e72a9fef3d19 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 778 diff changeset	1829 Refresh();
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1830
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1831 /**
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1832 * The sleep() leads to a crash if the oracle is still running,
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1833 * while this object is destroyed. Always stop the oracle before
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1834 * destroying active objects. (*)
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1835 **/
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1836 // boost::this_thread::sleep(boost::posix_time::seconds(2));
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1837
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1838 oracle_.Schedule(*this, new OrthancStone::SleepOracleCommand(message.GetOrigin().GetDelay()));
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1839 }
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1840 }
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1841
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1842 void Handle(const OrthancStone::OrthancRestApiCommand::SuccessMessage& message)
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1843 {
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1844 Json::Value v;
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	1845 message.ParseJsonBody(v);
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1846
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1847 printf("ICI [%s]\n", v.toStyledString().c_str());
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1848 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1849
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1850 void Handle(const OrthancStone::GetOrthancImageCommand::SuccessMessage& message)
637 afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1851 {
afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1852 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	1853 }
afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1854
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1855 void Handle(const OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage& message)
642 7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1856 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1857 printf("WebViewer %dx%d\n", message.GetImage().GetWidth(), message.GetImage().GetHeight());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1858 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1859
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1860 void Handle(const OrthancStone::OracleCommandExceptionMessage& message)
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1861 {
639 d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1862 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	1863
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1864 switch (message.GetCommand().GetType())
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1865 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1866 case OrthancStone::IOracleCommand::Type_GetOrthancWebViewerJpeg:
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1867 printf("URI: [%s]\n", dynamic_cast<const OrthancStone::GetOrthancWebViewerJpegCommand&>
639 d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1868 (message.GetCommand()).GetUri().c_str());
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1869 break;
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1870
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1871 default:
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1872 break;
d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1873 }
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1874 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1875
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1876 public:
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1877 Toto(OrthancStone::IOracle& oracle,
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1878 OrthancStone::IObservable& oracleObservable) :
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1879 IObserver(oracleObservable.GetBroker()),
1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1880 oracle_(oracle)
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1881 {
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1882 oracleObservable.RegisterObserverCallback
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	1883 (new OrthancStone::Callable
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1884 <Toto, OrthancStone::SleepOracleCommand::TimeoutMessage>(*this, &Toto::Handle));
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1885
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1886 oracleObservable.RegisterObserverCallback
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1887 (new OrthancStone::Callable
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1888 <Toto, OrthancStone::OrthancRestApiCommand::SuccessMessage>(*this, &Toto::Handle));
637 afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1889
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1890 oracleObservable.RegisterObserverCallback
637 afc91cdc5128 decoding of images by oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: 636 diff changeset	1891 (new OrthancStone::Callable
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1892 <Toto, OrthancStone::GetOrthancImageCommand::SuccessMessage>(*this, &Toto::Handle));
639 d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1893
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1894 oracleObservable.RegisterObserverCallback
639 d1f4521b9bbb OracleCommandExceptionMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 638 diff changeset	1895 (new OrthancStone::Callable
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1896 <Toto, OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage>(*this, &Toto::Handle));
642 7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1897
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1898 oracleObservable.RegisterObserverCallback
642 7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler() Sebastien Jodogne <s.jodogne@gmail.com> parents: 641 diff changeset	1899 (new OrthancStone::Callable
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1900 <Toto, OrthancStone::OracleCommandExceptionMessage>(*this, &Toto::Handle));
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1901 }
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1902
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1903 void SetReferenceLoader(OrthancStone::IObservable& loader)
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1904 {
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1905 loader.RegisterObserverCallback
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1906 (new OrthancStone::Callable
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1907 <Toto, OrthancStone::DicomVolumeImage::GeometryReadyMessage>(*this, &Toto::Handle));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1908 }
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1909
766 d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1910 void SetVolume1(int depth,
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1911 const boost::shared_ptr<OrthancStone::IVolumeSlicer>& volume,
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1912 OrthancStone::ILayerStyleConfigurator* style)
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1913 {
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1914 source1_.reset(new OrthancStone::VolumeSceneLayerSource(scene_, depth, volume));
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1915
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1916 if (style != NULL)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1917 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1918 source1_->SetConfigurator(style);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1919 }
766 d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1920 }
d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1921
d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1922 void SetVolume2(int depth,
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1923 const boost::shared_ptr<OrthancStone::IVolumeSlicer>& volume,
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1924 OrthancStone::ILayerStyleConfigurator* style)
766 d6cd7c5ca6ea fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 765 diff changeset	1925 {
776 0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1926 source2_.reset(new OrthancStone::VolumeSceneLayerSource(scene_, depth, volume));
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1927
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1928 if (style != NULL)
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1929 {
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1930 source2_->SetConfigurator(style);
0387485f048b ILayerStyleConfigurator Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	1931 }
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1932 }
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1933 };
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1934
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1935
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1936 void Run(OrthancStone::NativeApplicationContext& context,
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	1937 OrthancStone::ThreadedOracle& oracle)
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1938 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1939 boost::shared_ptr<OrthancStone::DicomVolumeImage> ct(new OrthancStone::DicomVolumeImage);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1940 boost::shared_ptr<OrthancStone::DicomVolumeImage> dose(new OrthancStone::DicomVolumeImage);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1941
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1942
762 26f4345e771e creation of OrthancMultiframeVolumeLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	1943 boost::shared_ptr<Toto> toto;
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1944 boost::shared_ptr<OrthancStone::OrthancSeriesVolumeProgressiveLoader> ctLoader;
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1945 boost::shared_ptr<OrthancStone::OrthancMultiframeVolumeLoader> doseLoader;
784 9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1946 boost::shared_ptr<OrthancStone::DicomStructureSetLoader> rtstructLoader;
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1947
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1948 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1949 OrthancStone::NativeApplicationContext::WriterLock lock(context);
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1950 toto.reset(new Toto(oracle, lock.GetOracleObservable()));
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1951 ctLoader.reset(new OrthancStone::OrthancSeriesVolumeProgressiveLoader(ct, oracle, lock.GetOracleObservable()));
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1952 doseLoader.reset(new OrthancStone::OrthancMultiframeVolumeLoader(dose, oracle, lock.GetOracleObservable()));
784 9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	1953 rtstructLoader.reset(new OrthancStone::DicomStructureSetLoader(oracle, lock.GetOracleObservable()));
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	1954 }
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	1955
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1956
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1957 toto->SetReferenceLoader(*ctLoader);
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1958
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1959
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1960 #if 1
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1961 toto->SetVolume1(0, ctLoader, new OrthancStone::GrayscaleStyleConfigurator);
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1962 #else
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1963 {
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	1964 boost::shared_ptr<OrthancStone::IVolumeSlicer> reslicer(new OrthancStone::VolumeImageReslicer(ct));
782 b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1965 toto->SetVolume1(0, reslicer, new OrthancStone::GrayscaleStyleConfigurator);
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1966 }
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1967 #endif
b24c208fa953 VolumeImageReslicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 781 diff changeset	1968
780 f81655ed96ab cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 779 diff changeset	1969
f81655ed96ab cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 779 diff changeset	1970 {
f81655ed96ab cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 779 diff changeset	1971 std::auto_ptr<OrthancStone::LookupTableStyleConfigurator> config(new OrthancStone::LookupTableStyleConfigurator);
f81655ed96ab cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 779 diff changeset	1972 config->SetLookupTable(Orthanc::EmbeddedResources::COLORMAP_HOT);
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	1973
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	1974 boost::shared_ptr<OrthancStone::DicomVolumeImageMPRSlicer> tmp(new OrthancStone::DicomVolumeImageMPRSlicer(dose));
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	1975 toto->SetVolume2(1, tmp, config.release());
780 f81655ed96ab cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 779 diff changeset	1976 }
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1977
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	1978 oracle.Schedule(*toto, new OrthancStone::SleepOracleCommand(100));
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	1979
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1980 if (0)
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1981 {
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1982 Json::Value v = Json::objectValue;
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1983 v["Level"] = "Series";
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1984 v["Query"] = Json::objectValue;
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1985
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1986 std::auto_ptr<OrthancStone::OrthancRestApiCommand> command(new OrthancStone::OrthancRestApiCommand);
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1987 command->SetMethod(Orthanc::HttpMethod_Post);
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1988 command->SetUri("/tools/find");
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1989 command->SetBody(v);
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1990
623 42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage() Sebastien Jodogne <s.jodogne@gmail.com> parents: 622 diff changeset	1991 oracle.Schedule(*toto, command.release());
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1992 }
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	1993
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	1994 if (0)
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1995 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1996 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1997 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)));
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1998 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	1999 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2000 }
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2001
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2002 if (0)
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2003 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	2004 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2005 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png)));
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2006 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2007 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2008 }
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2009
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2010 if (0)
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2011 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	2012 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2013 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png)));
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2014 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2015 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2016 }
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2017
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2018 if (0)
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2019 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	2020 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2021 command->SetHttpHeader("Accept-Encoding", "gzip");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2022 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2023 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2024 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2025 }
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2026
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2027 if (0)
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2028 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	2029 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636 fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2030 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2031 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2032 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 631 diff changeset	2033 }
638 e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	2034
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2035 if (0)
638 e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	2036 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	2037 std::auto_ptr<OrthancStone::GetOrthancWebViewerJpegCommand> command(new OrthancStone::GetOrthancWebViewerJpegCommand);
638 e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	2038 command->SetHttpHeader("Accept-Encoding", "gzip");
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	2039 command->SetInstance("e6c7c20b-c9f65d7e-0d76f2e2-830186f2-3e3c600e");
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	2040 command->SetQuality(90);
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	2041 oracle.Schedule(*toto, command.release());
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	2042 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	2043
e626f38c5512 DecodeOrthancWebViewerJpegCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 637 diff changeset	2044
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2045 if (0)
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2046 {
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2047 for (unsigned int i = 0; i < 10; i++)
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2048 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	2049 std::auto_ptr<OrthancStone::SleepOracleCommand> command(new OrthancStone::SleepOracleCommand(i * 1000));
744 a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2050 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(42 * i));
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2051 oracle.Schedule(*toto, command.release());
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2052 }
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2053 }
a4bfb420b869 SleepOracleCommand Sebastien Jodogne <s.jodogne@gmail.com> parents: 742 diff changeset	2054
784 9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	2055
625 2eeb5857eb43 DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 623 diff changeset	2056 // 2017-11-17-Anonymized
793 f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	2057 ctLoader->LoadSeries("cb3ea4d1-d08f3856-ad7b6314-74d88d77-60b05618"); // CT
f72b49954f62 DicomVolumeImageMPRSlicer Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	2058 doseLoader->LoadInstance("41029085-71718346-811efac4-420e2c15-d39f99b6"); // RT-DOSE
784 9f3b2027a4a9 DicomStructureSetLoader Sebastien Jodogne <s.jodogne@gmail.com> parents: 783 diff changeset	2059 rtstructLoader->LoadInstance("83d9c0c3-913a7fee-610097d7-cbf0522d-fd75bee6"); // RT-STRUCT
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2060
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	2061 // 2015-01-28-Multiframe
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	2062 //doseLoader->LoadInstance("88f71e2a-5fad1c61-96ed14d6-5b3d3cf7-a5825279"); // Multiframe CT
764 f36a6f7e7bdf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	2063
661 970949ff868a fix warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 648 diff changeset	2064 // Delphine
783 cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	2065 //ctLoader->LoadSeries("5990e39c-51e5f201-fe87a54c-31a55943-e59ef80e"); // CT
cd13a062c9bd DicomVolumeImage Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	2066 //ctLoader->LoadSeries("67f1b334-02c16752-45026e40-a5b60b6b-030ecab5"); // Lung 1/10mm
661 970949ff868a fix warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 648 diff changeset	2067
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	2068
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	2069 {
78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	2070 LOG(WARNING) << "...Waiting for Ctrl-C...";
760 1181e1ad98ec progressive loading working Sebastien Jodogne <s.jodogne@gmail.com> parents: 759 diff changeset	2071
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2072 oracle.Start();
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2073
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2074 Orthanc::SystemToolbox::ServerBarrier();
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2075
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2076 /**
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2077 * WARNING => The oracle must be stopped BEFORE the objects using
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2078 * it are destroyed!!! This forces to wait for the completion of
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2079 * the running callback methods. Otherwise, the callbacks methods
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2080 * might still be running while their parent object is destroyed,
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2081 * resulting in crashes. This is very visible if adding a sleep(),
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2082 * as in (*).
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2083 **/
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2084
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2085 oracle.Stop();
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2086 }
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2087 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2088
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2089
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2090
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2091 /**
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2092 * IMPORTANT: The full arguments to "main()" are needed for SDL on
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2093 * Windows. Otherwise, one gets the linking error "undefined reference
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2094 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2095 **/
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2096 int main(int argc, char* argv[])
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2097 {
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2098 OrthancStone::StoneInitialize();
778 78fcb907caf6 VolumeGeometryReadyMessage Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	2099 //Orthanc::Logging::EnableInfoLevel(true);
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2100
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2101 try
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2102 {
745 c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	2103 OrthancStone::NativeApplicationContext context;
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	2104
c44c1d2d3598 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	2105 OrthancStone::ThreadedOracle oracle(context);
767 dce5b067d040 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 766 diff changeset	2106 //oracle.SetThreadsCount(1);
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	2107
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	2108 {
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	2109 Orthanc::WebServiceParameters p;
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	2110 //p.SetUrl("http://localhost:8043/");
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	2111 p.SetCredentials("orthanc", "orthanc");
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	2112 oracle.SetOrthancParameters(p);
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	2113 }
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	2114
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2115 //oracle.Start();
680 0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	2116
0eb26f514ac5 loading of slice images Sebastien Jodogne <s.jodogne@gmail.com> parents: 678 diff changeset	2117 Run(context, oracle);
765 f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2118
f6438fdc447e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 764 diff changeset	2119 //oracle.Stop();
619 9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2120 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2121 catch (Orthanc::OrthancException& e)
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2122 {
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2123 LOG(ERROR) << "EXCEPTION: " << e.What();
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2124 }
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2125
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2126 OrthancStone::StoneFinalize();
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2127
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2128 return 0;
9cd19b28f011 test: refactoring oracle Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2129 }

Mercurial > hg > orthanc-stone

annotate Samples/Sdl/Loader.cpp @ 793:f72b49954f62