Mercurial > hg > orthanc-stone
annotate OrthancStone/Sources/Volumes/VolumeSceneLayerSource.cpp @ 1598:8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 26 Oct 2020 20:49:28 +0100 |
| parents | 4fb8fdf03314 |
| children | 874e178f34e9 |
| rev | line source |
|---|---|
| 815 | 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:
956
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 815 | 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 |
| 815 | 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:
1571
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/>. |
| 815 | 20 **/ |
| 21 | |
| 22 | |
| 23 #include "VolumeSceneLayerSource.h" | |
| 24 | |
|
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
25 #include "../Scene2D/NullLayer.h" |
|
1433
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
26 #include "../Viewport/IViewport.h" |
|
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
27 #include "../StoneException.h" |
| 1558 | 28 #include "../Scene2DViewport/ViewportController.h" |
|
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
29 |
|
1455
30deba7bc8e2
simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1433
diff
changeset
|
30 #include <OrthancException.h> |
| 815 | 31 |
| 32 namespace OrthancStone | |
| 33 { | |
| 34 static bool IsSameCuttingPlane(const CoordinateSystem3D& a, | |
| 35 const CoordinateSystem3D& b) | |
| 36 { | |
| 37 // TODO - What if the normal is reversed? | |
| 38 double distance; | |
| 39 return (CoordinateSystem3D::ComputeDistance(distance, a, b) && | |
| 40 LinearAlgebra::IsCloseToZero(distance)); | |
| 41 } | |
| 42 | |
| 43 | |
| 44 void VolumeSceneLayerSource::ClearLayer() | |
| 45 { | |
|
1433
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
46 { |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
47 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
48 ViewportController& controller = lock->GetController(); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
49 Scene2D& scene = controller.GetScene(); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
50 scene.DeleteLayer(layerDepth_); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
51 } |
| 815 | 52 lastPlane_.reset(NULL); |
| 53 } | |
| 54 | |
|
1322
0da659f8579c
Object reference 1st commit + indent change
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
55 VolumeSceneLayerSource::VolumeSceneLayerSource( |
|
1433
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
56 boost::shared_ptr<OrthancStone::IViewport> viewport, |
|
1322
0da659f8579c
Object reference 1st commit + indent change
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
57 int layerDepth, |
| 1571 | 58 const boost::shared_ptr<IVolumeSlicer>& slicer) : |
| 59 viewport_(viewport), | |
| 60 layerDepth_(layerDepth), | |
| 61 slicer_(slicer), | |
| 62 lastRevision_(0), | |
| 63 lastConfiguratorRevision_(0) | |
| 815 | 64 { |
| 65 if (slicer == NULL) | |
| 66 { | |
| 67 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 68 } | |
|
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
69 |
|
1433
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
70 { |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
71 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
72 ViewportController& controller = lock->GetController(); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
73 Scene2D& scene = controller.GetScene(); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
74 ORTHANC_ASSERT(!scene.HasLayer(layerDepth_)); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
75 |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
76 // we need to book the scene layer depth by adding a dummy layer |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
77 std::unique_ptr<NullLayer> nullLayer(new NullLayer); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
78 scene.SetLayer(layerDepth_,nullLayer.release()); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
79 } |
| 815 | 80 } |
| 81 | |
|
934
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
82 VolumeSceneLayerSource::~VolumeSceneLayerSource() |
|
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
83 { |
|
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
84 ClearLayer(); |
|
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
85 } |
| 815 | 86 |
| 87 void VolumeSceneLayerSource::RemoveConfigurator() | |
| 88 { | |
| 89 configurator_.reset(); | |
| 90 lastPlane_.reset(); | |
| 91 } | |
| 92 | |
| 93 | |
| 94 void VolumeSceneLayerSource::SetConfigurator(ILayerStyleConfigurator* configurator) // Takes ownership | |
| 95 { | |
| 96 if (configurator == NULL) | |
| 97 { | |
| 98 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 99 } | |
| 100 | |
| 101 configurator_.reset(configurator); | |
| 102 | |
| 103 // Invalidate the layer | |
| 104 lastPlane_.reset(NULL); | |
| 105 } | |
| 106 | |
| 107 | |
| 108 ILayerStyleConfigurator& VolumeSceneLayerSource::GetConfigurator() const | |
| 109 { | |
| 110 if (configurator_.get() == NULL) | |
| 111 { | |
|
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
934
diff
changeset
|
112 LOG(ERROR) << "VolumeSceneLayerSource::GetConfigurator(): (configurator_.get() == NULL)"; |
| 815 | 113 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
| 114 } | |
| 115 | |
| 116 return *configurator_; | |
| 117 } | |
| 118 | |
| 119 | |
|
1345
0d6a01ffa1dd
Clean version of the hack commited in
Benjamin Golinvaux <bgo@osimis.io>
parents:
1344
diff
changeset
|
120 void VolumeSceneLayerSource::Update(const CoordinateSystem3D& plane) |
| 815 | 121 { |
|
1433
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
122 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
123 ViewportController& controller = lock->GetController(); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
124 Scene2D& scene = controller.GetScene(); |
|
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
125 |
| 815 | 126 assert(slicer_.get() != NULL); |
|
1298
8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1270
diff
changeset
|
127 std::unique_ptr<IVolumeSlicer::IExtractedSlice> slice(slicer_->ExtractSlice(plane)); |
| 815 | 128 |
| 129 if (slice.get() == NULL) | |
| 130 { | |
| 131 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 132 } | |
| 133 | |
| 134 if (!slice->IsValid()) | |
| 135 { | |
| 136 // The slicer cannot handle this cutting plane: Clear the layer | |
| 137 ClearLayer(); | |
| 138 } | |
|
1345
0d6a01ffa1dd
Clean version of the hack commited in
Benjamin Golinvaux <bgo@osimis.io>
parents:
1344
diff
changeset
|
139 else if (lastPlane_.get() != NULL && |
| 815 | 140 IsSameCuttingPlane(*lastPlane_, plane) && |
| 141 lastRevision_ == slice->GetRevision()) | |
| 142 { | |
| 143 // The content of the slice has not changed: Don't update the | |
| 144 // layer content, but possibly update its style | |
| 145 | |
| 146 if (configurator_.get() != NULL && | |
| 147 configurator_->GetRevision() != lastConfiguratorRevision_ && | |
|
1433
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
148 scene.HasLayer(layerDepth_)) |
| 815 | 149 { |
|
1433
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
150 configurator_->ApplyStyle(scene.GetLayer(layerDepth_)); |
| 815 | 151 } |
| 152 } | |
| 153 else | |
| 154 { | |
|
921
81d30cd93b65
Ability to ask the loader for the geometry in PULL mode (when subscribing to the messages is not possible) + small changes (removed const/ref qualifiers for boost::shared_ptr param, added traces, doc change)
Benjamin Golinvaux <bgo@osimis.io>
parents:
815
diff
changeset
|
155 LOG(TRACE) << "VolumeSceneLayerSource::Update -- Content has changed: An update is needed"; |
| 815 | 156 // Content has changed: An update is needed |
| 157 lastPlane_.reset(new CoordinateSystem3D(plane)); | |
| 158 lastRevision_ = slice->GetRevision(); | |
| 159 | |
|
1298
8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1270
diff
changeset
|
160 std::unique_ptr<ISceneLayer> layer(slice->CreateSceneLayer(configurator_.get(), plane)); |
| 815 | 161 if (layer.get() == NULL) |
| 162 { | |
|
921
81d30cd93b65
Ability to ask the loader for the geometry in PULL mode (when subscribing to the messages is not possible) + small changes (removed const/ref qualifiers for boost::shared_ptr param, added traces, doc change)
Benjamin Golinvaux <bgo@osimis.io>
parents:
815
diff
changeset
|
163 LOG(TRACE) << "VolumeSceneLayerSource::Update -- (layer.get() == NULL)"; |
| 815 | 164 ClearLayer(); |
| 165 } | |
| 166 else | |
| 167 { | |
|
921
81d30cd93b65
Ability to ask the loader for the geometry in PULL mode (when subscribing to the messages is not possible) + small changes (removed const/ref qualifiers for boost::shared_ptr param, added traces, doc change)
Benjamin Golinvaux <bgo@osimis.io>
parents:
815
diff
changeset
|
168 LOG(TRACE) << "VolumeSceneLayerSource::Update -- (layer.get() != NULL)"; |
| 815 | 169 if (configurator_.get() != NULL) |
| 170 { | |
| 171 lastConfiguratorRevision_ = configurator_->GetRevision(); | |
| 172 configurator_->ApplyStyle(*layer); | |
| 173 } | |
| 174 | |
|
1433
8635b333fa5b
[BREAKING] VolumeSceneLayerSource now locks the viewport properly before using the scene. The ctor now accepts the viewport instead of a ref. to the scene. RtViewer sample has been adapted accordingly.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1345
diff
changeset
|
175 scene.SetLayer(layerDepth_, layer.release()); |
| 815 | 176 } |
| 177 } | |
| 178 } | |
| 179 } |