orthanc-stone: Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp annotate

annotate Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp @ 1381:f4a06ad1580b

Branch broker is now the new default

author	Benjamin Golinvaux <bgo@osimis.io>
date	Wed, 22 Apr 2020 14:05:47 +0200
parents	8a0a62189f46 b497e1217aa5
children	afdd5be8731c

rev	line source
1337 b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	1 /**
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	2 * Stone of Orthanc
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	6 *
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	8 * modify it under the terms of the GNU Affero General Public License
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	9 * as published by the Free Software Foundation, either version 3 of
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	10 * the License, or (at your option) any later version.
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	11 *
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	12 * This program is distributed in the hope that it will be useful, but
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	15 * Affero General Public License for more details.
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	16 *
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	17 * You should have received a copy of the GNU Affero General Public License
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	19 **/
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	20
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	21
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	22 #include "OrthancSeriesVolumeProgressiveLoader.h"
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	23
1339 556b4bc19118 The loaders have been adapter to the nobroker architecture Benjamin Golinvaux <bgo@osimis.io> parents: 1337 diff changeset	24 #include "../StoneException.h"
556b4bc19118 The loaders have been adapter to the nobroker architecture Benjamin Golinvaux <bgo@osimis.io> parents: 1337 diff changeset	25 #include "../Loaders/ILoadersContext.h"
556b4bc19118 The loaders have been adapter to the nobroker architecture Benjamin Golinvaux <bgo@osimis.io> parents: 1337 diff changeset	26 #include "../Loaders/BasicFetchingItemsSorter.h"
556b4bc19118 The loaders have been adapter to the nobroker architecture Benjamin Golinvaux <bgo@osimis.io> parents: 1337 diff changeset	27 #include "../Loaders/BasicFetchingStrategy.h"
556b4bc19118 The loaders have been adapter to the nobroker architecture Benjamin Golinvaux <bgo@osimis.io> parents: 1337 diff changeset	28 #include "../Toolbox/GeometryToolbox.h"
556b4bc19118 The loaders have been adapter to the nobroker architecture Benjamin Golinvaux <bgo@osimis.io> parents: 1337 diff changeset	29 #include "../Volumes/DicomVolumeImageMPRSlicer.h"
1337 b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	30
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	31 #include <Core/Images/ImageProcessing.h>
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	32 #include <Core/OrthancException.h>
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	33
1363 b497e1217aa5 dummy change Benjamin Golinvaux <bgo@osimis.io> parents: 1339 diff changeset	34
1337 b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	35 namespace OrthancStone
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	36 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	37 using OrthancStone::ILoadersContext;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	38
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	39 class OrthancSeriesVolumeProgressiveLoader::ExtractedSlice : public OrthancStone::DicomVolumeImageMPRSlicer::Slice
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	40 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	41 private:
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	42 const OrthancSeriesVolumeProgressiveLoader& that_;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	43
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	44 public:
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	45 ExtractedSlice(const OrthancSeriesVolumeProgressiveLoader& that,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	46 const OrthancStone::CoordinateSystem3D& plane) :
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	47 OrthancStone::DicomVolumeImageMPRSlicer::Slice(*that.volume_, plane),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	48 that_(that)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	49 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	50 if (IsValid())
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	51 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	52 if (GetProjection() == OrthancStone::VolumeProjection_Axial)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	53 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	54 // For coronal and sagittal projections, we take the global
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	55 // revision of the volume because even if a single slice changes,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	56 // this means the projection will yield a different result -->
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	57 // we must increase the revision as soon as any slice changes
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	58 SetRevision(that_.seriesGeometry_.GetSliceRevision(GetSliceIndex()));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	59 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	60
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	61 if (that_.strategy_.get() != NULL &&
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	62 GetProjection() == OrthancStone::VolumeProjection_Axial)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	63 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	64 that_.strategy_->SetCurrent(GetSliceIndex());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	65 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	66 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	67 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	68 };
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	69
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	70 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::CheckSlice(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	71 size_t index, const OrthancStone::DicomInstanceParameters& reference) const
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	72 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	73 const OrthancStone::DicomInstanceParameters& slice = *slices_[index];
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	74
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	75 if (!OrthancStone::GeometryToolbox::IsParallel(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	76 reference.GetGeometry().GetNormal(),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	77 slice.GetGeometry().GetNormal()))
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	78 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	79 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	80 "A slice in the volume image is not parallel to the others");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	81 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	82
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	83 if (reference.GetExpectedPixelFormat() != slice.GetExpectedPixelFormat())
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	84 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	85 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	86 "The pixel format changes across the slices of the volume image");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	87 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	88
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	89 if (reference.GetImageInformation().GetWidth() != slice.GetImageInformation().GetWidth() \|\|
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	90 reference.GetImageInformation().GetHeight() != slice.GetImageInformation().GetHeight())
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	91 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	92 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	93 "The width/height of slices are not constant in the volume image");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	94 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	95
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	96 if (!OrthancStone::LinearAlgebra::IsNear(reference.GetPixelSpacingX(), slice.GetPixelSpacingX()) \|\|
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	97 !OrthancStone::LinearAlgebra::IsNear(reference.GetPixelSpacingY(), slice.GetPixelSpacingY()))
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	98 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	99 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	100 "The pixel spacing of the slices change across the volume image");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	101 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	102 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	103
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	104
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	105 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::CheckVolume() const
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	106 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	107 for (size_t i = 0; i < slices_.size(); i++)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	108 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	109 assert(slices_[i] != NULL);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	110 if (slices_[i]->GetImageInformation().GetNumberOfFrames() != 1)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	111 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	112 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	113 "This class does not support multi-frame images");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	114 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	115 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	116
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	117 if (slices_.size() != 0)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	118 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	119 const OrthancStone::DicomInstanceParameters& reference = *slices_[0];
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	120
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	121 for (size_t i = 1; i < slices_.size(); i++)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	122 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	123 CheckSlice(i, reference);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	124 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	125 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	126 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	127
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	128
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	129 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::Clear()
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	130 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	131 for (size_t i = 0; i < slices_.size(); i++)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	132 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	133 assert(slices_[i] != NULL);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	134 delete slices_[i];
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	135 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	136
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	137 slices_.clear();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	138 slicesRevision_.clear();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	139 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	140
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	141
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	142 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::CheckSliceIndex(size_t index) const
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	143 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	144 if (!HasGeometry())
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	145 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	146 LOG(ERROR) << "OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::CheckSliceIndex(size_t index): (!HasGeometry())";
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	147 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	148 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	149 else if (index >= slices_.size())
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	150 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	151 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	152 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	153 else
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	154 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	155 assert(slices_.size() == GetImageGeometry().GetDepth() &&
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	156 slices_.size() == slicesRevision_.size());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	157 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	158 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	159
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	160
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	161 // WARNING: The payload of "slices" must be of class "DicomInstanceParameters"
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	162 // (called with the slices created in LoadGeometry)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	163 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::ComputeGeometry(OrthancStone::SlicesSorter& slices)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	164 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	165 Clear();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	166
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	167 if (!slices.Sort())
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	168 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	169 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	170 "Cannot sort the 3D slices of a DICOM series");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	171 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	172
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	173 if (slices.GetSlicesCount() == 0)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	174 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	175 geometry_.reset(new OrthancStone::VolumeImageGeometry);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	176 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	177 else
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	178 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	179 slices_.reserve(slices.GetSlicesCount());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	180 slicesRevision_.resize(slices.GetSlicesCount(), 0);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	181
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	182 for (size_t i = 0; i < slices.GetSlicesCount(); i++)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	183 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	184 const OrthancStone::DicomInstanceParameters& slice =
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	185 dynamic_cast<const OrthancStone::DicomInstanceParameters&>(slices.GetSlicePayload(i));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	186 slices_.push_back(new OrthancStone::DicomInstanceParameters(slice));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	187 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	188
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	189 CheckVolume();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	190
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	191 double spacingZ;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	192
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	193 if (slices.ComputeSpacingBetweenSlices(spacingZ))
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	194 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	195 LOG(TRACE) << "Computed spacing between slices: " << spacingZ << "mm";
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	196
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	197 const OrthancStone::DicomInstanceParameters& parameters = *slices_[0];
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	198
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	199 geometry_.reset(new OrthancStone::VolumeImageGeometry);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	200 geometry_->SetSizeInVoxels(parameters.GetImageInformation().GetWidth(),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	201 parameters.GetImageInformation().GetHeight(),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	202 static_cast<unsigned int>(slices.GetSlicesCount()));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	203 geometry_->SetAxialGeometry(slices.GetSliceGeometry(0));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	204 geometry_->SetVoxelDimensions(parameters.GetPixelSpacingX(),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	205 parameters.GetPixelSpacingY(), spacingZ);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	206 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	207 else
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	208 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	209 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	210 "The origins of the slices of a volume image are not regularly spaced");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	211 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	212 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	213 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	214
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	215
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	216 const OrthancStone::VolumeImageGeometry& OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::GetImageGeometry() const
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	217 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	218 if (!HasGeometry())
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	219 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	220 LOG(ERROR) << "OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::GetImageGeometry(): (!HasGeometry())";
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	221 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	222 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	223 else
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	224 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	225 assert(slices_.size() == geometry_->GetDepth());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	226 return *geometry_;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	227 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	228 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	229
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	230
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	231 const OrthancStone::DicomInstanceParameters& OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::GetSliceParameters(size_t index) const
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	232 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	233 CheckSliceIndex(index);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	234 return *slices_[index];
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	235 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	236
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	237
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	238 uint64_t OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::GetSliceRevision(size_t index) const
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	239 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	240 CheckSliceIndex(index);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	241 return slicesRevision_[index];
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	242 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	243
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	244
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	245 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::IncrementSliceRevision(size_t index)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	246 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	247 CheckSliceIndex(index);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	248 slicesRevision_[index] ++;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	249 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	250
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	251
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	252 static unsigned int GetSliceIndexPayload(const OrthancStone::OracleCommandBase& command)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	253 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	254 assert(command.HasPayload());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	255 return dynamic_cast< const Orthanc::SingleValueObject<unsigned int>& >(command.GetPayload()).GetValue();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	256 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	257
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	258
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	259 void OrthancSeriesVolumeProgressiveLoader::ScheduleNextSliceDownload()
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	260 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	261 assert(strategy_.get() != NULL);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	262
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	263 unsigned int sliceIndex = 0, quality = 0;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	264
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	265 if (strategy_->GetNext(sliceIndex, quality))
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	266 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	267 if (!progressiveQuality_)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	268 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	269 ORTHANC_ASSERT(quality == QUALITY_00, "INTERNAL ERROR. quality != QUALITY_00 in "
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	270 << "OrthancSeriesVolumeProgressiveLoader::ScheduleNextSliceDownload");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	271 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	272
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	273 const OrthancStone::DicomInstanceParameters& slice = seriesGeometry_.GetSliceParameters(sliceIndex);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	274
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	275 const std::string& instance = slice.GetOrthancInstanceIdentifier();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	276 if (instance.empty())
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	277 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	278 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	279 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	280
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	281 std::unique_ptr<OrthancStone::OracleCommandBase> command;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	282
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	283 if (!progressiveQuality_ \|\| quality == QUALITY_02)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	284 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	285 std::unique_ptr<OrthancStone::GetOrthancImageCommand> tmp(new OrthancStone::GetOrthancImageCommand);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	286 // TODO: review the following comment.
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	287 // - Commented out by bgo on 2019-07-19 \| reason: Alain has seen cases
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	288 // where gzipping the uint16 image took 11 sec to produce 5mb.
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	289 // The unzipped request was much much faster.
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	290 // - Re-enabled on 2019-07-30. Reason: in Web Assembly, the browser
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	291 // does not use the Accept-Encoding header and always requests
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	292 // compression. Furthermore, NOT
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	293 tmp->SetHttpHeader("Accept-Encoding", "gzip");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	294 tmp->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	295 tmp->SetInstanceUri(instance, slice.GetExpectedPixelFormat());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	296 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	297 //LOG(INFO)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	298 // << "OrthancSeriesVolumeProgressiveLoader.ScheduleNextSliceDownload()"
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	299 // << " sliceIndex = " << sliceIndex << " slice quality = " << quality
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	300 // << " URI = " << tmp->GetUri();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	301 command.reset(tmp.release());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	302 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	303 else // progressive mode is true AND quality is not final (different from QUALITY_02
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	304 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	305 std::unique_ptr<OrthancStone::GetOrthancWebViewerJpegCommand> tmp(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	306 new OrthancStone::GetOrthancWebViewerJpegCommand);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	307
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	308 // TODO: review the following comment. Commented out by bgo on 2019-07-19
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	309 // (gzip for jpeg seems overkill)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	310 //tmp->SetHttpHeader("Accept-Encoding", "gzip");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	311 tmp->SetInstance(instance);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	312 tmp->SetQuality((quality == 0 ? 50 : 90)); // QUALITY_00 is Jpeg50 while QUALITY_01 is Jpeg90
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	313 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	314 LOG(TRACE)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	315 << "OrthancSeriesVolumeProgressiveLoader.ScheduleNextSliceDownload()"
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	316 << " sliceIndex = " << sliceIndex << " slice quality = " << quality;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	317 command.reset(tmp.release());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	318 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	319
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	320 command->AcquirePayload(new Orthanc::SingleValueObject<unsigned int>(sliceIndex));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	321
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	322 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	323 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(loadersContext_.Lock());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	324 boost::shared_ptr<IObserver> observer(GetSharedObserver());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	325 lock->Schedule(observer, 0, command.release()); // TODO: priority!
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	326 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	327 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	328 else
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	329 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	330 // loading is finished!
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	331 volumeImageReadyInHighQuality_ = true;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	332 BroadcastMessage(OrthancSeriesVolumeProgressiveLoader::VolumeImageReadyInHighQuality(*this));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	333 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	334 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	335
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	336 /**
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	337 This is called in response to GET "/series/XXXXXXXXXXXXX/instances-tags"
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	338 */
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	339 void OrthancSeriesVolumeProgressiveLoader::LoadGeometry(const OrthancStone::OrthancRestApiCommand::SuccessMessage& message)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	340 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	341 Json::Value body;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	342 message.ParseJsonBody(body);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	343
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	344 if (body.type() != Json::objectValue)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	345 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	346 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	347 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	348
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	349 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	350 Json::Value::Members instances = body.getMemberNames();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	351
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	352 OrthancStone::SlicesSorter slices;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	353
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	354 for (size_t i = 0; i < instances.size(); i++)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	355 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	356 Orthanc::DicomMap dicom;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	357 dicom.FromDicomAsJson(body[instances[i]]);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	358
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	359 std::unique_ptr<OrthancStone::DicomInstanceParameters> instance(new OrthancStone::DicomInstanceParameters(dicom));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	360 instance->SetOrthancInstanceIdentifier(instances[i]);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	361
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	362 // the 3D plane corresponding to the slice
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	363 OrthancStone::CoordinateSystem3D geometry = instance->GetGeometry();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	364 slices.AddSlice(geometry, instance.release());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	365 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	366
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	367 seriesGeometry_.ComputeGeometry(slices);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	368 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	369
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	370 size_t slicesCount = seriesGeometry_.GetImageGeometry().GetDepth();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	371
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	372 if (slicesCount == 0)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	373 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	374 volume_->Initialize(seriesGeometry_.GetImageGeometry(), Orthanc::PixelFormat_Grayscale8);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	375 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	376 else
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	377 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	378 const OrthancStone::DicomInstanceParameters& parameters = seriesGeometry_.GetSliceParameters(0);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	379
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	380 volume_->Initialize(seriesGeometry_.GetImageGeometry(), parameters.GetExpectedPixelFormat());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	381 volume_->SetDicomParameters(parameters);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	382 volume_->GetPixelData().Clear();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	383
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	384 // If we are in progressive mode, the Fetching strategy will first request QUALITY_00, then QUALITY_01, then
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	385 // QUALITY_02... Otherwise, it's only QUALITY_00
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	386 unsigned int maxQuality = QUALITY_00;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	387 if (progressiveQuality_)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	388 maxQuality = QUALITY_02;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	389
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	390 strategy_.reset(new OrthancStone::BasicFetchingStrategy(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	391 sorter_->CreateSorter(static_cast<unsigned int>(slicesCount)),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	392 maxQuality));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	393
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	394 assert(simultaneousDownloads_ != 0);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	395 for (unsigned int i = 0; i < simultaneousDownloads_; i++)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	396 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	397 ScheduleNextSliceDownload();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	398 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	399 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	400
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	401 slicesQuality_.resize(slicesCount, 0);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	402
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	403 BroadcastMessage(OrthancStone::DicomVolumeImage::GeometryReadyMessage(*volume_));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	404 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	405
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	406
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	407 void OrthancSeriesVolumeProgressiveLoader::SetSliceContent(unsigned int sliceIndex,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	408 const Orthanc::ImageAccessor& image,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	409 unsigned int quality)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	410 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	411 ORTHANC_ASSERT(sliceIndex < slicesQuality_.size() &&
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	412 slicesQuality_.size() == volume_->GetPixelData().GetDepth());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	413
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	414 if (!progressiveQuality_)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	415 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	416 ORTHANC_ASSERT(quality == QUALITY_00);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	417 ORTHANC_ASSERT(slicesQuality_[sliceIndex] == QUALITY_00);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	418 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	419
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	420 if (quality >= slicesQuality_[sliceIndex])
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	421 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	422 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	423 OrthancStone::ImageBuffer3D::SliceWriter writer(volume_->GetPixelData(),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	424 OrthancStone::VolumeProjection_Axial,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	425 sliceIndex);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	426
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	427 Orthanc::ImageProcessing::Copy(writer.GetAccessor(), image);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	428 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	429
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	430 volume_->IncrementRevision();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	431 seriesGeometry_.IncrementSliceRevision(sliceIndex);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	432 slicesQuality_[sliceIndex] = quality;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	433
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	434 BroadcastMessage(OrthancStone::DicomVolumeImage::ContentUpdatedMessage(*volume_));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	435 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	436 LOG(TRACE) << "SetSliceContent sliceIndex = " << sliceIndex << " -- will "
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	437 << " now call ScheduleNextSliceDownload()";
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	438 ScheduleNextSliceDownload();
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	439 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	440
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	441 void OrthancSeriesVolumeProgressiveLoader::LoadBestQualitySliceContent(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	442 const OrthancStone::GetOrthancImageCommand::SuccessMessage& message)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	443 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	444 unsigned int quality = QUALITY_00;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	445 if (progressiveQuality_)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	446 quality = QUALITY_02;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	447
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	448 SetSliceContent(GetSliceIndexPayload(message.GetOrigin()),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	449 message.GetImage(),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	450 quality);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	451 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	452
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	453 void OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	454 const OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage& message)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	455 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	456 ORTHANC_ASSERT(progressiveQuality_, "INTERNAL ERROR: OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent"
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	457 << " called while progressiveQuality_ is false!");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	458
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	459 LOG(TRACE) << "OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent";
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	460 unsigned int quality;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	461
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	462 switch (dynamic_cast<const OrthancStone::GetOrthancWebViewerJpegCommand&>(message.GetOrigin()).GetQuality())
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	463 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	464 case 50:
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	465 quality = QUALITY_00;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	466 break;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	467
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	468 case 90:
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	469 quality = QUALITY_01;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	470 break;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	471
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	472 default:
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	473 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	474 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	475
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	476 SetSliceContent(GetSliceIndexPayload(message.GetOrigin()), message.GetImage(), quality);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	477 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	478
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	479 OrthancSeriesVolumeProgressiveLoader::OrthancSeriesVolumeProgressiveLoader(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	480 OrthancStone::ILoadersContext& loadersContext,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	481 boost::shared_ptr<OrthancStone::DicomVolumeImage> volume,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	482 bool progressiveQuality)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	483 : loadersContext_(loadersContext)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	484 , active_(false)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	485 , progressiveQuality_(progressiveQuality)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	486 , simultaneousDownloads_(4)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	487 , volume_(volume)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	488 , sorter_(new OrthancStone::BasicFetchingItemsSorter::Factory)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	489 , volumeImageReadyInHighQuality_(false)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	490 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	491 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	492
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	493 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader>
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	494 OrthancSeriesVolumeProgressiveLoader::Create(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	495 OrthancStone::ILoadersContext& loadersContext,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	496 boost::shared_ptr<OrthancStone::DicomVolumeImage> volume,
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	497 bool progressiveQuality)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	498 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	499 std::auto_ptr<OrthancStone::ILoadersContext::ILock> lock(loadersContext.Lock());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	500
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	501 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> obj(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	502 new OrthancSeriesVolumeProgressiveLoader(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	503 loadersContext, volume, progressiveQuality));
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	504
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	505 obj->Register<OrthancStone::OrthancRestApiCommand::SuccessMessage>(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	506 lock->GetOracleObservable(),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	507 &OrthancSeriesVolumeProgressiveLoader::LoadGeometry);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	508
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	509 obj->Register<OrthancStone::GetOrthancImageCommand::SuccessMessage>(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	510 lock->GetOracleObservable(),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	511 &OrthancSeriesVolumeProgressiveLoader::LoadBestQualitySliceContent);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	512
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	513 obj->Register<OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage>(
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	514 lock->GetOracleObservable(),
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	515 &OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	516
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	517 return obj;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	518 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	519
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	520
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	521 OrthancSeriesVolumeProgressiveLoader::~OrthancSeriesVolumeProgressiveLoader()
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	522 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	523 LOG(TRACE) << "OrthancSeriesVolumeProgressiveLoader::~OrthancSeriesVolumeProgressiveLoader()";
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	524 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	525
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	526 void OrthancSeriesVolumeProgressiveLoader::SetSimultaneousDownloads(unsigned int count)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	527 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	528 if (active_)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	529 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	530 LOG(ERROR) << "OrthancSeriesVolumeProgressiveLoader::SetSimultaneousDownloads(): (active_)";
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	531 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	532 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	533 else if (count == 0)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	534 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	535 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	536 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	537 else
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	538 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	539 simultaneousDownloads_ = count;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	540 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	541 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	542
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	543
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	544 void OrthancSeriesVolumeProgressiveLoader::LoadSeries(const std::string& seriesId)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	545 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	546 if (active_)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	547 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	548 LOG(ERROR) << "OrthancSeriesVolumeProgressiveLoader::LoadSeries(const std::string& seriesId): (active_)";
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	549 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	550 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	551 else
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	552 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	553 active_ = true;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	554
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	555 std::unique_ptr<OrthancStone::OrthancRestApiCommand> command(new OrthancStone::OrthancRestApiCommand);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	556 command->SetUri("/series/" + seriesId + "/instances-tags");
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	557 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	558 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(loadersContext_.Lock());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	559 boost::shared_ptr<IObserver> observer(GetSharedObserver());
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	560 lock->Schedule(observer, 0, command.release()); //TODO: priority!
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	561 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	562 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	563 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	564
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	565
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	566 OrthancStone::IVolumeSlicer::IExtractedSlice*
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	567 OrthancSeriesVolumeProgressiveLoader::ExtractSlice(const OrthancStone::CoordinateSystem3D& cuttingPlane)
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	568 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	569 if (volume_->HasGeometry())
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	570 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	571 return new ExtractedSlice(*this, cuttingPlane);
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	572 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	573 else
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	574 {
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	575 return new IVolumeSlicer::InvalidSlice;
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	576 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	577 }
b1396be5aa27 Moved the fixed loaders back from the dead Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	578 }

Mercurial > hg > orthanc-stone

annotate Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp @ 1381:f4a06ad1580b