ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-08 10:27:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

correct preview dialog behaviour

Browse Source
This commit is contained in:
ptv 2008-12-17 15:46:15 +00:00
parent 4ad5bce0b8
commit dd19ae7b16
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -949,18 +949,8 @@ SMESHGUI_BaseComputeOp::SMESHGUI_BaseComputeOp()
void SMESHGUI_BaseComputeOp::startOperation() void SMESHGUI_BaseComputeOp::startOperation()
{ {
if ( !myCompDlg ) // create compute dialog if not created before
{ computeDlg();
myCompDlg = new SMESHGUI_ComputeDlg( desktop() );
// connect signals and slots
connect(myCompDlg->myShowBtn, SIGNAL (clicked()), SLOT(onPreviewShape()));
connect(myCompDlg->myPublishBtn, SIGNAL (clicked()), SLOT(onPublishShape()));
connect(myCompDlg->myBadMeshBtn, SIGNAL (clicked()), SLOT(onShowBadMesh()));
QTableWidget* aTable = table();
connect(aTable, SIGNAL(itemSelectionChanged()), SLOT(currentCellChanged()));
connect(aTable, SIGNAL(currentCellChanged(int,int,int,int)), SLOT(currentCellChanged()));
}
myMesh = SMESH::SMESH_Mesh::_nil(); myMesh = SMESH::SMESH_Mesh::_nil();
myMainShape = GEOM::GEOM_Object::_nil(); myMainShape = GEOM::GEOM_Object::_nil();
@ -1225,7 +1215,8 @@ void SMESHGUI_BaseComputeOp::showComputeResult( const bool theMemoryLack,
currentCellChanged(); // to update buttons currentCellChanged(); // to update buttons
} }
} }
aCompDlg->show(); // show dialog and wait, becase Compute can be invoked from Preview operation
aCompDlg->exec();
} }
//================================================================================ //================================================================================
@ -1424,6 +1415,19 @@ SMESHGUI_BaseComputeOp::~SMESHGUI_BaseComputeOp()
SMESHGUI_ComputeDlg* SMESHGUI_BaseComputeOp::computeDlg() const SMESHGUI_ComputeDlg* SMESHGUI_BaseComputeOp::computeDlg() const
{ {
if ( !myCompDlg )
{
SMESHGUI_BaseComputeOp* me = (SMESHGUI_BaseComputeOp*)this;
me->myCompDlg = new SMESHGUI_ComputeDlg( desktop() );
// connect signals and slots
connect(myCompDlg->myShowBtn, SIGNAL (clicked()), SLOT(onPreviewShape()));
connect(myCompDlg->myPublishBtn, SIGNAL (clicked()), SLOT(onPublishShape()));
connect(myCompDlg->myBadMeshBtn, SIGNAL (clicked()), SLOT(onShowBadMesh()));
QTableWidget* aTable = me->table();
connect(aTable, SIGNAL(itemSelectionChanged()), SLOT(currentCellChanged()));
connect(aTable, SIGNAL(currentCellChanged(int,int,int,int)), SLOT(currentCellChanged()));
}
return myCompDlg; return myCompDlg;
} }
@ -1822,6 +1826,7 @@ void SMESHGUI_PrecomputeOp::onPreview()
break; break;
} }
aWaitCursor.suspend();
// SHOW ERRORS // SHOW ERRORS
if ( isShowError ) if ( isShowError )
{ {