ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress bar

Browse Source 
+  virtual double GetProgress() const;
This commit is contained in:
eap 2013-07-23 12:52:05 +00:00
parent a71e83346d
commit 72ea55dd02
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
View File

@ -125,24 +125,38 @@ bool NETGENPlugin_NETGEN_2D::CheckHypothesis (SMESH_Mesh& aMesh,
bool NETGENPlugin_NETGEN_2D::Compute(SMESH_Mesh& aMesh, bool NETGENPlugin_NETGEN_2D::Compute(SMESH_Mesh& aMesh,
const TopoDS_Shape& aShape) const TopoDS_Shape& aShape)
{ {
#ifdef WITH_SMESH_CANCEL_COMPUTE
netgen::multithread.terminate = 0; netgen::multithread.terminate = 0;
#endif
NETGENPlugin_Mesher mesher(&aMesh, aShape, /*is3D = */false); NETGENPlugin_Mesher mesher(&aMesh, aShape, /*is3D = */false);
mesher.SetParameters(dynamic_cast<const NETGENPlugin_Hypothesis*>(_hypothesis)); mesher.SetParameters(dynamic_cast<const NETGENPlugin_Hypothesis*>(_hypothesis));
mesher.SetParameters(dynamic_cast<const NETGENPlugin_SimpleHypothesis_2D*>(_hypothesis)); mesher.SetParameters(dynamic_cast<const NETGENPlugin_SimpleHypothesis_2D*>(_hypothesis));
mesher.SetViscousLayers2DAssigned( _isViscousLayers2D ); mesher.SetViscousLayers2DAssigned( _isViscousLayers2D );
mesher.SetSelfPointer( &_mesher );
return mesher.Compute(); return mesher.Compute();
} }
#ifdef WITH_SMESH_CANCEL_COMPUTE //=============================================================================
/*!
* Terminate Compute()
*/
//=============================================================================
void NETGENPlugin_NETGEN_2D::CancelCompute() void NETGENPlugin_NETGEN_2D::CancelCompute()
{ {
SMESH_Algo::CancelCompute(); SMESH_Algo::CancelCompute();
netgen::multithread.terminate = 1; netgen::multithread.terminate = 1;
} }
#endif
//================================================================================
/*!
* \brief Return progress of Compute() [0.,1]
*/
//================================================================================
double NETGENPlugin_NETGEN_2D::GetProgress() const
{
return _mesher ? _mesher->GetProgress(this, &_progressTic) : 0;
}
//============================================================================= //=============================================================================
/*! /*!

10
src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
View File

@ -34,8 +34,8 @@
#include "SMESH_Algo.hxx" #include "SMESH_Algo.hxx"
#include "SMESH_Mesh.hxx" #include "SMESH_Mesh.hxx"
#include "StdMeshers_MaxElementVolume.hxx"
#include "Utils_SALOME_Exception.hxx" class NETGENPlugin_Mesher;
class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D: public SMESH_2D_Algo class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D: public SMESH_2D_Algo
{ {
@ -50,9 +50,10 @@ public:
virtual bool Compute(SMESH_Mesh& aMesh, virtual bool Compute(SMESH_Mesh& aMesh,
const TopoDS_Shape& aShape); const TopoDS_Shape& aShape);
#ifdef WITH_SMESH_CANCEL_COMPUTE
virtual void CancelCompute(); virtual void CancelCompute();
#endif
virtual double GetProgress() const;
virtual bool Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape, virtual bool Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape,
MapShapeNbElems& aResMap); MapShapeNbElems& aResMap);
@ -60,6 +61,7 @@ public:
protected: protected:
const SMESHDS_Hypothesis* _hypothesis; const SMESHDS_Hypothesis* _hypothesis;
bool _isViscousLayers2D; bool _isViscousLayers2D;
NETGENPlugin_Mesher * _mesher;
}; };
#endif #endif