Mercurial > hg > orthanc-stone
annotate OrthancStone/Sources/Volumes/DicomVolumeImageMPRSlicer.cpp @ 1775:fca942f4b4a7
fix conversion from voxel centers to texture borders
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 12 May 2021 19:57:50 +0200 |
| parents | f302bbddf94d |
| children | 9ab251c03eda |
| 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 | |
|
1739
9ac2a65d4172
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium |
| 814 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
|
1598
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public License |
| 814 | 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 | |
|
1598
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
15 * Lesser General Public License for more details. |
|
1596
4fb8fdf03314
removed annoying whitespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1512
diff
changeset
|
16 * |
|
1598
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
17 * You should have received a copy of the GNU Lesser General Public |
|
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
18 * License along with this program. If not, see |
|
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
19 * <http://www.gnu.org/licenses/>. |
| 814 | 20 **/ |
| 21 | |
| 22 | |
| 23 #include "DicomVolumeImageMPRSlicer.h" | |
| 24 | |
|
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
|
25 #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
|
26 |
|
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
27 #include "../Toolbox/ImageToolbox.h" |
|
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
28 |
| 1624 | 29 #include <Logging.h> |
|
1455
30deba7bc8e2
simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1300
diff
changeset
|
30 #include <OrthancException.h> |
|
30deba7bc8e2
simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1300
diff
changeset
|
31 //#include <Images/PngWriter.h> |
|
30deba7bc8e2
simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1300
diff
changeset
|
32 #include <Images/JpegWriter.h> |
| 814 | 33 |
| 34 namespace OrthancStone | |
| 35 { | |
| 36 void DicomVolumeImageMPRSlicer::Slice::CheckValid() const | |
| 37 { | |
| 38 if (!valid_) | |
| 39 { | |
|
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
949
diff
changeset
|
40 LOG(ERROR) << "DicomVolumeImageMPRSlicer::Slice::CheckValid(): (!valid_)"; |
| 814 | 41 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
| 42 } | |
| 43 } | |
| 44 | |
| 45 | |
| 46 DicomVolumeImageMPRSlicer::Slice::Slice(const DicomVolumeImage& volume, | |
| 47 const CoordinateSystem3D& cuttingPlane) : | |
|
817
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
48 volume_(volume), |
|
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
49 revision_(volume_.GetRevision()) |
| 814 | 50 { |
| 51 valid_ = (volume_.HasDicomParameters() && | |
|
1161
19b1c8caade4
fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1105
diff
changeset
|
52 volume_.GetGeometry().DetectSlice(projection_, sliceIndex_, cuttingPlane)); |
| 814 | 53 } |
| 54 | |
| 55 | |
| 56 VolumeProjection DicomVolumeImageMPRSlicer::Slice::GetProjection() const | |
| 57 { | |
| 58 CheckValid(); | |
| 59 return projection_; | |
| 60 } | |
| 61 | |
| 62 | |
| 63 unsigned int DicomVolumeImageMPRSlicer::Slice::GetSliceIndex() const | |
| 64 { | |
| 65 CheckValid(); | |
| 66 return sliceIndex_; | |
| 67 } | |
|
817
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
68 |
| 814 | 69 |
| 70 ISceneLayer* DicomVolumeImageMPRSlicer::Slice::CreateSceneLayer(const ILayerStyleConfigurator* configurator, | |
| 71 const CoordinateSystem3D& cuttingPlane) | |
| 72 { | |
| 73 CheckValid(); | |
| 74 | |
| 75 if (configurator == NULL) | |
| 76 { | |
| 77 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer, | |
| 78 "A style configurator is mandatory for textures"); | |
| 79 } | |
| 80 | |
|
1298
8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1292
diff
changeset
|
81 std::unique_ptr<TextureBaseSceneLayer> texture; |
|
1105
640feb146fa8
Code formatting (dummyc) + log level (dummyc)
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
82 |
| 814 | 83 { |
| 84 const DicomInstanceParameters& parameters = volume_.GetDicomParameters(); | |
| 85 ImageBuffer3D::SliceReader reader(volume_.GetPixelData(), projection_, sliceIndex_); | |
|
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
86 |
| 814 | 87 texture.reset(dynamic_cast<TextureBaseSceneLayer*> |
| 88 (configurator->CreateTextureFromDicom(reader.GetAccessor(), parameters))); | |
|
1771
f302bbddf94d
sync, trying to fix DicomVolumeImageReslicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1769
diff
changeset
|
89 |
|
f302bbddf94d
sync, trying to fix DicomVolumeImageReslicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1769
diff
changeset
|
90 if (texture.get() == NULL) |
|
f302bbddf94d
sync, trying to fix DicomVolumeImageReslicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1769
diff
changeset
|
91 { |
|
f302bbddf94d
sync, trying to fix DicomVolumeImageReslicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1769
diff
changeset
|
92 return NULL; |
|
f302bbddf94d
sync, trying to fix DicomVolumeImageReslicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1769
diff
changeset
|
93 } |
| 814 | 94 } |
|
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
|
95 |
| 814 | 96 const CoordinateSystem3D& system = volume_.GetGeometry().GetProjectionGeometry(projection_); |
|
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
|
97 |
|
1768
226718777702
fix DicomVolumeImageMPRSlicer::Slice::CreateSceneLayer() for opposite normals
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
98 Vector pixelSpacing = volume_.GetGeometry().GetVoxelDimensions(projection_); |
|
226718777702
fix DicomVolumeImageMPRSlicer::Slice::CreateSceneLayer() for opposite normals
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
99 |
| 1769 | 100 texture->SetCuttingPlaneTransform(cuttingPlane, system.GetOrigin(), |
| 101 system.GetAxisX() * pixelSpacing[0], | |
| 102 system.GetAxisY() * pixelSpacing[1]); | |
| 814 | 103 |
| 104 return texture.release(); | |
| 105 } | |
| 106 | |
| 107 | |
|
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
|
108 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
|
109 { |
|
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
|
110 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
|
111 } |
|
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
|
112 |
|
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 IVolumeSlicer::IExtractedSlice* |
| 814 | 114 DicomVolumeImageMPRSlicer::ExtractSlice(const CoordinateSystem3D& cuttingPlane) |
| 115 { | |
| 116 if (volume_->HasGeometry()) | |
| 117 { | |
| 118 return new Slice(*volume_, cuttingPlane); | |
| 119 } | |
| 120 else | |
| 121 { | |
| 122 return new IVolumeSlicer::InvalidSlice; | |
| 123 } | |
| 124 } | |
| 125 } |