#include <TopTools_MapOfShape.hxx>
#include <TopoDS_Iterator.hxx>
+#include "SMESH_TryCatch.hxx" // include after OCCT headers!
+
#include "Utils_ExceptHandlers.hxx"
#include <boost/thread/thread.hpp>
bool theAutoDimension)
throw(SALOME_Exception)
{
- Unexpect aCatch(SalomeException);
+ SMESH_TRY;
DriverMED_W_SMESHDS_Mesh myWriter;
myWriter.SetFile ( file, MED::EVersion(theVersion) );
}
// Perform export
myWriter.Perform();
+
+ SMESH_CATCH( SMESH::throwSalomeEx );
}
//================================================================================
currentSubIds.Add( smToCompute[i]->GetId() );
}
double rate = algo->GetProgress();
- if ( !( 0. < rate && rate < 1.001 ))
+ if ( 0. < rate && rate < 1.001 )
+ {
+ computedCost += rate * ( algoDoneCost + algoNotDoneCost );
+ }
+ else
{
rate = algo->GetProgressByTic();
+ computedCost += algoDoneCost + rate * algoNotDoneCost;
}
// cout << "rate: "<<rate << " algoNotDoneCost: " << algoNotDoneCost << endl;
- computedCost += algoDoneCost + rate * algoNotDoneCost;
}
// get cost of already treated sub-meshes