#include <gp_Hypr.hxx>
#include <gp_Lin.hxx>
#include <gp_Parab.hxx>
-#include <Message_ProgressIndicator.hxx>
-#include <Message_ProgressSentry.hxx>
+#include <Message_ProgressScope.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_Failure.hxx>
#include <Standard_OutOfRange.hxx>
//purpose :
//=======================================================================
-void GeomTools_CurveSet::Write (Standard_OStream& OS,
- const Handle(Message_ProgressIndicator)& theProgress)const
+void GeomTools_CurveSet::Write(Standard_OStream& OS, const Message_ProgressRange& theProgress)const
{
std::streamsize prec = OS.precision(17);
Standard_Integer i, nbcurve = myMap.Extent();
OS << "Curves "<< nbcurve << "\n";
- //OCC19559
- Message_ProgressSentry PS(theProgress, "3D Curves", 0, nbcurve, 1);
- for (i = 1; i <= nbcurve && PS.More(); i++, PS.Next()) {
+ Message_ProgressScope aPS(theProgress, "3D Curves", nbcurve);
+ for (i = 1; i <= nbcurve && aPS.More(); i++, aPS.Next()) {
PrintCurve(Handle(Geom_Curve)::DownCast(myMap(i)),OS,Standard_True);
}
OS.precision(prec);
//purpose :
//=======================================================================
-void GeomTools_CurveSet::Read (Standard_IStream& IS,
- const Handle(Message_ProgressIndicator)& theProgress)
+void GeomTools_CurveSet::Read(Standard_IStream& IS, const Message_ProgressRange& theProgress)
{
char buffer[255];
IS >> buffer;
Standard_Integer i, nbcurve;
IS >> nbcurve;
- //OCC19559
- Message_ProgressSentry PS(theProgress, "3D Curves", 0, nbcurve, 1);
- for (i = 1; i <= nbcurve && PS.More(); i++, PS.Next()) {
+ Message_ProgressScope aPS(theProgress, "3D Curves", nbcurve);
+ for (i = 1; i <= nbcurve && aPS.More(); i++, aPS.Next()) {
Handle(Geom_Curve) C = GeomTools_CurveSet::ReadCurve (IS);
myMap.Add(C);
}