X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvOverlayPanel.cxx;h=2a77e8dcaff5a5a335c23f4366571dfb238691e2;hb=bfbffc033e8c2f7a9448dcf8611e5a81b1898559;hp=b394bb55de4fc079c9c8e1123f8723d1de27661a;hpb=ad13cf07dde9cf2b43bf902c3da442e1c4d751f6;p=clitk.git diff --git a/vv/vvOverlayPanel.cxx b/vv/vvOverlayPanel.cxx index b394bb5..2a77e8d 100644 --- a/vv/vvOverlayPanel.cxx +++ b/vv/vvOverlayPanel.cxx @@ -233,7 +233,7 @@ void vvOverlayPanel::setFusionProperty() if (disableFusionSignals) return; - fusionOpacitySpin->setValue(opacityHorizontalSlider->value()); + fusionOpacitySpin->setValue(opacityHorizontalSlider->value()); fusionThresSpin->setValue(thresOpacityHorizontalSlider->value()); emit FusionPropertyUpdated(opacityHorizontalSlider->value(), thresOpacityHorizontalSlider->value(), fusionColorMapComboBox->currentIndex(), @@ -264,7 +264,7 @@ void vvOverlayPanel::getFusionSequenceProperty(int sequenceFrameIndex, bool spat fCTUSFrame->setEnabled(1); fCTUSSlider->setEnabled(1); fCTUSSlider->setValue(sequenceFrameIndex); - fCTUSSlider->setMaximum(sequenceLenth); + fCTUSSlider->setMaximum(sequenceLenth-1); //the maximum IS included, since we start at 0, go until n-1! if (spatialSync) fCTUSActivateSpaceSyncCheckBox->setCheckState(Qt::Checked); else fCTUSActivateSpaceSyncCheckBox->setCheckState(Qt::Unchecked); if (fCTUSActivateTimeSyncCheckBox->isEnabled()) { @@ -292,7 +292,7 @@ void vvOverlayPanel::setFusionSequenceProperty() { if (disableFusionSequenceSignals) return; - emit FusionSequencePropertyUpdated(fCTUSSlider->value(), fCTUSActivateSpaceSyncCheckBox->isChecked(), fCTUSSlider->maximum(), fCTUSActivateTimeSyncCheckBox->isChecked()); + emit FusionSequencePropertyUpdated(fCTUSSlider->value(), fCTUSActivateSpaceSyncCheckBox->isChecked(), fCTUSSlider->maximum()+1, fCTUSActivateTimeSyncCheckBox->isChecked()); } void vvOverlayPanel::enableFusionSequenceTemporalSync() { @@ -303,7 +303,7 @@ void vvOverlayPanel::enableFusionSequenceTemporalSync() { disableFusionSequenceSignals = backup; // if (disableFusionSequenceSignals) return; - emit FusionSequencePropertyUpdated(fCTUSSlider->value(), fCTUSActivateSpaceSyncCheckBox->isChecked(), fCTUSSlider->maximum(), fCTUSActivateTimeSyncCheckBox->isChecked()); + emit FusionSequencePropertyUpdated(fCTUSSlider->value(), fCTUSActivateSpaceSyncCheckBox->isChecked(), fCTUSSlider->maximum()+1, fCTUSActivateTimeSyncCheckBox->isChecked()); } void vvOverlayPanel::updateFusionSequenceSliderValueFromWindow(int val, bool updateVisualization) { @@ -314,7 +314,7 @@ void vvOverlayPanel::updateFusionSequenceSliderValueFromWindow(int val, bool upd disableFusionSequenceSignals = false; if (disableFusionSequenceSignals) return; - if (updateVisualization) emit FusionSequencePropertyUpdated(fCTUSSlider->value(), fCTUSActivateSpaceSyncCheckBox->isChecked(), fCTUSSlider->maximum(), fCTUSActivateTimeSyncCheckBox->isChecked()); + if (updateVisualization) emit FusionSequencePropertyUpdated(fCTUSSlider->value(), fCTUSActivateSpaceSyncCheckBox->isChecked(), fCTUSSlider->maximum()+1, fCTUSActivateTimeSyncCheckBox->isChecked()); } void vvOverlayPanel::VFColorChangeRequest()