From b520c68ad01822fff32318c985938a1d702ef3da Mon Sep 17 00:00:00 2001 From: vsv Date: Wed, 11 Jun 2008 11:41:23 +0000 Subject: [PATCH] *** empty log message *** --- src/VISUGUI/VisuGUI_Prs3dDlg.cxx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx index 3b422fd7..ef7a4741 100644 --- a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx +++ b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx @@ -1416,6 +1416,7 @@ void VisuGUI_ScalarBarPane::onFieldRange( bool isOn ) myScalarMap->SetSourceRange(); MinEdit->setEnabled( false ); MaxEdit->setEnabled( false ); + CBFilter->setEnabled( false ); changeScalarMode(myModeCombo->currentIndex()); } } @@ -1424,8 +1425,10 @@ void VisuGUI_ScalarBarPane::onImposedRange( bool isOn ) { if (isOn) { myScalarMap->SetRange(myScalarMap->GetMin(), myScalarMap->GetMax()); + //myScalarMap->SetRangeAndFilter(myScalarMap->GetMin(), myScalarMap->GetMax(), isFilteredByScalars()); MinEdit->setEnabled( true ); MaxEdit->setEnabled( true ); + CBFilter->setEnabled( true ); changeScalarMode(myModeCombo->currentIndex()); } } @@ -1448,10 +1451,13 @@ void VisuGUI_ScalarBarPane::changeRange( int ) myScalarMap->SetSourceRange(); MinEdit->setEnabled( false ); MaxEdit->setEnabled( false ); + CBFilter->setEnabled( false ); } else { myScalarMap->SetRange(myScalarMap->GetMin(), myScalarMap->GetMax()); + //myScalarMap->SetRangeAndFilter(myScalarMap->GetMin(), myScalarMap->GetMax(), isFilteredByScalars()); MinEdit->setEnabled( true ); MaxEdit->setEnabled( true ); + CBFilter->setEnabled( true ); } changeScalarMode(myModeCombo->currentIndex()); @@ -1580,7 +1586,9 @@ void VisuGUI_ScalarBarPane::setLogarithmic( bool on ) { // RKV : Begin //---------------------------------------------------------------------------- bool VisuGUI_ScalarBarPane::isFilteredByScalars() { - return CBFilter->isChecked(); + if (CBFilter->isEnabled()) + return CBFilter->isChecked(); + return false; } -- 2.39.2