Mercurial > hg > orthanc-stone
annotate Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp @ 949:32eaf4929b08 toa2019081301
OrthancMultiframeVolumeLoader and OrthancSeriesVolumeProgressiveLoader now implement IGeometryProvider so that the geometry reference can be switched (CT or DOSE, for instance) + VolumeImageGeometry::SetSize renamed to VolumeImageGeometry::SetSizeInVoxels + prevent text layer update if text or properties do not change + a few stream operator<< for debug (Vector, Matrix,...) + fixed memory access aligment issues in ImageBuffer3D::ExtractSagittalSlice + fix for wrong screen Y offset of mpr slices in DicomVolumeImageMPRSlicer.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Tue, 13 Aug 2019 16:01:05 +0200 |
| parents | 86ac61a040c9 |
| children | a7351ad54960 |
| rev | line source |
|---|---|
| 814 | 1 /** |
| 2 * Stone of Orthanc | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
| 5 * Copyright (C) 2017-2019 Osimis S.A., Belgium | |
| 6 * | |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "OrthancSeriesVolumeProgressiveLoader.h" | |
| 23 | |
| 24 #include "../Toolbox/GeometryToolbox.h" | |
| 25 #include "../Volumes/DicomVolumeImageMPRSlicer.h" | |
| 26 #include "BasicFetchingItemsSorter.h" | |
| 27 #include "BasicFetchingStrategy.h" | |
| 28 | |
| 29 #include <Core/Images/ImageProcessing.h> | |
| 30 #include <Core/OrthancException.h> | |
| 31 | |
| 32 namespace OrthancStone | |
| 33 { | |
| 34 class OrthancSeriesVolumeProgressiveLoader::ExtractedSlice : public DicomVolumeImageMPRSlicer::Slice | |
| 35 { | |
| 36 private: | |
| 37 const OrthancSeriesVolumeProgressiveLoader& that_; | |
| 38 | |
| 39 public: | |
| 40 ExtractedSlice(const OrthancSeriesVolumeProgressiveLoader& that, | |
| 41 const CoordinateSystem3D& plane) : | |
| 42 DicomVolumeImageMPRSlicer::Slice(*that.volume_, plane), | |
| 43 that_(that) | |
| 44 { | |
| 819 | 45 if (IsValid()) |
|
817
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
46 { |
| 819 | 47 if (GetProjection() == VolumeProjection_Axial) |
| 48 { | |
| 49 // For coronal and sagittal projections, we take the global | |
| 50 // revision of the volume because even if a single slice changes, | |
| 51 // this means the projection will yield a different result --> | |
| 52 // we must increase the revision as soon as any slice changes | |
| 53 SetRevision(that_.seriesGeometry_.GetSliceRevision(GetSliceIndex())); | |
| 54 } | |
|
817
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
55 |
| 819 | 56 if (that_.strategy_.get() != NULL && |
| 57 GetProjection() == VolumeProjection_Axial) | |
| 58 { | |
| 59 that_.strategy_->SetCurrent(GetSliceIndex()); | |
| 60 } | |
| 814 | 61 } |
| 62 } | |
| 63 }; | |
| 64 | |
| 65 | |
| 66 | |
| 67 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::CheckSlice(size_t index, | |
| 68 const DicomInstanceParameters& reference) const | |
| 69 { | |
| 70 const DicomInstanceParameters& slice = *slices_[index]; | |
| 71 | |
| 72 if (!GeometryToolbox::IsParallel( | |
| 73 reference.GetGeometry().GetNormal(), | |
| 74 slice.GetGeometry().GetNormal())) | |
| 75 { | |
| 76 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry, | |
| 77 "A slice in the volume image is not parallel to the others"); | |
| 78 } | |
| 79 | |
| 80 if (reference.GetExpectedPixelFormat() != slice.GetExpectedPixelFormat()) | |
| 81 { | |
| 82 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat, | |
| 83 "The pixel format changes across the slices of the volume image"); | |
| 84 } | |
| 85 | |
| 86 if (reference.GetImageInformation().GetWidth() != slice.GetImageInformation().GetWidth() || | |
| 87 reference.GetImageInformation().GetHeight() != slice.GetImageInformation().GetHeight()) | |
| 88 { | |
| 89 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize, | |
| 90 "The width/height of slices are not constant in the volume image"); | |
| 91 } | |
| 92 | |
| 93 if (!LinearAlgebra::IsNear(reference.GetPixelSpacingX(), slice.GetPixelSpacingX()) || | |
| 94 !LinearAlgebra::IsNear(reference.GetPixelSpacingY(), slice.GetPixelSpacingY())) | |
| 95 { | |
| 96 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry, | |
| 97 "The pixel spacing of the slices change across the volume image"); | |
| 98 } | |
| 99 } | |
| 100 | |
| 101 | |
| 102 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::CheckVolume() const | |
| 103 { | |
| 104 for (size_t i = 0; i < slices_.size(); i++) | |
| 105 { | |
| 106 assert(slices_[i] != NULL); | |
| 107 if (slices_[i]->GetImageInformation().GetNumberOfFrames() != 1) | |
| 108 { | |
| 109 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry, | |
| 110 "This class does not support multi-frame images"); | |
| 111 } | |
| 112 } | |
| 113 | |
| 114 if (slices_.size() != 0) | |
| 115 { | |
| 116 const DicomInstanceParameters& reference = *slices_[0]; | |
| 117 | |
| 118 for (size_t i = 1; i < slices_.size(); i++) | |
| 119 { | |
| 120 CheckSlice(i, reference); | |
| 121 } | |
| 122 } | |
| 123 } | |
| 124 | |
| 125 | |
| 126 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::Clear() | |
| 127 { | |
| 128 for (size_t i = 0; i < slices_.size(); i++) | |
| 129 { | |
| 130 assert(slices_[i] != NULL); | |
| 131 delete slices_[i]; | |
| 132 } | |
| 133 | |
| 134 slices_.clear(); | |
| 135 slicesRevision_.clear(); | |
| 136 } | |
| 137 | |
| 138 | |
| 139 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::CheckSliceIndex(size_t index) const | |
| 140 { | |
| 141 if (!HasGeometry()) | |
| 142 { | |
| 143 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 144 } | |
| 145 else if (index >= slices_.size()) | |
| 146 { | |
| 147 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 148 } | |
| 149 else | |
| 150 { | |
| 151 assert(slices_.size() == GetImageGeometry().GetDepth() && | |
| 152 slices_.size() == slicesRevision_.size()); | |
| 153 } | |
| 154 } | |
| 155 | |
| 156 | |
| 157 // WARNING: The payload of "slices" must be of class "DicomInstanceParameters" | |
| 158 // (called with the slices created in LoadGeometry) | |
| 159 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::ComputeGeometry(SlicesSorter& slices) | |
| 160 { | |
| 161 Clear(); | |
| 162 | |
| 163 if (!slices.Sort()) | |
| 164 { | |
| 165 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange, | |
| 166 "Cannot sort the 3D slices of a DICOM series"); | |
| 167 } | |
| 168 | |
| 169 if (slices.GetSlicesCount() == 0) | |
| 170 { | |
| 171 geometry_.reset(new VolumeImageGeometry); | |
| 172 } | |
| 173 else | |
| 174 { | |
| 175 slices_.reserve(slices.GetSlicesCount()); | |
| 176 slicesRevision_.resize(slices.GetSlicesCount(), 0); | |
| 177 | |
| 178 for (size_t i = 0; i < slices.GetSlicesCount(); i++) | |
| 179 { | |
| 180 const DicomInstanceParameters& slice = | |
| 181 dynamic_cast<const DicomInstanceParameters&>(slices.GetSlicePayload(i)); | |
| 182 slices_.push_back(new DicomInstanceParameters(slice)); | |
| 183 } | |
| 184 | |
| 185 CheckVolume(); | |
| 186 | |
| 187 const double spacingZ = slices.ComputeSpacingBetweenSlices(); | |
| 188 LOG(INFO) << "Computed spacing between slices: " << spacingZ << "mm"; | |
| 189 | |
| 190 const DicomInstanceParameters& parameters = *slices_[0]; | |
| 191 | |
| 192 geometry_.reset(new VolumeImageGeometry); | |
|
949
32eaf4929b08
OrthancMultiframeVolumeLoader and OrthancSeriesVolumeProgressiveLoader now implement IGeometryProvider so that the geometry reference can be switched (CT or DOSE, for instance) + VolumeImageGeometry::SetSize renamed to VolumeImageGeometry::SetSizeInVoxels + prevent text layer update if text or properties do not change + a few stream operator<< for debug (Vector, Matrix,...) + fixed memory access aligment issues in ImageBuffer3D::ExtractSagittalSlice + fix for wrong screen Y offset of mpr slices in DicomVolumeImageMPRSlicer.
Benjamin Golinvaux <bgo@osimis.io>
parents:
937
diff
changeset
|
193 geometry_->SetSizeInVoxels(parameters.GetImageInformation().GetWidth(), |
| 814 | 194 parameters.GetImageInformation().GetHeight(), |
| 195 static_cast<unsigned int>(slices.GetSlicesCount())); | |
| 196 geometry_->SetAxialGeometry(slices.GetSliceGeometry(0)); | |
| 197 geometry_->SetVoxelDimensions(parameters.GetPixelSpacingX(), | |
| 198 parameters.GetPixelSpacingY(), spacingZ); | |
| 199 } | |
| 200 } | |
| 201 | |
| 202 | |
| 203 const VolumeImageGeometry& OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::GetImageGeometry() const | |
| 204 { | |
| 205 if (!HasGeometry()) | |
| 206 { | |
| 207 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 208 } | |
| 209 else | |
| 210 { | |
| 211 assert(slices_.size() == geometry_->GetDepth()); | |
| 212 return *geometry_; | |
| 213 } | |
| 214 } | |
| 215 | |
| 216 | |
| 217 const DicomInstanceParameters& OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::GetSliceParameters(size_t index) const | |
| 218 { | |
| 219 CheckSliceIndex(index); | |
| 220 return *slices_[index]; | |
| 221 } | |
| 222 | |
| 223 | |
| 224 uint64_t OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::GetSliceRevision(size_t index) const | |
| 225 { | |
| 226 CheckSliceIndex(index); | |
| 227 return slicesRevision_[index]; | |
| 228 } | |
| 229 | |
| 230 | |
| 231 void OrthancSeriesVolumeProgressiveLoader::SeriesGeometry::IncrementSliceRevision(size_t index) | |
| 232 { | |
| 233 CheckSliceIndex(index); | |
| 234 slicesRevision_[index] ++; | |
| 235 } | |
| 236 | |
| 237 | |
| 238 static unsigned int GetSliceIndexPayload(const OracleCommandWithPayload& command) | |
| 239 { | |
| 240 return dynamic_cast< const Orthanc::SingleValueObject<unsigned int>& >(command.GetPayload()).GetValue(); | |
| 241 } | |
| 242 | |
| 243 | |
| 244 void OrthancSeriesVolumeProgressiveLoader::ScheduleNextSliceDownload() | |
| 245 { | |
| 246 assert(strategy_.get() != NULL); | |
| 247 | |
| 248 unsigned int sliceIndex, quality; | |
| 249 | |
| 250 if (strategy_->GetNext(sliceIndex, quality)) | |
| 251 { | |
| 252 assert(quality <= BEST_QUALITY); | |
| 253 | |
| 254 const DicomInstanceParameters& slice = seriesGeometry_.GetSliceParameters(sliceIndex); | |
| 255 | |
| 256 const std::string& instance = slice.GetOrthancInstanceIdentifier(); | |
| 257 if (instance.empty()) | |
| 258 { | |
| 259 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 260 } | |
| 261 | |
| 262 std::auto_ptr<OracleCommandWithPayload> command; | |
| 263 | |
| 264 if (quality == BEST_QUALITY) | |
| 265 { | |
| 266 std::auto_ptr<GetOrthancImageCommand> tmp(new GetOrthancImageCommand); | |
|
937
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
267 // TODO: review the following comment. |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
268 // - Commented out by bgo on 2019-07-19 | reason: Alain has seen cases |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
269 // where gzipping the uint16 image took 11 sec to produce 5mb. |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
270 // The unzipped request was much much faster. |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
271 // - Re-enabled on 2019-07-30. Reason: in Web Assembly, the browser |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
272 // does not use the Accept-Encoding header and always requests |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
273 // compression. Furthermore, NOT |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
274 tmp->SetHttpHeader("Accept-Encoding", "gzip"); |
| 814 | 275 tmp->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam))); |
| 819 | 276 tmp->SetInstanceUri(instance, slice.GetExpectedPixelFormat()); |
| 814 | 277 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat()); |
| 278 command.reset(tmp.release()); | |
| 279 } | |
| 280 else | |
| 281 { | |
| 282 std::auto_ptr<GetOrthancWebViewerJpegCommand> tmp(new GetOrthancWebViewerJpegCommand); | |
|
913
2b4b6b86520a
Re-enabled gl debug output in GuiAdapter +
Benjamin Golinvaux <bgo@osimis.io>
parents:
819
diff
changeset
|
283 // TODO: review the following comment. Commented out by bgo on 2019-07-19 |
|
2b4b6b86520a
Re-enabled gl debug output in GuiAdapter +
Benjamin Golinvaux <bgo@osimis.io>
parents:
819
diff
changeset
|
284 // (gzip for jpeg seems overkill) |
|
2b4b6b86520a
Re-enabled gl debug output in GuiAdapter +
Benjamin Golinvaux <bgo@osimis.io>
parents:
819
diff
changeset
|
285 //tmp->SetHttpHeader("Accept-Encoding", "gzip"); |
| 814 | 286 tmp->SetInstance(instance); |
| 287 tmp->SetQuality((quality == 0 ? 50 : 90)); | |
| 288 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat()); | |
| 289 command.reset(tmp.release()); | |
| 290 } | |
| 291 | |
| 292 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(sliceIndex)); | |
| 293 oracle_.Schedule(*this, command.release()); | |
| 294 } | |
|
937
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
295 else |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
296 { |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
297 // loading is finished! |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
298 volumeImageReadyInHighQuality_ = true; |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
299 BroadcastMessage(OrthancSeriesVolumeProgressiveLoader::VolumeImageReadyInHighQuality(*this)); |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
300 } |
| 814 | 301 } |
| 302 | |
| 303 /** | |
| 304 This is called in response to GET "/series/XXXXXXXXXXXXX/instances-tags" | |
| 305 */ | |
| 306 void OrthancSeriesVolumeProgressiveLoader::LoadGeometry(const OrthancRestApiCommand::SuccessMessage& message) | |
| 307 { | |
| 308 Json::Value body; | |
| 309 message.ParseJsonBody(body); | |
| 310 | |
| 311 if (body.type() != Json::objectValue) | |
| 312 { | |
| 313 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 314 } | |
| 315 | |
| 316 { | |
| 317 Json::Value::Members instances = body.getMemberNames(); | |
| 318 | |
| 319 SlicesSorter slices; | |
| 320 | |
| 321 for (size_t i = 0; i < instances.size(); i++) | |
| 322 { | |
| 323 Orthanc::DicomMap dicom; | |
| 324 dicom.FromDicomAsJson(body[instances[i]]); | |
| 325 | |
| 326 std::auto_ptr<DicomInstanceParameters> instance(new DicomInstanceParameters(dicom)); | |
| 327 instance->SetOrthancInstanceIdentifier(instances[i]); | |
| 328 | |
| 329 // the 3D plane corresponding to the slice | |
| 330 CoordinateSystem3D geometry = instance->GetGeometry(); | |
| 331 slices.AddSlice(geometry, instance.release()); | |
| 332 } | |
| 333 | |
| 334 seriesGeometry_.ComputeGeometry(slices); | |
| 335 } | |
| 336 | |
| 337 size_t slicesCount = seriesGeometry_.GetImageGeometry().GetDepth(); | |
| 338 | |
| 339 if (slicesCount == 0) | |
| 340 { | |
| 341 volume_->Initialize(seriesGeometry_.GetImageGeometry(), Orthanc::PixelFormat_Grayscale8); | |
| 342 } | |
| 343 else | |
| 344 { | |
| 345 const DicomInstanceParameters& parameters = seriesGeometry_.GetSliceParameters(0); | |
| 346 | |
| 347 volume_->Initialize(seriesGeometry_.GetImageGeometry(), parameters.GetExpectedPixelFormat()); | |
| 348 volume_->SetDicomParameters(parameters); | |
| 349 volume_->GetPixelData().Clear(); | |
| 350 | |
| 351 strategy_.reset(new BasicFetchingStrategy(sorter_->CreateSorter(static_cast<unsigned int>(slicesCount)), BEST_QUALITY)); | |
| 352 | |
| 353 assert(simultaneousDownloads_ != 0); | |
| 354 for (unsigned int i = 0; i < simultaneousDownloads_; i++) | |
| 355 { | |
| 356 ScheduleNextSliceDownload(); | |
| 357 } | |
| 358 } | |
| 359 | |
| 360 slicesQuality_.resize(slicesCount, 0); | |
| 361 | |
| 362 BroadcastMessage(DicomVolumeImage::GeometryReadyMessage(*volume_)); | |
| 363 } | |
| 364 | |
| 365 | |
| 366 void OrthancSeriesVolumeProgressiveLoader::SetSliceContent(unsigned int sliceIndex, | |
| 367 const Orthanc::ImageAccessor& image, | |
| 368 unsigned int quality) | |
| 369 { | |
| 370 assert(sliceIndex < slicesQuality_.size() && | |
| 371 slicesQuality_.size() == volume_->GetPixelData().GetDepth()); | |
| 372 | |
| 373 if (quality >= slicesQuality_[sliceIndex]) | |
| 374 { | |
| 375 { | |
| 376 ImageBuffer3D::SliceWriter writer(volume_->GetPixelData(), VolumeProjection_Axial, sliceIndex); | |
| 377 Orthanc::ImageProcessing::Copy(writer.GetAccessor(), image); | |
| 378 } | |
| 379 | |
| 380 volume_->IncrementRevision(); | |
| 381 seriesGeometry_.IncrementSliceRevision(sliceIndex); | |
| 382 slicesQuality_[sliceIndex] = quality; | |
| 383 | |
| 384 BroadcastMessage(DicomVolumeImage::ContentUpdatedMessage(*volume_)); | |
| 385 } | |
| 386 | |
| 387 ScheduleNextSliceDownload(); | |
| 388 } | |
| 389 | |
| 390 | |
| 391 void OrthancSeriesVolumeProgressiveLoader::LoadBestQualitySliceContent(const GetOrthancImageCommand::SuccessMessage& message) | |
| 392 { | |
| 393 SetSliceContent(GetSliceIndexPayload(message.GetOrigin()), message.GetImage(), BEST_QUALITY); | |
| 394 } | |
| 395 | |
| 396 | |
| 397 void OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent(const GetOrthancWebViewerJpegCommand::SuccessMessage& message) | |
| 398 { | |
| 399 unsigned int quality; | |
| 400 | |
| 401 switch (message.GetOrigin().GetQuality()) | |
| 402 { | |
| 403 case 50: | |
| 404 quality = LOW_QUALITY; | |
| 405 break; | |
| 406 | |
| 407 case 90: | |
| 408 quality = MIDDLE_QUALITY; | |
| 409 break; | |
| 410 | |
| 411 default: | |
| 412 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 413 } | |
| 414 | |
| 415 SetSliceContent(GetSliceIndexPayload(message.GetOrigin()), message.GetImage(), quality); | |
| 416 } | |
| 417 | |
| 418 | |
| 419 OrthancSeriesVolumeProgressiveLoader::OrthancSeriesVolumeProgressiveLoader(const boost::shared_ptr<DicomVolumeImage>& volume, | |
| 420 IOracle& oracle, | |
| 421 IObservable& oracleObservable) : | |
| 422 IObserver(oracleObservable.GetBroker()), | |
| 423 IObservable(oracleObservable.GetBroker()), | |
| 424 oracle_(oracle), | |
| 425 active_(false), | |
| 426 simultaneousDownloads_(4), | |
| 427 volume_(volume), | |
|
937
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
428 sorter_(new BasicFetchingItemsSorter::Factory), |
|
86ac61a040c9
Added getters and notifications to allow clients of the loaders (DicomStructureSetLoader, OrthancSeriesVolumeProgressiveLoader and OrthancMultiframeVolumeLoader) to know when the loading is finished + added ability for SDL event loop to execute a callback repeatedly (used to check the view loading state)
Benjamin Golinvaux <bgo@osimis.io>
parents:
935
diff
changeset
|
429 volumeImageReadyInHighQuality_(false) |
| 814 | 430 { |
| 431 oracleObservable.RegisterObserverCallback( | |
| 432 new Callable<OrthancSeriesVolumeProgressiveLoader, OrthancRestApiCommand::SuccessMessage> | |
| 433 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadGeometry)); | |
| 434 | |
| 435 oracleObservable.RegisterObserverCallback( | |
| 436 new Callable<OrthancSeriesVolumeProgressiveLoader, GetOrthancImageCommand::SuccessMessage> | |
| 437 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadBestQualitySliceContent)); | |
| 438 | |
| 439 oracleObservable.RegisterObserverCallback( | |
| 440 new Callable<OrthancSeriesVolumeProgressiveLoader, GetOrthancWebViewerJpegCommand::SuccessMessage> | |
| 441 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent)); | |
| 442 } | |
| 443 | |
|
935
401808e7ff2e
Added traces in LoaderCache objects dtors + fuse to prevent dead weak ptrs to be calleds in VisitWdigets (in GuiAdapter.h)
Benjamin Golinvaux <bgo@osimis.io>
parents:
933
diff
changeset
|
444 OrthancSeriesVolumeProgressiveLoader::~OrthancSeriesVolumeProgressiveLoader() |
|
401808e7ff2e
Added traces in LoaderCache objects dtors + fuse to prevent dead weak ptrs to be calleds in VisitWdigets (in GuiAdapter.h)
Benjamin Golinvaux <bgo@osimis.io>
parents:
933
diff
changeset
|
445 { |
|
401808e7ff2e
Added traces in LoaderCache objects dtors + fuse to prevent dead weak ptrs to be calleds in VisitWdigets (in GuiAdapter.h)
Benjamin Golinvaux <bgo@osimis.io>
parents:
933
diff
changeset
|
446 LOG(TRACE) << "OrthancSeriesVolumeProgressiveLoader::~OrthancSeriesVolumeProgressiveLoader()"; |
|
401808e7ff2e
Added traces in LoaderCache objects dtors + fuse to prevent dead weak ptrs to be calleds in VisitWdigets (in GuiAdapter.h)
Benjamin Golinvaux <bgo@osimis.io>
parents:
933
diff
changeset
|
447 } |
| 814 | 448 |
| 449 void OrthancSeriesVolumeProgressiveLoader::SetSimultaneousDownloads(unsigned int count) | |
| 450 { | |
| 451 if (active_) | |
| 452 { | |
| 453 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 454 } | |
| 455 else if (count == 0) | |
| 456 { | |
| 457 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 458 } | |
| 459 else | |
| 460 { | |
| 461 simultaneousDownloads_ = count; | |
| 462 } | |
| 463 } | |
| 464 | |
| 465 | |
| 466 void OrthancSeriesVolumeProgressiveLoader::LoadSeries(const std::string& seriesId) | |
| 467 { | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
913
diff
changeset
|
468 // LOG(TRACE) << "OrthancSeriesVolumeProgressiveLoader::LoadSeries seriesId=" << seriesId; |
| 814 | 469 if (active_) |
| 470 { | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
913
diff
changeset
|
471 // LOG(TRACE) << "OrthancSeriesVolumeProgressiveLoader::LoadSeries NOT ACTIVE! --> ERROR"; |
| 814 | 472 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
| 473 } | |
| 474 else | |
| 475 { | |
| 476 active_ = true; | |
| 477 | |
| 478 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand); | |
| 479 command->SetUri("/series/" + seriesId + "/instances-tags"); | |
| 480 | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
913
diff
changeset
|
481 // LOG(TRACE) << "OrthancSeriesVolumeProgressiveLoader::LoadSeries about to call oracle_.Schedule"; |
| 814 | 482 oracle_.Schedule(*this, command.release()); |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
913
diff
changeset
|
483 // LOG(TRACE) << "OrthancSeriesVolumeProgressiveLoader::LoadSeries called oracle_.Schedule"; |
| 814 | 484 } |
| 485 } | |
| 486 | |
| 487 | |
| 488 IVolumeSlicer::IExtractedSlice* | |
| 489 OrthancSeriesVolumeProgressiveLoader::ExtractSlice(const CoordinateSystem3D& cuttingPlane) | |
| 490 { | |
| 491 if (volume_->HasGeometry()) | |
| 492 { | |
| 493 return new ExtractedSlice(*this, cuttingPlane); | |
| 494 } | |
| 495 else | |
| 496 { | |
| 497 return new IVolumeSlicer::InvalidSlice; | |
| 498 } | |
| 499 } | |
| 500 } |