mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-06-30 12:14:08 +03:00
7e785937b3
Progress indication mechanism is refactored to support incrementing progress within multithreaded algorithms. The class Message_ProgressIndicator is only an interface to the user application. It accumulates the progress provided by progress scopes. The counter is protected by mutex for thread-safety. The new class Message_ProgressScope replacing Message_ProgressSentry should be used to advance the progress. The scopes are nested to each other to reflect the nested nature of operations. The new class Message_ProgressRange should be used to pass the progress to sub-scopes. All OCCT algorithms involving progress indication have been updated to new API. Improvements in Draw_ProgressIndicator: - Separate console mode has been added in order to make possible to put the progress into std::cout instead or in addition to the draw interpreter, instead of trigger option "-tclOutput". - Treatment of Ctrl-Break signal has been added. Now any operation can be aborted by Ctrl-C or Ctrl-Break keystroke. Added new test case 'perf fclasses progr_par' for testing of parallel work of the progress.
132 lines
4.4 KiB
C++
132 lines
4.4 KiB
C++
// Created on: 1995-01-03
|
|
// Created by: Frederic MAUPAS
|
|
// Copyright (c) 1995-1999 Matra Datavision
|
|
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
|
//
|
|
// This file is part of Open CASCADE Technology software library.
|
|
//
|
|
// This library is free software; you can redistribute it and/or modify it under
|
|
// the terms of the GNU Lesser General Public License version 2.1 as published
|
|
// by the Free Software Foundation, with special exception defined in the file
|
|
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
|
|
// distribution for complete text of the license and disclaimer of any warranty.
|
|
//
|
|
// Alternatively, this file may be used under the terms of Open CASCADE
|
|
// commercial license or contractual agreement.
|
|
|
|
//: gka 09.04.99: S4136: improving tolerance management
|
|
|
|
#include <BRep_Builder.hxx>
|
|
#include <Message_ProgressScope.hxx>
|
|
#include <StdFail_NotDone.hxx>
|
|
#include <StepShape_ConnectedFaceSet.hxx>
|
|
#include <StepShape_FaceSurface.hxx>
|
|
#include <StepToTopoDS_NMTool.hxx>
|
|
#include <StepToTopoDS_Tool.hxx>
|
|
#include <StepToTopoDS_TranslateFace.hxx>
|
|
#include <StepToTopoDS_TranslateShell.hxx>
|
|
#include <TopoDS.hxx>
|
|
#include <TopoDS_Face.hxx>
|
|
#include <TopoDS_Shape.hxx>
|
|
#include <TopoDS_Shell.hxx>
|
|
#include <Transfer_TransientProcess.hxx>
|
|
|
|
// ============================================================================
|
|
// Method : StepToTopoDS_TranslateShell::StepToTopoDS_TranslateShell
|
|
// Purpose : Empty Constructor
|
|
// ============================================================================
|
|
StepToTopoDS_TranslateShell::StepToTopoDS_TranslateShell()
|
|
: myError(StepToTopoDS_TranslateShellOther)
|
|
{
|
|
done = Standard_False;
|
|
}
|
|
|
|
// ============================================================================
|
|
// Method : Init
|
|
// Purpose : Init with a ConnectedFaceSet and a Tool
|
|
// ============================================================================
|
|
|
|
void StepToTopoDS_TranslateShell::Init
|
|
(const Handle(StepShape_ConnectedFaceSet)& CFS,
|
|
StepToTopoDS_Tool& aTool,
|
|
StepToTopoDS_NMTool& NMTool,
|
|
const Message_ProgressRange& theProgress)
|
|
{
|
|
//bug15697
|
|
if(CFS.IsNull())
|
|
return;
|
|
|
|
if (!aTool.IsBound(CFS)) {
|
|
|
|
BRep_Builder B;
|
|
Handle(Transfer_TransientProcess) TP = aTool.TransientProcess();
|
|
|
|
Standard_Integer NbFc = CFS->NbCfsFaces();
|
|
TopoDS_Shell Sh;
|
|
B.MakeShell(Sh);
|
|
TopoDS_Face F;
|
|
TopoDS_Shape S;
|
|
Handle(StepShape_Face) StepFace;
|
|
|
|
StepToTopoDS_TranslateFace myTranFace;
|
|
myTranFace.SetPrecision(Precision()); //gka
|
|
myTranFace.SetMaxTol(MaxTol());
|
|
|
|
Message_ProgressScope PS ( theProgress, "Face", NbFc);
|
|
for (Standard_Integer i = 1; i <= NbFc && PS.More(); i++, PS.Next()) {
|
|
#ifdef OCCT_DEBUG
|
|
std::cout << "Processing Face : " << i << std::endl;
|
|
#endif
|
|
StepFace = CFS->CfsFacesValue(i);
|
|
Handle(StepShape_FaceSurface) theFS =
|
|
Handle(StepShape_FaceSurface)::DownCast(StepFace);
|
|
if (!theFS.IsNull()) {
|
|
myTranFace.Init(theFS, aTool, NMTool);
|
|
if (myTranFace.IsDone()) {
|
|
S = myTranFace.Value();
|
|
F = TopoDS::Face(S);
|
|
B.Add(Sh, F);
|
|
}
|
|
else { // Warning only + add FaceSurface file Identifier
|
|
TP->AddWarning(theFS, " a Face from Shell not mapped to TopoDS");
|
|
}
|
|
}
|
|
else { // Warning : add identifier
|
|
TP->AddWarning(StepFace, " Face is not of FaceSurface Type; not mapped to TopoDS");
|
|
}
|
|
}
|
|
Sh.Closed (BRep_Tool::IsClosed (Sh));
|
|
myResult = Sh;
|
|
aTool.Bind(CFS, myResult);
|
|
myError = StepToTopoDS_TranslateShellDone;
|
|
done = Standard_True;
|
|
}
|
|
else {
|
|
myResult = TopoDS::Shell(aTool.Find(CFS));
|
|
myError = StepToTopoDS_TranslateShellDone;
|
|
done = Standard_True;
|
|
}
|
|
}
|
|
|
|
// ============================================================================
|
|
// Method : Value
|
|
// Purpose : Return the mapped Shape
|
|
// ============================================================================
|
|
|
|
const TopoDS_Shape& StepToTopoDS_TranslateShell::Value() const
|
|
{
|
|
StdFail_NotDone_Raise_if (!done, "StepToTopoDS_TranslateShell::Value() - no result");
|
|
return myResult;
|
|
}
|
|
|
|
// ============================================================================
|
|
// Method : Error
|
|
// Purpose : Return the TranslateShell Error code
|
|
// ============================================================================
|
|
|
|
StepToTopoDS_TranslateShellError StepToTopoDS_TranslateShell::Error() const
|
|
{
|
|
return myError;
|
|
}
|
|
|