Mercurial > hg > orthanc-stone
annotate Framework/Volumes/DicomVolumeImageMPRSlicer.cpp @ 1455:30deba7bc8e2
simplifying include_directories
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 11 Jun 2020 20:54:01 +0200 |
| parents | 257f2c9a02ac |
| children |
| 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 | |
|
1270
2d8ab34c8c91
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1105
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 814 | 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 |
|
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
26 #include "../Toolbox/ImageToolbox.h" |
|
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
27 |
|
1455
30deba7bc8e2
simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1300
diff
changeset
|
28 #include <OrthancException.h> |
|
30deba7bc8e2
simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1300
diff
changeset
|
29 //#include <Images/PngWriter.h> |
|
30deba7bc8e2
simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1300
diff
changeset
|
30 #include <Images/JpegWriter.h> |
| 814 | 31 |
| 32 namespace OrthancStone | |
| 33 { | |
| 34 void DicomVolumeImageMPRSlicer::Slice::CheckValid() const | |
| 35 { | |
| 36 if (!valid_) | |
| 37 { | |
|
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
949
diff
changeset
|
38 LOG(ERROR) << "DicomVolumeImageMPRSlicer::Slice::CheckValid(): (!valid_)"; |
| 814 | 39 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
| 40 } | |
| 41 } | |
| 42 | |
| 43 | |
| 44 DicomVolumeImageMPRSlicer::Slice::Slice(const DicomVolumeImage& volume, | |
| 45 const CoordinateSystem3D& cuttingPlane) : | |
|
817
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
46 volume_(volume), |
|
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
47 revision_(volume_.GetRevision()) |
| 814 | 48 { |
| 49 valid_ = (volume_.HasDicomParameters() && | |
|
1161
19b1c8caade4
fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1105
diff
changeset
|
50 volume_.GetGeometry().DetectSlice(projection_, sliceIndex_, cuttingPlane)); |
| 814 | 51 } |
| 52 | |
| 53 | |
| 54 VolumeProjection DicomVolumeImageMPRSlicer::Slice::GetProjection() const | |
| 55 { | |
| 56 CheckValid(); | |
| 57 return projection_; | |
| 58 } | |
| 59 | |
| 60 | |
| 61 unsigned int DicomVolumeImageMPRSlicer::Slice::GetSliceIndex() const | |
| 62 { | |
| 63 CheckValid(); | |
| 64 return sliceIndex_; | |
| 65 } | |
|
817
68f888812af4
simplification of DicomVolumeImageMPRSlicer::ExtractedSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
814
diff
changeset
|
66 |
| 814 | 67 |
| 68 ISceneLayer* DicomVolumeImageMPRSlicer::Slice::CreateSceneLayer(const ILayerStyleConfigurator* configurator, | |
| 69 const CoordinateSystem3D& cuttingPlane) | |
| 70 { | |
| 71 CheckValid(); | |
| 72 | |
| 73 if (configurator == NULL) | |
| 74 { | |
| 75 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer, | |
| 76 "A style configurator is mandatory for textures"); | |
| 77 } | |
| 78 | |
|
1298
8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1292
diff
changeset
|
79 std::unique_ptr<TextureBaseSceneLayer> texture; |
|
1105
640feb146fa8
Code formatting (dummyc) + log level (dummyc)
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
80 |
| 814 | 81 { |
| 82 const DicomInstanceParameters& parameters = volume_.GetDicomParameters(); | |
| 83 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
|
84 |
| 814 | 85 texture.reset(dynamic_cast<TextureBaseSceneLayer*> |
| 86 (configurator->CreateTextureFromDicom(reader.GetAccessor(), parameters))); | |
| 87 } | |
|
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
|
88 |
| 814 | 89 const CoordinateSystem3D& system = volume_.GetGeometry().GetProjectionGeometry(projection_); |
| 90 | |
| 91 double x0, y0, x1, y1; | |
| 92 cuttingPlane.ProjectPoint(x0, y0, system.GetOrigin()); | |
| 93 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
|
94 |
|
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 { |
|
1161
19b1c8caade4
fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1105
diff
changeset
|
96 double xz, yz; |
|
19b1c8caade4
fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1105
diff
changeset
|
97 cuttingPlane.ProjectPoint(xz, yz, LinearAlgebra::CreateVector(0, 0, 0)); |
|
19b1c8caade4
fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1105
diff
changeset
|
98 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
|
99 } |
| 814 | 100 |
| 101 double dx = x1 - x0; | |
| 102 double dy = y1 - y0; | |
| 103 if (!LinearAlgebra::IsCloseToZero(dx) || | |
| 104 !LinearAlgebra::IsCloseToZero(dy)) | |
| 105 { | |
| 106 texture->SetAngle(atan2(dy, dx)); | |
| 107 } | |
| 1291 | 108 |
| 814 | 109 Vector tmp = volume_.GetGeometry().GetVoxelDimensions(projection_); |
| 110 texture->SetPixelSpacing(tmp[0], tmp[1]); | |
| 111 | |
| 112 return texture.release(); | |
| 113 } | |
| 114 | |
| 115 | |
|
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
|
116 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
|
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 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
|
119 } |
|
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
|
120 |
|
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
|
121 IVolumeSlicer::IExtractedSlice* |
| 814 | 122 DicomVolumeImageMPRSlicer::ExtractSlice(const CoordinateSystem3D& cuttingPlane) |
| 123 { | |
| 124 if (volume_->HasGeometry()) | |
| 125 { | |
| 126 return new Slice(*volume_, cuttingPlane); | |
| 127 } | |
| 128 else | |
| 129 { | |
| 130 return new IVolumeSlicer::InvalidSlice; | |
| 131 } | |
| 132 } | |
| 133 } |