ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Compute Progress bar

Browse Source 
-  int& GetComputeCost() { return _computeCost; }
+  std::vector<SMESH_subMesh*>& SubMeshesToCompute() { return _smToCompute; }
This commit is contained in:
eap 2013-07-09 11:58:41 +00:00
parent f4ec60b8ca
commit a311b5af11
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SMESH/SMESH_Algo.cxx
View File

@ -754,7 +754,6 @@ void SMESH_Algo::InitComputeError()
_badInputElements.clear(); _badInputElements.clear();
_computeCanceled = false; _computeCanceled = false;
_computeCost = 1;
_progressTic = 0; _progressTic = 0;
_progress = 0.; _progress = 0.;
} }
@ -767,9 +766,14 @@ void SMESH_Algo::InitComputeError()
double SMESH_Algo::GetProgressByTic() const double SMESH_Algo::GetProgressByTic() const
{ {
int computeCost = 0;
for ( size_t i = 0; i < _smToCompute.size(); ++i )
computeCost += _smToCompute[i]->GetComputeCost();
const_cast<SMESH_Algo*>( this )->_progressTic++; const_cast<SMESH_Algo*>( this )->_progressTic++;
double x = 5 * _progressTic; double x = 5 * _progressTic;
x = ( x < _computeCost ) ? ( x / _computeCost ) : 1.; x = ( x < computeCost ) ? ( x / computeCost ) : 1.;
return 0.9 * sin( x * M_PI / 2 ); return 0.9 * sin( x * M_PI / 2 );
} }

14
src/SMESH/SMESH_Algo.hxx
View File

@ -235,7 +235,7 @@ class SMESH_EXPORT SMESH_Algo : public SMESH_Hypothesis
*/ */
SMESH_ComputeErrorPtr GetComputeError() const; SMESH_ComputeErrorPtr GetComputeError() const;
/*! /*!
* \brief initialize compute error before call of Compute() * \brief initialize compute error etc. before call of Compute()
*/ */
void InitComputeError(); void InitComputeError();
/*! /*!
@ -243,9 +243,9 @@ class SMESH_EXPORT SMESH_Algo : public SMESH_Hypothesis
*/ */
double GetProgressByTic() const; double GetProgressByTic() const;
/*! /*!
* Return a storage of "compute cost" of shapes being Compute()d. * Return a vector of sub-meshes to Compute()
*/ */
int& GetComputeCost() { return _computeCost; } std::vector<SMESH_subMesh*>& SubMeshesToCompute() { return _smToCompute; }
public: public:
// ================================================================== // ==================================================================
@ -421,9 +421,11 @@ protected:
std::list<const SMDS_MeshElement*> _badInputElements; //!< to explain COMPERR_BAD_INPUT_MESH std::list<const SMDS_MeshElement*> _badInputElements; //!< to explain COMPERR_BAD_INPUT_MESH
volatile bool _computeCanceled; //!< is set to True while computing to stop it volatile bool _computeCanceled; //!< is set to True while computing to stop it
int _computeCost; //!< "compute cost" of shapes being Compute()d
int _progressTic; //!< counter of calls from SMESH_Mesh::GetComputeProgress() double _progress; /* progress of Compute() [0.,1.],
double _progress; //!< progress of Compute() [0.,1.] to be set by an algo really tracking the progress */
int _progressTic; // counter of calls from SMESH_Mesh::GetComputeProgress()
std::vector<SMESH_subMesh*> _smToCompute; // sub-meshes to Compute()
}; };