Mercurial > hg > orthanc-stone
comparison Framework/Volumes/VolumeSceneLayerSource.cpp @ 924:9ba1e1198e73
merge
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Mon, 22 Jul 2019 14:29:23 +0200 |
parents | 81d30cd93b65 |
children | 094d10ed7ec2 |
comparison
equal
deleted
inserted
replaced
923:6b81c5453382 | 924:9ba1e1198e73 |
---|---|
117 configurator_->ApplyStyle(scene_.GetLayer(layerDepth_)); | 117 configurator_->ApplyStyle(scene_.GetLayer(layerDepth_)); |
118 } | 118 } |
119 } | 119 } |
120 else | 120 else |
121 { | 121 { |
122 LOG(TRACE) << "VolumeSceneLayerSource::Update -- Content has changed: An update is needed"; | |
122 // Content has changed: An update is needed | 123 // Content has changed: An update is needed |
123 lastPlane_.reset(new CoordinateSystem3D(plane)); | 124 lastPlane_.reset(new CoordinateSystem3D(plane)); |
124 lastRevision_ = slice->GetRevision(); | 125 lastRevision_ = slice->GetRevision(); |
125 | 126 |
126 std::auto_ptr<ISceneLayer> layer(slice->CreateSceneLayer(configurator_.get(), plane)); | 127 std::auto_ptr<ISceneLayer> layer(slice->CreateSceneLayer(configurator_.get(), plane)); |
127 if (layer.get() == NULL) | 128 if (layer.get() == NULL) |
128 { | 129 { |
130 LOG(TRACE) << "VolumeSceneLayerSource::Update -- (layer.get() == NULL)"; | |
129 ClearLayer(); | 131 ClearLayer(); |
130 } | 132 } |
131 else | 133 else |
132 { | 134 { |
135 LOG(TRACE) << "VolumeSceneLayerSource::Update -- (layer.get() != NULL)"; | |
133 if (configurator_.get() != NULL) | 136 if (configurator_.get() != NULL) |
134 { | 137 { |
135 lastConfiguratorRevision_ = configurator_->GetRevision(); | 138 lastConfiguratorRevision_ = configurator_->GetRevision(); |
136 configurator_->ApplyStyle(*layer); | 139 configurator_->ApplyStyle(*layer); |
137 } | 140 } |