-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// for correct work of GetProgress():
netgen::multithread.percent = 0.;
netgen::multithread.task = "Volume meshing";
- _optimizationStarted = false;
+ _progressByTic = -1.;
list<const SMESHDS_Hypothesis*>::const_iterator itl;
const SMESHDS_Hypothesis* theHyp;
const TopoDS_Shape& aShape)
{
netgen::multithread.terminate = 0;
+ _progressByTic = -1.;
SMESHDS_Mesh* meshDS = aMesh.GetMeshDS();
const int invalid_ID = -1;
netgen::multithread.terminate = 0;
+ _progressByTic = -1.;
SMESH_MesherHelper::MType MeshType = aHelper->IsQuadraticMesh();
if ( MeshType == SMESH_MesherHelper::COMP )
double res;
const char* volMeshing = "Volume meshing";
const char* dlnMeshing = "Delaunay meshing";
- if ( !_optimizationStarted &&
+ const double meshingRatio = 0.15;
+ const_cast<NETGENPlugin_NETGEN_3D*>( this )->_progressTic++;
+
+ if ( _progressByTic < 0. &&
( strncmp( netgen::multithread.task, dlnMeshing, 3 ) == 0 ||
strncmp( netgen::multithread.task, volMeshing, 3 ) == 0 ))
{
- res = 0.001 + 0.5 * netgen::multithread.percent / 100.; // [0., 0.5]
+ res = 0.001 + meshingRatio * netgen::multithread.percent / 100.;
+ //cout << netgen::multithread.task << " " <<_progressTic << "-" << netgen::multithread.percent << endl;
}
else // different otimizations
{
- ((NETGENPlugin_NETGEN_3D*)this)->_optimizationStarted = true;
- res = 0.5 + 0.5 * SMESH_Algo::GetProgressByTic(); // [0.5, 1.]
+ if ( _progressByTic < 0. )
+ ((NETGENPlugin_NETGEN_3D*)this)->_progressByTic = meshingRatio / _progressTic;
+ res = _progressByTic * _progressTic;
+ //cout << netgen::multithread.task << " " << _progressTic << " " << res << endl;
}
- return res;
+ return Min ( res, 0.98 );
}
//=============================================================================