Mercurial > hg > orthanc-stone
annotate Framework/dev.h @ 119:ba83e38cf3ff wasm
rendering of rt-dose
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 02 Oct 2017 22:01:41 +0200 |
| parents | 42c05a3baee3 |
| children | 063f7f3d9f14 |
| rev | line source |
|---|---|
| 102 | 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 Osimis, 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 #pragma once | |
| 23 | |
| 24 #include "Layers/FrameRenderer.h" | |
| 25 #include "Layers/LayerSourceBase.h" | |
| 26 #include "Layers/SliceOutlineRenderer.h" | |
|
112
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
27 #include "Layers/LineLayerRenderer.h" |
|
104
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
28 #include "Widgets/LayerWidget.h" |
| 102 | 29 #include "Toolbox/DownloadStack.h" |
| 30 #include "Toolbox/OrthancSlicesLoader.h" | |
| 31 #include "Volumes/ImageBuffer3D.h" | |
| 32 #include "Volumes/SlicedVolumeBase.h" | |
| 33 | |
|
113
2eca030792aa
using the Orthanc Framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
34 #include <Core/Logging.h> |
|
2eca030792aa
using the Orthanc Framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
35 #include <Core/Images/ImageProcessing.h> |
| 102 | 36 |
| 37 #include <boost/math/special_functions/round.hpp> | |
| 38 | |
| 39 | |
| 40 namespace OrthancStone | |
| 41 { | |
| 42 class OrthancVolumeImage : | |
| 43 public SlicedVolumeBase, | |
| 44 private OrthancSlicesLoader::ICallback | |
| 45 { | |
| 46 private: | |
| 47 OrthancSlicesLoader loader_; | |
| 48 std::auto_ptr<ImageBuffer3D> image_; | |
| 49 std::auto_ptr<DownloadStack> downloadStack_; | |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
50 bool computeRange_; |
| 102 | 51 |
| 52 void ScheduleSliceDownload() | |
| 53 { | |
| 54 assert(downloadStack_.get() != NULL); | |
| 55 | |
| 56 unsigned int slice; | |
| 57 if (downloadStack_->Pop(slice)) | |
| 58 { | |
| 59 loader_.ScheduleLoadSliceImage(slice, SliceImageQuality_Jpeg90); | |
| 60 } | |
| 61 } | |
| 62 | |
| 63 | |
| 64 static bool IsCompatible(const Slice& a, | |
| 65 const Slice& b) | |
| 66 { | |
| 67 if (!GeometryToolbox::IsParallel(a.GetGeometry().GetNormal(), | |
| 68 b.GetGeometry().GetNormal())) | |
| 69 { | |
| 70 LOG(ERROR) << "Some slice in the volume image is not parallel to the others"; | |
| 71 return false; | |
| 72 } | |
| 73 | |
| 74 if (a.GetConverter().GetExpectedPixelFormat() != b.GetConverter().GetExpectedPixelFormat()) | |
| 75 { | |
| 76 LOG(ERROR) << "The pixel format changes across the slices of the volume image"; | |
| 77 return false; | |
| 78 } | |
| 79 | |
| 80 if (a.GetWidth() != b.GetWidth() || | |
| 81 a.GetHeight() != b.GetHeight()) | |
| 82 { | |
| 83 LOG(ERROR) << "The width/height of the slices change across the volume image"; | |
| 84 return false; | |
| 85 } | |
| 86 | |
| 87 if (!GeometryToolbox::IsNear(a.GetPixelSpacingX(), b.GetPixelSpacingX()) || | |
| 88 !GeometryToolbox::IsNear(a.GetPixelSpacingY(), b.GetPixelSpacingY())) | |
| 89 { | |
| 90 LOG(ERROR) << "The pixel spacing of the slices change across the volume image"; | |
| 91 return false; | |
| 92 } | |
| 93 | |
| 94 return true; | |
| 95 } | |
| 96 | |
| 97 | |
| 98 static double GetDistance(const Slice& a, | |
| 99 const Slice& b) | |
| 100 { | |
| 101 return fabs(a.GetGeometry().ProjectAlongNormal(a.GetGeometry().GetOrigin()) - | |
| 102 a.GetGeometry().ProjectAlongNormal(b.GetGeometry().GetOrigin())); | |
| 103 } | |
| 104 | |
| 105 | |
| 106 virtual void NotifyGeometryReady(const OrthancSlicesLoader& loader) | |
| 107 { | |
| 108 if (loader.GetSliceCount() == 0) | |
| 109 { | |
| 110 LOG(ERROR) << "Empty volume image"; | |
| 111 SlicedVolumeBase::NotifyGeometryError(); | |
| 112 return; | |
| 113 } | |
| 114 | |
| 115 for (size_t i = 1; i < loader.GetSliceCount(); i++) | |
| 116 { | |
| 117 if (!IsCompatible(loader.GetSlice(0), loader.GetSlice(i))) | |
| 118 { | |
| 119 SlicedVolumeBase::NotifyGeometryError(); | |
| 120 return; | |
| 121 } | |
| 122 } | |
| 123 | |
| 124 double spacingZ; | |
| 125 | |
| 126 if (loader.GetSliceCount() > 1) | |
| 127 { | |
| 128 spacingZ = GetDistance(loader.GetSlice(0), loader.GetSlice(1)); | |
| 129 } | |
| 130 else | |
| 131 { | |
| 132 // This is a volume with one single slice: Choose a dummy | |
| 133 // z-dimension for voxels | |
| 134 spacingZ = 1; | |
| 135 } | |
| 136 | |
| 137 for (size_t i = 1; i < loader.GetSliceCount(); i++) | |
| 138 { | |
| 139 if (!GeometryToolbox::IsNear(spacingZ, GetDistance(loader.GetSlice(i - 1), loader.GetSlice(i)), | |
| 140 0.001 /* this is expressed in mm */)) | |
| 141 { | |
| 142 LOG(ERROR) << "The distance between successive slices is not constant in a volume image"; | |
| 143 SlicedVolumeBase::NotifyGeometryError(); | |
| 144 return; | |
| 145 } | |
| 146 } | |
| 147 | |
| 148 unsigned int width = loader.GetSlice(0).GetWidth(); | |
| 149 unsigned int height = loader.GetSlice(0).GetHeight(); | |
| 150 Orthanc::PixelFormat format = loader.GetSlice(0).GetConverter().GetExpectedPixelFormat(); | |
| 151 LOG(INFO) << "Creating a volume image of size " << width << "x" << height | |
| 152 << "x" << loader.GetSliceCount() << " in " << Orthanc::EnumerationToString(format); | |
| 153 | |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
154 image_.reset(new ImageBuffer3D(format, width, height, loader.GetSliceCount(), computeRange_)); |
| 102 | 155 image_->SetAxialGeometry(loader.GetSlice(0).GetGeometry()); |
| 156 image_->SetVoxelDimensions(loader.GetSlice(0).GetPixelSpacingX(), | |
| 157 loader.GetSlice(0).GetPixelSpacingY(), spacingZ); | |
| 158 image_->Clear(); | |
| 159 | |
| 160 downloadStack_.reset(new DownloadStack(loader.GetSliceCount())); | |
| 161 | |
| 162 for (unsigned int i = 0; i < 4; i++) // Limit to 4 simultaneous downloads | |
| 163 { | |
| 164 ScheduleSliceDownload(); | |
| 165 } | |
| 166 | |
| 167 // TODO Check the DicomFrameConverter are constant | |
| 168 | |
| 169 SlicedVolumeBase::NotifyGeometryReady(); | |
| 170 } | |
| 171 | |
| 172 virtual void NotifyGeometryError(const OrthancSlicesLoader& loader) | |
| 173 { | |
| 174 LOG(ERROR) << "Unable to download a volume image"; | |
| 175 SlicedVolumeBase::NotifyGeometryError(); | |
| 176 } | |
| 177 | |
| 178 virtual void NotifySliceImageReady(const OrthancSlicesLoader& loader, | |
| 179 unsigned int sliceIndex, | |
| 180 const Slice& slice, | |
| 181 std::auto_ptr<Orthanc::ImageAccessor>& image, | |
| 182 SliceImageQuality quality) | |
| 183 { | |
| 184 { | |
| 185 ImageBuffer3D::SliceWriter writer(*image_, VolumeProjection_Axial, sliceIndex); | |
| 186 Orthanc::ImageProcessing::Copy(writer.GetAccessor(), *image); | |
| 187 } | |
| 188 | |
| 189 SlicedVolumeBase::NotifySliceChange(sliceIndex, slice); | |
| 190 | |
| 191 ScheduleSliceDownload(); | |
| 192 } | |
| 193 | |
| 194 virtual void NotifySliceImageError(const OrthancSlicesLoader& loader, | |
| 195 unsigned int sliceIndex, | |
| 196 const Slice& slice, | |
| 197 SliceImageQuality quality) | |
| 198 { | |
| 199 LOG(ERROR) << "Cannot download slice " << sliceIndex << " in a volume image"; | |
| 200 ScheduleSliceDownload(); | |
| 201 } | |
| 202 | |
| 203 public: | |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
204 OrthancVolumeImage(IWebService& orthanc, |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
205 bool computeRange) : |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
206 loader_(*this, orthanc), |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
207 computeRange_(computeRange) |
| 102 | 208 { |
| 209 } | |
| 210 | |
| 211 void ScheduleLoadSeries(const std::string& seriesId) | |
| 212 { | |
| 213 loader_.ScheduleLoadSeries(seriesId); | |
| 214 } | |
| 215 | |
|
117
42c05a3baee3
loading multi-frame instances as 3D volumes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
216 void ScheduleLoadInstance(const std::string& instanceId) |
| 102 | 217 { |
|
117
42c05a3baee3
loading multi-frame instances as 3D volumes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
218 loader_.ScheduleLoadInstance(instanceId); |
|
42c05a3baee3
loading multi-frame instances as 3D volumes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
219 } |
|
42c05a3baee3
loading multi-frame instances as 3D volumes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
220 |
|
42c05a3baee3
loading multi-frame instances as 3D volumes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
221 void ScheduleLoadFrame(const std::string& instanceId, |
|
42c05a3baee3
loading multi-frame instances as 3D volumes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
222 unsigned int frame) |
|
42c05a3baee3
loading multi-frame instances as 3D volumes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
223 { |
|
42c05a3baee3
loading multi-frame instances as 3D volumes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
224 loader_.ScheduleLoadFrame(instanceId, frame); |
| 102 | 225 } |
| 226 | |
| 227 virtual size_t GetSliceCount() const | |
| 228 { | |
| 229 return loader_.GetSliceCount(); | |
| 230 } | |
| 231 | |
| 232 virtual const Slice& GetSlice(size_t index) const | |
| 233 { | |
| 234 return loader_.GetSlice(index); | |
| 235 } | |
| 236 | |
| 237 ImageBuffer3D& GetImage() const | |
| 238 { | |
| 239 if (image_.get() == NULL) | |
| 240 { | |
| 241 // The geometry is not ready yet | |
| 242 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 243 } | |
| 244 else | |
| 245 { | |
| 246 return *image_; | |
| 247 } | |
| 248 } | |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
249 |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
250 bool FitWindowingToRange(RenderStyle& style, |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
251 const DicomFrameConverter& converter) const |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
252 { |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
253 if (image_.get() == NULL) |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
254 { |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
255 return false; |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
256 } |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
257 else |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
258 { |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
259 return image_->FitWindowingToRange(style, converter); |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
260 } |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
261 } |
| 102 | 262 }; |
| 263 | |
| 264 | |
| 265 class VolumeImageGeometry | |
| 266 { | |
| 267 private: | |
| 268 unsigned int width_; | |
| 269 unsigned int height_; | |
| 270 size_t depth_; | |
| 271 double pixelSpacingX_; | |
| 272 double pixelSpacingY_; | |
| 273 double sliceThickness_; | |
|
110
53025eecbc95
renamed SliceGeometry as CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
274 CoordinateSystem3D reference_; |
| 102 | 275 DicomFrameConverter converter_; |
| 276 | |
| 277 double ComputeAxialThickness(const OrthancVolumeImage& volume) const | |
| 278 { | |
| 279 double thickness; | |
| 280 | |
| 281 size_t n = volume.GetSliceCount(); | |
| 282 if (n > 1) | |
| 283 { | |
| 284 const Slice& a = volume.GetSlice(0); | |
| 285 const Slice& b = volume.GetSlice(n - 1); | |
| 286 thickness = ((reference_.ProjectAlongNormal(b.GetGeometry().GetOrigin()) - | |
| 287 reference_.ProjectAlongNormal(a.GetGeometry().GetOrigin())) / | |
| 288 (static_cast<double>(n) - 1.0)); | |
| 289 } | |
| 290 else | |
| 291 { | |
| 292 thickness = volume.GetSlice(0).GetThickness(); | |
| 293 } | |
| 294 | |
| 295 if (thickness <= 0) | |
| 296 { | |
| 297 // The slices should have been sorted with increasing Z | |
| 298 // (along the normal) by the OrthancSlicesLoader | |
| 299 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
| 300 } | |
| 301 else | |
| 302 { | |
| 303 return thickness; | |
| 304 } | |
| 305 } | |
| 306 | |
| 307 void SetupAxial(const OrthancVolumeImage& volume) | |
| 308 { | |
| 309 const Slice& axial = volume.GetSlice(0); | |
| 310 | |
| 311 width_ = axial.GetWidth(); | |
| 312 height_ = axial.GetHeight(); | |
| 313 depth_ = volume.GetSliceCount(); | |
| 314 | |
| 315 pixelSpacingX_ = axial.GetPixelSpacingX(); | |
| 316 pixelSpacingY_ = axial.GetPixelSpacingY(); | |
| 317 sliceThickness_ = ComputeAxialThickness(volume); | |
| 318 | |
| 319 reference_ = axial.GetGeometry(); | |
| 320 } | |
| 321 | |
| 322 void SetupCoronal(const OrthancVolumeImage& volume) | |
| 323 { | |
| 324 const Slice& axial = volume.GetSlice(0); | |
| 325 double axialThickness = ComputeAxialThickness(volume); | |
| 326 | |
| 327 width_ = axial.GetWidth(); | |
| 328 height_ = volume.GetSliceCount(); | |
| 329 depth_ = axial.GetHeight(); | |
| 330 | |
| 331 pixelSpacingX_ = axial.GetPixelSpacingX(); | |
| 332 pixelSpacingY_ = axialThickness; | |
| 333 sliceThickness_ = axial.GetPixelSpacingY(); | |
| 334 | |
| 335 Vector origin = axial.GetGeometry().GetOrigin(); | |
| 336 origin += (static_cast<double>(volume.GetSliceCount() - 1) * | |
| 337 axialThickness * axial.GetGeometry().GetNormal()); | |
| 338 | |
|
110
53025eecbc95
renamed SliceGeometry as CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
339 reference_ = CoordinateSystem3D(origin, |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
340 axial.GetGeometry().GetAxisX(), |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
341 -axial.GetGeometry().GetNormal()); |
| 102 | 342 } |
| 343 | |
| 344 void SetupSagittal(const OrthancVolumeImage& volume) | |
| 345 { | |
| 346 const Slice& axial = volume.GetSlice(0); | |
| 347 double axialThickness = ComputeAxialThickness(volume); | |
| 348 | |
| 349 width_ = axial.GetHeight(); | |
| 350 height_ = volume.GetSliceCount(); | |
| 351 depth_ = axial.GetWidth(); | |
| 352 | |
| 353 pixelSpacingX_ = axial.GetPixelSpacingY(); | |
| 354 pixelSpacingY_ = axialThickness; | |
| 355 sliceThickness_ = axial.GetPixelSpacingX(); | |
| 356 | |
| 357 Vector origin = axial.GetGeometry().GetOrigin(); | |
| 358 origin += (static_cast<double>(volume.GetSliceCount() - 1) * | |
| 359 axialThickness * axial.GetGeometry().GetNormal()); | |
| 360 | |
|
110
53025eecbc95
renamed SliceGeometry as CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
361 reference_ = CoordinateSystem3D(origin, |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
362 axial.GetGeometry().GetAxisY(), |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
363 axial.GetGeometry().GetNormal()); |
| 102 | 364 } |
| 365 | |
| 366 public: | |
| 367 VolumeImageGeometry(const OrthancVolumeImage& volume, | |
| 368 VolumeProjection projection) | |
| 369 { | |
| 370 if (volume.GetSliceCount() == 0) | |
| 371 { | |
| 372 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 373 } | |
| 374 | |
| 375 converter_ = volume.GetSlice(0).GetConverter(); | |
| 376 | |
| 377 switch (projection) | |
| 378 { | |
| 379 case VolumeProjection_Axial: | |
| 380 SetupAxial(volume); | |
| 381 break; | |
| 382 | |
| 383 case VolumeProjection_Coronal: | |
| 384 SetupCoronal(volume); | |
| 385 break; | |
| 386 | |
| 387 case VolumeProjection_Sagittal: | |
| 388 SetupSagittal(volume); | |
| 389 break; | |
| 390 | |
| 391 default: | |
| 392 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 393 } | |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
394 |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
395 //sliceThickness_ = 3.0f; // TODO XXXXX |
| 102 | 396 } |
| 397 | |
| 398 size_t GetSliceCount() const | |
| 399 { | |
| 400 return depth_; | |
| 401 } | |
| 402 | |
| 403 const Vector& GetNormal() const | |
| 404 { | |
| 405 return reference_.GetNormal(); | |
| 406 } | |
| 407 | |
| 408 bool LookupSlice(size_t& index, | |
|
110
53025eecbc95
renamed SliceGeometry as CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
409 const CoordinateSystem3D& slice) const |
| 102 | 410 { |
| 411 bool opposite; | |
| 412 if (!GeometryToolbox::IsParallelOrOpposite(opposite, | |
| 413 reference_.GetNormal(), | |
| 414 slice.GetNormal())) | |
| 415 { | |
| 416 return false; | |
| 417 } | |
| 418 | |
| 419 double z = (reference_.ProjectAlongNormal(slice.GetOrigin()) - | |
| 420 reference_.ProjectAlongNormal(reference_.GetOrigin())) / sliceThickness_; | |
| 421 | |
| 422 int s = static_cast<int>(boost::math::iround(z)); | |
| 423 | |
| 424 if (s < 0 || | |
| 425 s >= static_cast<int>(depth_)) | |
| 426 { | |
| 427 return false; | |
| 428 } | |
| 429 else | |
| 430 { | |
| 431 index = static_cast<size_t>(s); | |
| 432 return true; | |
| 433 } | |
| 434 } | |
| 435 | |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
436 Slice* GetSlice(size_t slice) const |
| 102 | 437 { |
| 438 if (slice < 0 || | |
| 439 slice >= depth_) | |
| 440 { | |
| 441 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 442 } | |
| 443 else | |
| 444 { | |
|
110
53025eecbc95
renamed SliceGeometry as CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
445 CoordinateSystem3D origin(reference_.GetOrigin() + |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
446 static_cast<double>(slice) * sliceThickness_ * reference_.GetNormal(), |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
447 reference_.GetAxisX(), |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
448 reference_.GetAxisY()); |
| 102 | 449 |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
450 return new Slice(origin, pixelSpacingX_, pixelSpacingY_, sliceThickness_, |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
451 width_, height_, converter_); |
| 102 | 452 } |
| 453 } | |
| 454 }; | |
| 455 | |
| 456 | |
| 457 | |
| 458 class VolumeImageSource : | |
| 459 public LayerSourceBase, | |
| 460 private ISlicedVolume::IObserver | |
| 461 { | |
| 462 private: | |
| 463 OrthancVolumeImage& volume_; | |
| 464 std::auto_ptr<VolumeImageGeometry> axialGeometry_; | |
| 465 std::auto_ptr<VolumeImageGeometry> coronalGeometry_; | |
| 466 std::auto_ptr<VolumeImageGeometry> sagittalGeometry_; | |
| 467 | |
| 468 | |
| 469 bool IsGeometryReady() const | |
| 470 { | |
| 471 return axialGeometry_.get() != NULL; | |
| 472 } | |
| 473 | |
| 474 | |
| 475 virtual void NotifyGeometryReady(const ISlicedVolume& volume) | |
| 476 { | |
| 477 // These 3 values are only used to speed up the ILayerSource | |
| 478 axialGeometry_.reset(new VolumeImageGeometry(volume_, VolumeProjection_Axial)); | |
| 479 coronalGeometry_.reset(new VolumeImageGeometry(volume_, VolumeProjection_Coronal)); | |
| 480 sagittalGeometry_.reset(new VolumeImageGeometry(volume_, VolumeProjection_Sagittal)); | |
| 481 | |
| 482 LayerSourceBase::NotifyGeometryReady(); | |
| 483 } | |
| 484 | |
| 485 virtual void NotifyGeometryError(const ISlicedVolume& volume) | |
| 486 { | |
| 487 LayerSourceBase::NotifyGeometryError(); | |
| 488 } | |
| 489 | |
| 490 virtual void NotifyContentChange(const ISlicedVolume& volume) | |
| 491 { | |
| 492 LayerSourceBase::NotifyContentChange(); | |
| 493 } | |
| 494 | |
| 495 virtual void NotifySliceChange(const ISlicedVolume& volume, | |
| 496 const size_t& sliceIndex, | |
| 497 const Slice& slice) | |
| 498 { | |
| 499 //LayerSourceBase::NotifySliceChange(slice); | |
| 500 | |
| 501 // TODO Improve this? | |
| 502 LayerSourceBase::NotifyContentChange(); | |
| 503 } | |
| 504 | |
| 505 | |
| 506 const VolumeImageGeometry& GetProjectionGeometry(VolumeProjection projection) | |
| 507 { | |
| 508 if (!IsGeometryReady()) | |
| 509 { | |
| 510 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 511 } | |
| 512 | |
| 513 switch (projection) | |
| 514 { | |
| 515 case VolumeProjection_Axial: | |
| 516 return *axialGeometry_; | |
| 517 | |
| 518 case VolumeProjection_Sagittal: | |
| 519 return *sagittalGeometry_; | |
| 520 | |
| 521 case VolumeProjection_Coronal: | |
| 522 return *coronalGeometry_; | |
| 523 | |
| 524 default: | |
| 525 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 526 } | |
| 527 } | |
| 528 | |
| 529 | |
| 530 bool DetectProjection(VolumeProjection& projection, | |
|
110
53025eecbc95
renamed SliceGeometry as CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
531 const CoordinateSystem3D& viewportSlice) |
| 102 | 532 { |
| 533 bool isOpposite; // Ignored | |
| 534 | |
| 535 if (GeometryToolbox::IsParallelOrOpposite(isOpposite, | |
| 536 viewportSlice.GetNormal(), | |
| 537 axialGeometry_->GetNormal())) | |
| 538 { | |
| 539 projection = VolumeProjection_Axial; | |
| 540 return true; | |
| 541 } | |
| 542 else if (GeometryToolbox::IsParallelOrOpposite(isOpposite, | |
| 543 viewportSlice.GetNormal(), | |
| 544 sagittalGeometry_->GetNormal())) | |
| 545 { | |
| 546 projection = VolumeProjection_Sagittal; | |
| 547 return true; | |
| 548 } | |
| 549 else if (GeometryToolbox::IsParallelOrOpposite(isOpposite, | |
| 550 viewportSlice.GetNormal(), | |
| 551 coronalGeometry_->GetNormal())) | |
| 552 { | |
| 553 projection = VolumeProjection_Coronal; | |
| 554 return true; | |
| 555 } | |
| 556 else | |
| 557 { | |
| 558 return false; | |
| 559 } | |
| 560 } | |
| 561 | |
| 562 | |
| 563 public: | |
| 564 VolumeImageSource(OrthancVolumeImage& volume) : | |
| 565 volume_(volume) | |
| 566 { | |
| 567 volume_.Register(*this); | |
| 568 } | |
| 569 | |
| 570 virtual bool GetExtent(std::vector<Vector>& points, | |
|
110
53025eecbc95
renamed SliceGeometry as CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
571 const CoordinateSystem3D& viewportSlice) |
| 102 | 572 { |
| 573 VolumeProjection projection; | |
| 574 | |
| 575 if (!IsGeometryReady() || | |
| 576 !DetectProjection(projection, viewportSlice)) | |
| 577 { | |
| 578 return false; | |
| 579 } | |
| 580 else | |
| 581 { | |
| 582 // As the slices of the volumic image are arranged in a box, | |
| 583 // we only consider one single reference slice (the one with index 0). | |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
584 std::auto_ptr<Slice> slice(GetProjectionGeometry(projection).GetSlice(0)); |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
585 slice->GetExtent(points); |
| 102 | 586 |
| 587 return true; | |
| 588 } | |
| 589 } | |
| 590 | |
| 591 | |
|
110
53025eecbc95
renamed SliceGeometry as CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
592 virtual void ScheduleLayerCreation(const CoordinateSystem3D& viewportSlice) |
| 102 | 593 { |
| 594 VolumeProjection projection; | |
| 595 | |
| 596 if (IsGeometryReady() && | |
| 597 DetectProjection(projection, viewportSlice)) | |
| 598 { | |
| 599 const VolumeImageGeometry& geometry = GetProjectionGeometry(projection); | |
| 600 | |
| 601 size_t closest; | |
| 602 | |
| 603 if (geometry.LookupSlice(closest, viewportSlice)) | |
| 604 { | |
| 605 bool isFullQuality = true; // TODO | |
| 606 | |
| 607 std::auto_ptr<Orthanc::Image> frame; | |
| 608 | |
| 609 { | |
| 610 ImageBuffer3D::SliceReader reader(volume_.GetImage(), projection, closest); | |
| 611 | |
| 612 // TODO Transfer ownership if non-axial, to avoid memcpy | |
| 613 frame.reset(Orthanc::Image::Clone(reader.GetAccessor())); | |
| 614 } | |
| 615 | |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
616 std::auto_ptr<Slice> slice(geometry.GetSlice(closest)); |
| 102 | 617 LayerSourceBase::NotifyLayerReady( |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
618 FrameRenderer::CreateRenderer(frame.release(), *slice, isFullQuality), |
| 102 | 619 //new SliceOutlineRenderer(slice), |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
620 *slice, false); |
| 102 | 621 return; |
| 622 } | |
| 623 } | |
| 624 | |
| 625 // Error | |
| 626 Slice slice; | |
| 627 LayerSourceBase::NotifyLayerReady(NULL, slice, true); | |
| 628 } | |
| 629 }; | |
|
104
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
630 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
631 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
632 class VolumeImageInteractor : |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
633 public IWorldSceneInteractor, |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
634 protected ISlicedVolume::IObserver |
|
104
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
635 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
636 private: |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
637 LayerWidget& widget_; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
638 VolumeProjection projection_; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
639 std::auto_ptr<VolumeImageGeometry> slices_; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
640 size_t slice_; |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
641 |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
642 protected: |
|
104
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
643 virtual void NotifyGeometryReady(const ISlicedVolume& volume) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
644 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
645 if (slices_.get() == NULL) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
646 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
647 const OrthancVolumeImage& image = dynamic_cast<const OrthancVolumeImage&>(volume); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
648 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
649 slices_.reset(new VolumeImageGeometry(image, projection_)); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
650 SetSlice(slices_->GetSliceCount() / 2); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
651 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
652 widget_.SetDefaultView(); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
653 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
654 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
655 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
656 virtual void NotifyGeometryError(const ISlicedVolume& volume) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
657 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
658 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
659 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
660 virtual void NotifyContentChange(const ISlicedVolume& volume) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
661 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
662 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
663 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
664 virtual void NotifySliceChange(const ISlicedVolume& volume, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
665 const size_t& sliceIndex, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
666 const Slice& slice) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
667 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
668 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
669 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
670 virtual IWorldSceneMouseTracker* CreateMouseTracker(WorldSceneWidget& widget, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
671 const ViewportGeometry& view, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
672 MouseButton button, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
673 double x, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
674 double y, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
675 IStatusBar* statusBar) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
676 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
677 return NULL; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
678 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
679 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
680 virtual void MouseOver(CairoContext& context, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
681 WorldSceneWidget& widget, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
682 const ViewportGeometry& view, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
683 double x, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
684 double y, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
685 IStatusBar* statusBar) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
686 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
687 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
688 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
689 virtual void MouseWheel(WorldSceneWidget& widget, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
690 MouseWheelDirection direction, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
691 KeyboardModifiers modifiers, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
692 IStatusBar* statusBar) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
693 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
694 int scale = (modifiers & KeyboardModifiers_Control ? 10 : 1); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
695 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
696 switch (direction) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
697 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
698 case MouseWheelDirection_Up: |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
699 OffsetSlice(-scale); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
700 break; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
701 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
702 case MouseWheelDirection_Down: |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
703 OffsetSlice(scale); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
704 break; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
705 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
706 default: |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
707 break; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
708 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
709 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
710 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
711 virtual void KeyPressed(WorldSceneWidget& widget, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
712 char key, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
713 KeyboardModifiers modifiers, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
714 IStatusBar* statusBar) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
715 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
716 switch (key) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
717 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
718 case 's': |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
719 widget.SetDefaultView(); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
720 break; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
721 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
722 default: |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
723 break; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
724 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
725 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
726 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
727 public: |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
728 VolumeImageInteractor(OrthancVolumeImage& volume, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
729 LayerWidget& widget, |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
730 VolumeProjection projection) : |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
731 widget_(widget), |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
732 projection_(projection) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
733 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
734 volume.Register(*this); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
735 widget.SetInteractor(*this); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
736 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
737 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
738 bool IsGeometryReady() const |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
739 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
740 return slices_.get() != NULL; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
741 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
742 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
743 size_t GetSliceCount() const |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
744 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
745 if (slices_.get() == NULL) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
746 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
747 return 0; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
748 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
749 else |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
750 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
751 return slices_->GetSliceCount(); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
752 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
753 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
754 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
755 void OffsetSlice(int offset) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
756 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
757 if (slices_.get() != NULL) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
758 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
759 int slice = static_cast<int>(slice_) + offset; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
760 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
761 if (slice < 0) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
762 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
763 slice = 0; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
764 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
765 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
766 if (slice >= static_cast<int>(slices_->GetSliceCount())) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
767 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
768 slice = slices_->GetSliceCount() - 1; |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
769 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
770 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
771 if (slice != static_cast<int>(slice_)) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
772 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
773 SetSlice(slice); |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
774 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
775 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
776 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
777 |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
778 void SetSlice(size_t slice) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
779 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
780 if (slices_.get() != NULL) |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
781 { |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
782 slice_ = slice; |
|
119
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
783 |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
784 std::auto_ptr<Slice> tmp(slices_->GetSlice(slice_)); |
|
ba83e38cf3ff
rendering of rt-dose
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
785 widget_.SetSlice(tmp->GetGeometry()); |
|
104
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
786 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
787 } |
|
eccd64f8e297
VolumeImageInteractor
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
102
diff
changeset
|
788 }; |
|
112
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
789 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
790 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
791 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
792 class SliceLocationSource : public LayerSourceBase |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
793 { |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
794 private: |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
795 LayerWidget& otherPlane_; |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
796 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
797 public: |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
798 SliceLocationSource(LayerWidget& otherPlane) : |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
799 otherPlane_(otherPlane) |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
800 { |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
801 NotifyGeometryReady(); |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
802 } |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
803 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
804 virtual bool GetExtent(std::vector<Vector>& points, |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
805 const CoordinateSystem3D& viewportSlice) |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
806 { |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
807 return false; |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
808 } |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
809 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
810 virtual void ScheduleLayerCreation(const CoordinateSystem3D& viewportSlice) |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
811 { |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
812 Slice reference(viewportSlice, 0.001); |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
813 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
814 Vector p, d; |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
815 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
816 const CoordinateSystem3D& slice = otherPlane_.GetSlice(); |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
817 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
818 // Compute the line of intersection between the two slices |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
819 if (!GeometryToolbox::IntersectTwoPlanes(p, d, |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
820 slice.GetOrigin(), slice.GetNormal(), |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
821 viewportSlice.GetOrigin(), viewportSlice.GetNormal())) |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
822 { |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
823 // The two slice are parallel, don't try and display the intersection |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
824 NotifyLayerReady(NULL, reference, false); |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
825 } |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
826 else |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
827 { |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
828 double x1, y1, x2, y2; |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
829 viewportSlice.ProjectPoint(x1, y1, p); |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
830 viewportSlice.ProjectPoint(x2, y2, p + 1000.0 * d); |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
831 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
832 const Extent2D extent = otherPlane_.GetSceneExtent(); |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
833 |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
834 if (GeometryToolbox::ClipLineToRectangle(x1, y1, x2, y2, |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
835 x1, y1, x2, y2, |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
836 extent.GetX1(), extent.GetY1(), |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
837 extent.GetX2(), extent.GetY2())) |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
838 { |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
839 NotifyLayerReady(new LineLayerRenderer(x1, y1, x2, y2, slice), reference, false); |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
840 } |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
841 else |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
842 { |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
843 // Parallel slices |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
844 NotifyLayerReady(NULL, reference, false); |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
845 } |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
846 } |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
847 } |
|
948f86e61e83
start of SliceLocationSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
110
diff
changeset
|
848 }; |
| 102 | 849 } |