Mercurial > hg > orthanc-stone
annotate OrthancStone/Sources/Volumes/VolumeSceneLayerSource.cpp @ 1755:1a775f4ee672
added ability to specify initial slice in
BasicFetchingStrategy and using it
in OrthancSeriesVolumeProgressiveLoader
author | bgo@SHARKNADO.localdomain |
---|---|
date | Mon, 26 Apr 2021 12:05:40 +0200 |
parents | 9ac2a65d4172 |
children | 29c85a2c6df0 |
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 | |
1739
9ac2a65d4172
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1685
diff
changeset
|
5 * Copyright (C) 2017-2021 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 void VolumeSceneLayerSource::ClearLayer() | |
44 { | |
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
|
45 { |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
46 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
|
47 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
|
48 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
|
49 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
|
50 } |
815 | 51 lastPlane_.reset(NULL); |
52 } | |
53 | |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
54 IViewport::ILock* VolumeSceneLayerSource::GetViewportLock() |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
55 { |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
56 boost::shared_ptr<IViewport> viewport = viewport_.lock(); |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
57 if (viewport) |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
58 return viewport->Lock(); |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
59 else |
1608
646e581e115b
replacing nullptr by NULL for VS2008 compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1606
diff
changeset
|
60 return NULL; |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
61 } |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
62 |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
63 IViewport::ILock* VolumeSceneLayerSource::GetViewportLock() const |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
64 { |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
65 boost::shared_ptr<IViewport> viewport = viewport_.lock(); |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
66 if (viewport) |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
67 return viewport->Lock(); |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
68 else |
1608
646e581e115b
replacing nullptr by NULL for VS2008 compatibility
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1606
diff
changeset
|
69 return NULL; |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
70 } |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
71 |
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
72 |
1640
52b8b96cb55f
cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1608
diff
changeset
|
73 VolumeSceneLayerSource::VolumeSceneLayerSource(boost::weak_ptr<IViewport> viewport, |
52b8b96cb55f
cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1608
diff
changeset
|
74 int layerDepth, |
52b8b96cb55f
cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1608
diff
changeset
|
75 const boost::shared_ptr<IVolumeSlicer>& slicer) : |
1571 | 76 viewport_(viewport), |
77 layerDepth_(layerDepth), | |
78 slicer_(slicer), | |
79 lastRevision_(0), | |
80 lastConfiguratorRevision_(0) | |
815 | 81 { |
82 if (slicer == NULL) | |
83 { | |
84 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
85 } | |
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
86 |
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
|
87 { |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
88 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
|
89 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
|
90 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
|
91 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
|
92 |
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 // 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
|
94 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
|
95 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
|
96 } |
815 | 97 } |
98 | |
934
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
99 VolumeSceneLayerSource::~VolumeSceneLayerSource() |
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
100 { |
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
101 ClearLayer(); |
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
102 } |
815 | 103 |
104 void VolumeSceneLayerSource::RemoveConfigurator() | |
105 { | |
106 configurator_.reset(); | |
107 lastPlane_.reset(); | |
108 } | |
109 | |
110 | |
111 void VolumeSceneLayerSource::SetConfigurator(ILayerStyleConfigurator* configurator) // Takes ownership | |
112 { | |
113 if (configurator == NULL) | |
114 { | |
115 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
116 } | |
117 | |
118 configurator_.reset(configurator); | |
119 | |
120 // Invalidate the layer | |
121 lastPlane_.reset(NULL); | |
122 } | |
123 | |
124 | |
125 ILayerStyleConfigurator& VolumeSceneLayerSource::GetConfigurator() const | |
126 { | |
127 if (configurator_.get() == NULL) | |
128 { | |
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
934
diff
changeset
|
129 LOG(ERROR) << "VolumeSceneLayerSource::GetConfigurator(): (configurator_.get() == NULL)"; |
815 | 130 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
131 } | |
132 | |
133 return *configurator_; | |
134 } | |
135 | |
136 | |
1345
0d6a01ffa1dd
Clean version of the hack commited in
Benjamin Golinvaux <bgo@osimis.io>
parents:
1344
diff
changeset
|
137 void VolumeSceneLayerSource::Update(const CoordinateSystem3D& plane) |
815 | 138 { |
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
139 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
140 if(lock) |
815 | 141 { |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
142 ViewportController& controller = lock->GetController(); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
143 Scene2D& scene = controller.GetScene(); |
815 | 144 |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
145 assert(slicer_.get() != NULL); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
146 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
|
147 |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
148 if (slice.get() == NULL) |
815 | 149 { |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
150 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
815 | 151 } |
152 | |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
153 if (!slice->IsValid()) |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
154 { |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
155 // 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
|
156 ClearLayer(); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
157 } |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
158 else if (lastPlane_.get() != NULL && |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
159 IsSameCuttingPlane(*lastPlane_, plane) && |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
160 lastRevision_ == slice->GetRevision()) |
815 | 161 { |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
162 // 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
|
163 // layer content, but possibly update its style |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
164 |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
165 if (configurator_.get() != NULL && |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
166 configurator_->GetRevision() != lastConfiguratorRevision_ && |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
167 scene.HasLayer(layerDepth_)) |
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 configurator_->ApplyStyle(scene.GetLayer(layerDepth_)); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
170 } |
815 | 171 } |
172 else | |
173 { | |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
174 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
|
175 // Content has changed: An update is needed |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
176 lastPlane_.reset(new CoordinateSystem3D(plane)); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
177 lastRevision_ = slice->GetRevision(); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
178 |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
179 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
|
180 if (layer.get() == NULL) |
815 | 181 { |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
182 LOG(TRACE) << "VolumeSceneLayerSource::Update -- (layer.get() == NULL)"; |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
183 ClearLayer(); |
815 | 184 } |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
185 else |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
186 { |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
187 LOG(TRACE) << "VolumeSceneLayerSource::Update -- (layer.get() != NULL)"; |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
188 if (configurator_.get() != NULL) |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
189 { |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
190 lastConfiguratorRevision_ = configurator_->GetRevision(); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
191 configurator_->ApplyStyle(*layer); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
192 } |
815 | 193 |
1685
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
194 scene.SetLayer(layerDepth_, layer.release()); |
7896aac14587
Protected against usage of dying viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1640
diff
changeset
|
195 } |
815 | 196 } |
197 } | |
198 } | |
199 } |