From: rnv <rnv@opencascade.com>
Date: Thu, 11 Dec 2008 16:24:02 +0000 (+0000)
Subject: Fix regression.
X-Git-Tag: TG_DumpPython_Extension_4~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=02881de750d039ed3d23c06ba1645beda027e81c;p=modules%2Fsmesh.git

Fix regression.
---

diff --git a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
index a861781b0..b29fc4a71 100644
--- a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@ -291,8 +291,7 @@ bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
 
   if (!myMesh->_is_nil()) {
     QStringList aParameters;
-    aParameters << SpinBoxTol->text();
-
+    aParameters << (CheckBoxMerge->isChecked() ? SpinBoxTol->text() : QString(" "));
     try	{
       SUIT_OverrideCursor aWaitCursor;
 
@@ -492,8 +491,11 @@ void SMESHGUI_BuildCompoundDlg::keyPressEvent( QKeyEvent* e )
 //=================================================================================
 void SMESHGUI_BuildCompoundDlg::onSelectMerge(bool toMerge)
 {
+  
   TextLabelTol->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()
 {
   QString msg;
-  bool ok = SpinBoxTol->isValid( msg, true ) && ok;
+  bool ok=true;
+  if(CheckBoxMerge->isChecked())
+    ok = SpinBoxTol->isValid( msg, true );
 
   if( !ok ) {
     QString str( tr( "SMESH_INCORRECT_INPUT" ) );