Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debug
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_BuildCompoundDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
index 7a4a553684292a683a6241e4c98e7d25d1501ba6..13535fe369f42b5d74e628fec49bb26790b6bdfb 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@
-39,6
+39,7
@@
#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Study.h>
#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Study.h>
+#include <SalomeApp_Notebook.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h>
@@
-293,8
+294,6
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
SMESH::SMESH_Mesh_var aCompoundMesh;
if (!myMesh->_is_nil()) {
SMESH::SMESH_Mesh_var aCompoundMesh;
if (!myMesh->_is_nil()) {
- QStringList aParameters;
- aParameters << (CheckBoxMerge->isChecked() ? SpinBoxTol->text() : QString(" "));
try {
SUIT_OverrideCursor aWaitCursor;
try {
SUIT_OverrideCursor aWaitCursor;
@@
-311,7
+310,8
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
CheckBoxMerge->isChecked(),
SpinBoxTol->GetValue());
CheckBoxMerge->isChecked(),
SpinBoxTol->GetValue());
- //asl: aCompoundMesh->SetParameters( aParameters.join(":").toLatin1().constData() );
+ if( CheckBoxMerge->isChecked() )
+ getNotebook()->setParameters( aCompoundMesh, 1, SpinBoxTol );
SMESH::SetName( SMESH::FindSObject( aCompoundMesh ), LineEditName->text() );
mySMESHGUI->updateObjBrowser();
SMESH::SetName( SMESH::FindSObject( aCompoundMesh ), LineEditName->text() );
mySMESHGUI->updateObjBrowser();