Commit 566a4b2d authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Minor fixes:

* Fixed DataSeriesSplitter::updateProperties()
* Fixed VolumeExplorer's camera ID not being dependent on output image name
* Added early return to AbstractProcessor::invalidate(level) if level == 0
parent a0142259
......@@ -101,6 +101,9 @@ namespace campvis {
}
void AbstractProcessor::invalidate(int level) {
if (level == 0)
return;
if (_locked) {
// TODO: this is not 100% thread-safe - an invalidation might slip through if the processor is unlocked during invalidation
_queuedInvalidations.push(level);
......
......@@ -56,7 +56,7 @@ namespace campvis {
void DataSeriesSplitter::updateProperties(DataContainer& dataContainer) {
ScopedTypedData<DataSeries> series(dataContainer, p_inputID.getValue());
if (series != 0)
p_imageIndex.setMaxValue(static_cast<int>(series->getNumDatas()));
p_imageIndex.setMaxValue(static_cast<int>(series->getNumDatas()) - 1);
}
}
......@@ -104,6 +104,8 @@ namespace campvis {
p_inputVolume.addSharedProperty(&_raycaster.p_inputVolume);
p_inputVolume.addSharedProperty(&_sliceRenderer->p_sourceImageID);
_tcp.p_cameraId.addSharedProperty(&_raycaster.p_camera);
_tcp.setViewportSizeProperty(&p_largeRenderSize);
_sliceRenderer->setViewportSizeProperty(&p_smallRenderSize);
_raycaster.setViewportSizeProperty(&p_largeRenderSize);
......@@ -227,6 +229,7 @@ namespace campvis {
p_largeRenderSize.setValue(cgt::ivec2(_viewportSizeProperty->getValue().x - _viewportSizeProperty->getValue().y / 3, _viewportSizeProperty->getValue().y));
}
if (prop == &p_outputImage) {
_tcp.p_cameraId.setValue(p_outputImage.getValue() + ".camera");
_raycaster.p_outputImage.setValue(p_outputImage.getValue() + ".raycaster");
_sliceRenderer->p_geometryID.setValue(p_outputImage.getValue() + ".scribbles");
}
......
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