ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-15 20:40:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression.

Browse Source
This commit is contained in:
rnv 2008-12-11 16:24:02 +00:00
parent bbd637f132
commit 02881de750
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
View File

@ -291,8 +291,7 @@ bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
if (!myMesh->_is_nil()) { if (!myMesh->_is_nil()) {
QStringList aParameters; QStringList aParameters;
aParameters << SpinBoxTol->text(); aParameters << (CheckBoxMerge->isChecked() ? SpinBoxTol->text() : QString(" "));
try { try {
SUIT_OverrideCursor aWaitCursor; SUIT_OverrideCursor aWaitCursor;
@ -492,8 +491,11 @@ void SMESHGUI_BuildCompoundDlg::keyPressEvent( QKeyEvent* e )
//================================================================================= //=================================================================================
void SMESHGUI_BuildCompoundDlg::onSelectMerge(bool toMerge) void SMESHGUI_BuildCompoundDlg::onSelectMerge(bool toMerge)
{ {
TextLabelTol->setEnabled(toMerge); TextLabelTol->setEnabled(toMerge);
SpinBoxTol->setEnabled(toMerge); SpinBoxTol->setEnabled(toMerge);
if(!toMerge)
SpinBoxTol->SetValue(1e-05);
} }
//================================================================================= //=================================================================================
@ -503,7 +505,9 @@ void SMESHGUI_BuildCompoundDlg::onSelectMerge(bool toMerge)
bool SMESHGUI_BuildCompoundDlg::isValid() bool SMESHGUI_BuildCompoundDlg::isValid()
{ {
QString msg; QString msg;
bool ok = SpinBoxTol->isValid( msg, true ) && ok; bool ok=true;
if(CheckBoxMerge->isChecked())
ok = SpinBoxTol->isValid( msg, true );
if( !ok ) { if( !ok ) {
QString str( tr( "SMESH_INCORRECT_INPUT" ) ); QString str( tr( "SMESH_INCORRECT_INPUT" ) );