Mercurial > hg > orthanc-stone
annotate Framework/Volumes/DicomVolumeImageMPRSlicer.cpp @ 1161:19b1c8caade4 broker
fix sagittal geometry
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 19 Nov 2019 17:30:05 +0100 |
| parents | 640feb146fa8 |
| children | 0ca50d275b9a |
| 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 "DicomVolumeImageMPRSlicer.h" | |
| 23 | |
|
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:
935
diff
changeset
|
24 #include "../StoneException.h" |
|
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:
935
diff
changeset
|
25 |
| 814 | 26 #include <Core/OrthancException.h> |
|
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:
935
diff
changeset
|
27 //#include <Core/Images/PngWriter.h> |
|
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:
935
diff
changeset
|
28 #include <Core/Images/JpegWriter.h> |
| 814 | 29 |
| 30 namespace OrthancStone | |
| 31 { | |
| 32 void DicomVolumeImageMPRSlicer::Slice::CheckValid() const | |
| 33 { | |
| 34 if (!valid_) | |
| 35 { | |
|
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
949
diff
changeset
|
36 LOG(ERROR) << "DicomVolumeImageMPRSlicer::Slice::CheckValid(): (!valid_)"; |
| 814 | 37 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
| 38 } | |
| 39 } | |
| 40 | |
| 41 | |
| 42 DicomVolumeImageMPRSlicer::Slice::Slice(const DicomVolumeImage& volume, | |
| 43 const CoordinateSystem3D& cuttingPlane) : | |
|
817
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
44 volume_(volume), |
|
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
45 revision_(volume_.GetRevision()) |
| 814 | 46 { |
| 47 valid_ = (volume_.HasDicomParameters() && | |
|
1161
19b1c8caade4
fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1105
diff
changeset
|
48 volume_.GetGeometry().DetectSlice(projection_, sliceIndex_, cuttingPlane)); |
| 814 | 49 } |
| 50 | |
| 51 | |
| 52 VolumeProjection DicomVolumeImageMPRSlicer::Slice::GetProjection() const | |
| 53 { | |
| 54 CheckValid(); | |
| 55 return projection_; | |
| 56 } | |
| 57 | |
| 58 | |
| 59 unsigned int DicomVolumeImageMPRSlicer::Slice::GetSliceIndex() const | |
| 60 { | |
| 61 CheckValid(); | |
| 62 return sliceIndex_; | |
| 63 } | |
|
817
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
64 |
| 814 | 65 |
| 66 ISceneLayer* DicomVolumeImageMPRSlicer::Slice::CreateSceneLayer(const ILayerStyleConfigurator* configurator, | |
| 67 const CoordinateSystem3D& cuttingPlane) | |
| 68 { | |
| 69 CheckValid(); | |
| 70 | |
| 71 if (configurator == NULL) | |
| 72 { | |
| 73 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer, | |
| 74 "A style configurator is mandatory for textures"); | |
| 75 } | |
| 76 | |
| 77 std::auto_ptr<TextureBaseSceneLayer> texture; | |
|
1105
640feb146fa8
Code formatting (dummyc) + log level (dummyc)
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
78 |
| 814 | 79 { |
| 80 const DicomInstanceParameters& parameters = volume_.GetDicomParameters(); | |
| 81 ImageBuffer3D::SliceReader reader(volume_.GetPixelData(), projection_, sliceIndex_); | |
| 82 texture.reset(dynamic_cast<TextureBaseSceneLayer*> | |
| 83 (configurator->CreateTextureFromDicom(reader.GetAccessor(), parameters))); | |
| 84 } | |
|
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:
935
diff
changeset
|
85 |
| 814 | 86 const CoordinateSystem3D& system = volume_.GetGeometry().GetProjectionGeometry(projection_); |
| 87 | |
| 88 double x0, y0, x1, y1; | |
| 89 cuttingPlane.ProjectPoint(x0, y0, system.GetOrigin()); | |
| 90 cuttingPlane.ProjectPoint(x1, y1, system.GetOrigin() + system.GetAxisX()); | |
|
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:
935
diff
changeset
|
91 |
|
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:
935
diff
changeset
|
92 { |
|
1161
19b1c8caade4
fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1105
diff
changeset
|
93 double xz, yz; |
|
19b1c8caade4
fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1105
diff
changeset
|
94 cuttingPlane.ProjectPoint(xz, yz, LinearAlgebra::CreateVector(0, 0, 0)); |
|
19b1c8caade4
fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1105
diff
changeset
|
95 texture->SetOrigin(x0 - xz, y0 - yz); |
|
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:
935
diff
changeset
|
96 } |
| 814 | 97 |
| 98 double dx = x1 - x0; | |
| 99 double dy = y1 - y0; | |
| 100 if (!LinearAlgebra::IsCloseToZero(dx) || | |
| 101 !LinearAlgebra::IsCloseToZero(dy)) | |
| 102 { | |
| 103 texture->SetAngle(atan2(dy, dx)); | |
| 104 } | |
| 105 | |
| 106 Vector tmp = volume_.GetGeometry().GetVoxelDimensions(projection_); | |
| 107 texture->SetPixelSpacing(tmp[0], tmp[1]); | |
| 108 | |
| 109 return texture.release(); | |
| 110 } | |
| 111 | |
| 112 | |
|
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:
817
diff
changeset
|
113 DicomVolumeImageMPRSlicer::~DicomVolumeImageMPRSlicer() |
|
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:
817
diff
changeset
|
114 { |
|
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:
817
diff
changeset
|
115 LOG(TRACE) << "DicomVolumeImageMPRSlicer::~DicomVolumeImageMPRSlicer()"; |
|
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:
817
diff
changeset
|
116 } |
|
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:
817
diff
changeset
|
117 |
|
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:
817
diff
changeset
|
118 IVolumeSlicer::IExtractedSlice* |
| 814 | 119 DicomVolumeImageMPRSlicer::ExtractSlice(const CoordinateSystem3D& cuttingPlane) |
| 120 { | |
| 121 if (volume_->HasGeometry()) | |
| 122 { | |
| 123 return new Slice(*volume_, cuttingPlane); | |
| 124 } | |
| 125 else | |
| 126 { | |
| 127 return new IVolumeSlicer::InvalidSlice; | |
| 128 } | |
| 129 } | |
| 130 } |