mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-11-11 16:19:16 +05:00
Enable canceling Compute
This commit is contained in:
parent
629f12cf13
commit
66f244f657
@ -392,8 +392,6 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh,
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
#ifdef WITH_SMESH_CANCEL_COMPUTE
|
||||
//=============================================================================
|
||||
/*!
|
||||
* Prepare Compute a mesh
|
||||
@ -419,7 +417,6 @@ void SMESH_Gen::CancelCompute(SMESH_Mesh & aMesh,
|
||||
_sm_current->ComputeStateEngine( SMESH_subMesh::COMPUTE_CANCELED );
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
//=============================================================================
|
||||
/*!
|
||||
|
@ -1732,9 +1732,7 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
|
||||
myLocShape = SMESH_Mesh::PseudoShape();
|
||||
// call implementation compute
|
||||
::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
|
||||
#ifdef WITH_SMESH_CANCEL_COMPUTE
|
||||
myGen.PrepareCompute( myLocMesh, myLocShape);
|
||||
#endif
|
||||
bool ok = myGen.Compute( myLocMesh, myLocShape);
|
||||
meshServant->CreateGroupServants(); // algos can create groups (issue 0020918)
|
||||
myLocMesh.GetMeshDS()->Modified();
|
||||
@ -1764,7 +1762,6 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
|
||||
void SMESH_Gen_i::CancelCompute( SMESH::SMESH_Mesh_ptr theMesh,
|
||||
GEOM::GEOM_Object_ptr theShapeObject )
|
||||
{
|
||||
#ifdef WITH_SMESH_CANCEL_COMPUTE
|
||||
SMESH_Mesh_i* meshServant = dynamic_cast<SMESH_Mesh_i*>( GetServant( theMesh ).in() );
|
||||
::SMESH_Mesh& myLocMesh = meshServant->GetImpl();
|
||||
TopoDS_Shape myLocShape;
|
||||
@ -1773,7 +1770,6 @@ void SMESH_Gen_i::CancelCompute( SMESH::SMESH_Mesh_ptr theMesh,
|
||||
else
|
||||
myLocShape = SMESH_Mesh::PseudoShape();
|
||||
myGen.CancelCompute( myLocMesh, myLocShape);
|
||||
#endif
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
Loading…
Reference in New Issue
Block a user