Mercurial > hg > orthanc-stone
annotate OrthancStone/Sources/Volumes/VolumeSceneLayerSource.cpp @ 1939:efed41b76dc7
todo
author | Alain Mazy <am@osimis.io> |
---|---|
date | Tue, 10 May 2022 15:58:58 +0200 |
parents | 7053b8a0aaec |
children | 07964689cb0b |
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 | |
1871
7053b8a0aaec
upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1870
diff
changeset
|
5 * Copyright (C) 2017-2022 Osimis S.A., Belgium |
7053b8a0aaec
upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1870
diff
changeset
|
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
815 | 7 * |
8 * 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
|
9 * modify it under the terms of the GNU Lesser General Public License |
815 | 10 * as published by the Free Software Foundation, either version 3 of |
11 * the License, or (at your option) any later version. | |
12 * | |
13 * This program is distributed in the hope that it will be useful, but | |
14 * 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
|
15 * 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
|
16 * Lesser General Public License for more details. |
1596
4fb8fdf03314
removed annoying whitespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1571
diff
changeset
|
17 * |
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
|
18 * 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
|
19 * 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
|
20 * <http://www.gnu.org/licenses/>. |
815 | 21 **/ |
22 | |
23 | |
24 #include "VolumeSceneLayerSource.h" | |
25 | |
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
26 #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
|
27 #include "../Viewport/IViewport.h" |
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
28 #include "../StoneException.h" |
1558 | 29 #include "../Scene2DViewport/ViewportController.h" |
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
30 |
1455
30deba7bc8e2
simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1433
diff
changeset
|
31 #include <OrthancException.h> |
815 | 32 |
33 namespace OrthancStone | |
34 { | |
35 static bool IsSameCuttingPlane(const CoordinateSystem3D& a, | |
36 const CoordinateSystem3D& b) | |
37 { | |
38 // TODO - What if the normal is reversed? | |
39 double distance; | |
40 return (CoordinateSystem3D::ComputeDistance(distance, a, b) && | |
41 LinearAlgebra::IsCloseToZero(distance)); | |
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 { |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
47 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
1763
29c85a2c6df0
fix segfault in sample rt viewer on sdl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
48 if (lock.get()) |
29c85a2c6df0
fix segfault in sample rt viewer on sdl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
49 { |
29c85a2c6df0
fix segfault in sample rt viewer on sdl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
50 ViewportController& controller = lock->GetController(); |
29c85a2c6df0
fix segfault in sample rt viewer on sdl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
51 Scene2D& scene = controller.GetScene(); |
29c85a2c6df0
fix segfault in sample rt viewer on sdl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
52 scene.DeleteLayer(layerDepth_); |
29c85a2c6df0
fix segfault in sample rt viewer on sdl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
53 } |
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
|
54 } |
815 | 55 lastPlane_.reset(NULL); |
56 } | |
57 | |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
58 IViewport::ILock* VolumeSceneLayerSource::GetViewportLock() |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
59 { |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
60 boost::shared_ptr<IViewport> viewport = viewport_.lock(); |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
61 if (viewport) |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
62 return viewport->Lock(); |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
63 else |
1608
646e581e115b
replacing nullptr by NULL for VS2008 compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1606
diff
changeset
|
64 return NULL; |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
65 } |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
66 |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
67 IViewport::ILock* VolumeSceneLayerSource::GetViewportLock() const |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
68 { |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
69 boost::shared_ptr<IViewport> viewport = viewport_.lock(); |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
70 if (viewport) |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
71 return viewport->Lock(); |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
72 else |
1608
646e581e115b
replacing nullptr by NULL for VS2008 compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1606
diff
changeset
|
73 return NULL; |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
74 } |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
75 |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
76 |
1640
52b8b96cb55f
cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1608
diff
changeset
|
77 VolumeSceneLayerSource::VolumeSceneLayerSource(boost::weak_ptr<IViewport> viewport, |
52b8b96cb55f
cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1608
diff
changeset
|
78 int layerDepth, |
52b8b96cb55f
cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1608
diff
changeset
|
79 const boost::shared_ptr<IVolumeSlicer>& slicer) : |
1571 | 80 viewport_(viewport), |
81 layerDepth_(layerDepth), | |
82 slicer_(slicer), | |
83 lastRevision_(0), | |
84 lastConfiguratorRevision_(0) | |
815 | 85 { |
86 if (slicer == NULL) | |
87 { | |
88 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
89 } | |
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
90 |
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
|
91 { |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
92 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
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
|
93 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
|
94 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
|
95 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
|
96 |
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
|
97 // 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
|
98 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
|
99 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
|
100 } |
815 | 101 } |
102 | |
934
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
103 VolumeSceneLayerSource::~VolumeSceneLayerSource() |
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
104 { |
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
105 ClearLayer(); |
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
106 } |
815 | 107 |
108 void VolumeSceneLayerSource::RemoveConfigurator() | |
109 { | |
110 configurator_.reset(); | |
111 lastPlane_.reset(); | |
112 } | |
113 | |
114 | |
115 void VolumeSceneLayerSource::SetConfigurator(ILayerStyleConfigurator* configurator) // Takes ownership | |
116 { | |
117 if (configurator == NULL) | |
118 { | |
119 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
120 } | |
121 | |
122 configurator_.reset(configurator); | |
123 | |
124 // Invalidate the layer | |
125 lastPlane_.reset(NULL); | |
126 } | |
127 | |
128 | |
129 ILayerStyleConfigurator& VolumeSceneLayerSource::GetConfigurator() const | |
130 { | |
131 if (configurator_.get() == NULL) | |
132 { | |
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
934
diff
changeset
|
133 LOG(ERROR) << "VolumeSceneLayerSource::GetConfigurator(): (configurator_.get() == NULL)"; |
815 | 134 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
135 } | |
136 | |
137 return *configurator_; | |
138 } | |
139 | |
140 | |
1345
0d6a01ffa1dd
Clean version of the hack commited in
Benjamin Golinvaux <bgo@osimis.io>
parents:
1344
diff
changeset
|
141 void VolumeSceneLayerSource::Update(const CoordinateSystem3D& plane) |
815 | 142 { |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
143 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
144 if(lock) |
815 | 145 { |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
146 ViewportController& controller = lock->GetController(); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
147 Scene2D& scene = controller.GetScene(); |
815 | 148 |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
149 assert(slicer_.get() != NULL); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
150 std::unique_ptr<IVolumeSlicer::IExtractedSlice> slice(slicer_->ExtractSlice(plane)); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
151 |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
152 if (slice.get() == NULL) |
815 | 153 { |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
154 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
815 | 155 } |
156 | |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
157 if (!slice->IsValid()) |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
158 { |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
159 // The slicer cannot handle this cutting plane: Clear the layer |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
160 ClearLayer(); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
161 } |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
162 else if (lastPlane_.get() != NULL && |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
163 IsSameCuttingPlane(*lastPlane_, plane) && |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
164 lastRevision_ == slice->GetRevision()) |
815 | 165 { |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
166 // The content of the slice has not changed: Don't update the |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
167 // layer content, but possibly update its style |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
168 |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
169 if (configurator_.get() != NULL && |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
170 configurator_->GetRevision() != lastConfiguratorRevision_ && |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
171 scene.HasLayer(layerDepth_)) |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
172 { |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
173 configurator_->ApplyStyle(scene.GetLayer(layerDepth_)); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
174 } |
815 | 175 } |
176 else | |
177 { | |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
178 LOG(TRACE) << "VolumeSceneLayerSource::Update -- Content has changed: An update is needed"; |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
179 // Content has changed: An update is needed |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
180 lastPlane_.reset(new CoordinateSystem3D(plane)); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
181 lastRevision_ = slice->GetRevision(); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
182 |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
183 std::unique_ptr<ISceneLayer> layer(slice->CreateSceneLayer(configurator_.get(), plane)); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
184 if (layer.get() == NULL) |
815 | 185 { |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
186 LOG(TRACE) << "VolumeSceneLayerSource::Update -- (layer.get() == NULL)"; |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
187 ClearLayer(); |
815 | 188 } |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
189 else |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
190 { |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
191 LOG(TRACE) << "VolumeSceneLayerSource::Update -- (layer.get() != NULL)"; |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
192 if (configurator_.get() != NULL) |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
193 { |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
194 lastConfiguratorRevision_ = configurator_->GetRevision(); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
195 configurator_->ApplyStyle(*layer); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
196 } |
815 | 197 |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
198 scene.SetLayer(layerDepth_, layer.release()); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
199 } |
815 | 200 } |
201 } | |
202 } | |
203 } |