Generalize "Cancel Compute" mechanism to be able to report

"Computation canceled" instead of "Algorithm failed" as failure reason

 void NETGENPlugin_NETGEN_*D::CancelCompute()
 {
+  SMESH_Algo::CancelCompute();
This commit is contained in:
eap 2012-07-20 16:14:30 +00:00
parent 48519d8868
commit eb09a83f3d
4 changed files with 4 additions and 0 deletions

View File

@ -141,6 +141,7 @@ bool NETGENPlugin_NETGEN_2D::Compute(SMESH_Mesh& aMesh,
#ifdef WITH_SMESH_CANCEL_COMPUTE #ifdef WITH_SMESH_CANCEL_COMPUTE
void NETGENPlugin_NETGEN_2D::CancelCompute() void NETGENPlugin_NETGEN_2D::CancelCompute()
{ {
SMESH_Algo::CancelCompute();
netgen::multithread.terminate = 1; netgen::multithread.terminate = 1;
} }
#endif #endif

View File

@ -147,6 +147,7 @@ bool NETGENPlugin_NETGEN_2D3D::Compute(SMESH_Mesh& aMesh,
#ifdef WITH_SMESH_CANCEL_COMPUTE #ifdef WITH_SMESH_CANCEL_COMPUTE
void NETGENPlugin_NETGEN_2D3D::CancelCompute() void NETGENPlugin_NETGEN_2D3D::CancelCompute()
{ {
SMESH_Algo::CancelCompute();
netgen::multithread.terminate = 1; netgen::multithread.terminate = 1;
} }
#endif #endif

View File

@ -559,6 +559,7 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh& aMesh,
#ifdef WITH_SMESH_CANCEL_COMPUTE #ifdef WITH_SMESH_CANCEL_COMPUTE
void NETGENPlugin_NETGEN_2D_ONLY::CancelCompute() void NETGENPlugin_NETGEN_2D_ONLY::CancelCompute()
{ {
SMESH_Algo::CancelCompute();
netgen::multithread.terminate = 1; netgen::multithread.terminate = 1;
} }
#endif #endif

View File

@ -559,6 +559,7 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
#ifdef WITH_SMESH_CANCEL_COMPUTE #ifdef WITH_SMESH_CANCEL_COMPUTE
void NETGENPlugin_NETGEN_3D::CancelCompute() void NETGENPlugin_NETGEN_3D::CancelCompute()
{ {
SMESH_Algo::CancelCompute();
netgen::multithread.terminate = 1; netgen::multithread.terminate = 1;
} }
#endif #endif