IPAL21340 Compute leads to Unknown Exception if No available data in selection.

This commit is contained in:
dmv 2009-08-25 08:31:07 +00:00
parent 7d36523b6a
commit 0913edc2fc

View File

@ -651,7 +651,7 @@ void SMESHGUI_BaseComputeOp::startOperation()
tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_WARNING"),
tr("SMESH_WRN_NO_AVAILABLE_DATA")); tr("SMESH_WRN_NO_AVAILABLE_DATA"));
onCancel(); onCancel();
return;
} }
myMainShape = myMesh->GetShapeToMesh(); myMainShape = myMesh->GetShapeToMesh();
@ -676,9 +676,11 @@ void SMESHGUI_BaseComputeOp::computeMesh()
bool computeFailed = true, memoryLack = false; bool computeFailed = true, memoryLack = false;
_PTR(SObject) aMeshSObj = SMESH::FindSObject(myMesh); _PTR(SObject) aMeshSObj = SMESH::FindSObject(myMesh);
if ( !aMeshSObj ) // IPAL 21340
return;
bool hasShape = myMesh->HasShapeToMesh(); bool hasShape = myMesh->HasShapeToMesh();
bool shapeOK = myMainShape->_is_nil() ? !hasShape : hasShape; bool shapeOK = myMainShape->_is_nil() ? !hasShape : hasShape;
if ( shapeOK && aMeshSObj ) if ( shapeOK )
{ {
myCompDlg->myMeshName->setText( aMeshSObj->GetName().c_str() ); myCompDlg->myMeshName->setText( aMeshSObj->GetName().c_str() );
SMESH::SMESH_Gen_var gen = getSMESHGUI()->GetSMESHGen(); SMESH::SMESH_Gen_var gen = getSMESHGUI()->GetSMESHGen();