Commit 924c4449 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

fixed endless loop in VolumeExplorer

parent ec04c28e
...@@ -37,7 +37,7 @@ namespace campvis { ...@@ -37,7 +37,7 @@ namespace campvis {
: VisualizationPipeline() : VisualizationPipeline()
, p_camera("Camera", "Camera") , p_camera("Camera", "Camera")
, _reader() , _reader()
, _renderer(_canvasSize) , _renderer(&_canvasSize)
, _trackballEH(0) , _trackballEH(0)
{ {
addProcessor(&_reader); addProcessor(&_reader);
......
...@@ -240,14 +240,18 @@ namespace campvis { ...@@ -240,14 +240,18 @@ namespace campvis {
} }
void VolumeExplorer::onProcessorInvalidated(AbstractProcessor* processor) { void VolumeExplorer::onProcessorInvalidated(AbstractProcessor* processor) {
if (processor == &_raycaster) { // make sure to only invalidate ourself if the invalidation is not triggered by us
invalidate(VR_INVALID); // => the _locked state is a trustworthy source for this information :)
} if (! isLocked()) {
if (processor == &_sliceExtractor) { if (processor == &_raycaster) {
invalidate(SLICES_INVALID); invalidate(VR_INVALID);
} }
if (processor == &_sliceExtractor) {
invalidate(SLICES_INVALID);
}
invalidate(AbstractProcessor::INVALID_RESULT); invalidate(AbstractProcessor::INVALID_RESULT);
}
} }
void VolumeExplorer::updateProperties(DataHandle img) { void VolumeExplorer::updateProperties(DataHandle img) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment