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

INT PAL 0053083: SIGSEGV after opening some SMESH dialogs without VTKViewer

Browse Source
This commit is contained in:
imn 2016-02-19 18:03:24 +03:00
parent fe79fa3921
commit dd1f957d3d
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/SMESHGUI/SMESHGUI.cxx
View File

@ -2675,8 +2675,16 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
case SMESHOp::OpCopyMesh: case SMESHOp::OpCopyMesh:
{ {
if (checkLock(aStudy)) break; if (checkLock(aStudy)) break;
EmitSignalDeactivateDialog(); if ( vtkwnd ) {
( new SMESHGUI_CopyMeshDlg( this ) )->show(); EmitSignalDeactivateDialog();
( new SMESHGUI_CopyMeshDlg( this ) )->show();
}
else {
SUIT_MessageBox::warning(desktop(),
tr("SMESH_WRN_WARNING"),
tr("SMESH_WRN_VIEWER_VTK"));
}
} }
break; break;
case SMESHOp::OpBuildCompoundMesh: case SMESHOp::OpBuildCompoundMesh:
@ -3105,12 +3113,6 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
break; break;
} }
case SMESHOp::OpFindElementByPoint:
{
startOperation( theCommandID );
break;
}
case SMESHOp::OpEditHypothesis: case SMESHOp::OpEditHypothesis:
{ {
if(checkLock(aStudy)) break; if(checkLock(aStudy)) break;
@ -3493,10 +3495,6 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
break; break;
} }
case SMESHOp::OpMoveNode: // MAKE MESH PASS THROUGH POINT
startOperation( SMESHOp::OpMoveNode );
break;
case SMESHOp::OpDuplicateNodes: case SMESHOp::OpDuplicateNodes:
{ {
if(checkLock(aStudy)) break; if(checkLock(aStudy)) break;
@ -3511,9 +3509,21 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
break; break;
} }
case SMESHOp::OpFindElementByPoint:
case SMESHOp::OpMoveNode: // MAKE MESH PASS THROUGH POINT
case SMESHOp::OpElem0DOnElemNodes: // 0D_ON_ALL_NODES case SMESHOp::OpElem0DOnElemNodes: // 0D_ON_ALL_NODES
startOperation( SMESHOp::OpElem0DOnElemNodes ); {
break; if(checkLock(aStudy)) break;
if ( vtkwnd ) {
EmitSignalDeactivateDialog();
startOperation( theCommandID );
}
else {
SUIT_MessageBox::warning(SMESHGUI::desktop(),
tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
}
break;
}
case SMESHOp::OpSelectFiltersLibrary: // Library of selection filters case SMESHOp::OpSelectFiltersLibrary: // Library of selection filters
{ {
@ -3631,10 +3641,15 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
page = SMESHGUI_MeasureDlg::Area; page = SMESHGUI_MeasureDlg::Area;
else if ( theCommandID == SMESHOp::OpPropertiesVolume ) else if ( theCommandID == SMESHOp::OpPropertiesVolume )
page = SMESHGUI_MeasureDlg::Volume; page = SMESHGUI_MeasureDlg::Volume;
if ( vtkwnd ) {
EmitSignalDeactivateDialog(); EmitSignalDeactivateDialog();
SMESHGUI_MeasureDlg* dlg = new SMESHGUI_MeasureDlg( SMESHGUI::desktop(), page ); SMESHGUI_MeasureDlg* dlg = new SMESHGUI_MeasureDlg( SMESHGUI::desktop(), page );
dlg->show(); dlg->show();
}
else {
SUIT_MessageBox::warning(SMESHGUI::desktop(),
tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"));
}
break; break;
} }
case SMESHOp::OpSortChild: case SMESHOp::OpSortChild: