mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-26 10:19:45 +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.
247 lines
8.4 KiB
C++
247 lines
8.4 KiB
C++
// 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.
|
|
|
|
//#71 rln 09.03.99: S4135: new class _TrsfModification and method ::ScaleShape
|
|
// abv 08.05.99: S4190: new class and method ConvertToRevolution
|
|
// gka 01.08.99 S4188 : new class and method LimitDegreeShape
|
|
// abv 16.06.99 general function ApplyModifier() implemented
|
|
// gka 21.06.99 general LimitDegreeShape renamed to BSplineRestriction
|
|
// szv 03.01.01 PositiveCones merged with DirectFaces
|
|
#include <ShapeCustom.hxx>
|
|
#include <ShapeCustom_DirectModification.hxx>
|
|
#include <ShapeCustom_TrsfModification.hxx>
|
|
#include <ShapeCustom_ConvertToRevolution.hxx>
|
|
#include <ShapeCustom_BSplineRestriction.hxx>
|
|
#include <ShapeCustom_ConvertToBSpline.hxx>
|
|
#include <ShapeCustom_SweptToElementary.hxx>
|
|
|
|
#include <gp_Trsf.hxx>
|
|
#include <GeomAbs_Shape.hxx>
|
|
#include <TopoDS_Shape.hxx>
|
|
#include <TopoDS_Compound.hxx>
|
|
#include <TopoDS_Iterator.hxx>
|
|
#include <BRep_Builder.hxx>
|
|
#include <BRepTools_Modifier.hxx>
|
|
#include <ShapeBuild_ReShape.hxx>
|
|
#include <Standard_ErrorHandler.hxx>
|
|
|
|
#include <Message_ProgressScope.hxx>
|
|
|
|
//=======================================================================
|
|
//function : ApplyModifier
|
|
//purpose : static
|
|
//=======================================================================
|
|
|
|
TopoDS_Shape ShapeCustom::ApplyModifier (const TopoDS_Shape &S,
|
|
const Handle(BRepTools_Modification) &M,
|
|
TopTools_DataMapOfShapeShape &context,
|
|
BRepTools_Modifier& MD,
|
|
const Message_ProgressRange& theProgress,
|
|
const Handle(ShapeBuild_ReShape) & aReShape)
|
|
{
|
|
// protect against INTERNAL/EXTERNAL shapes
|
|
TopoDS_Shape SF = S.Oriented(TopAbs_FORWARD);
|
|
|
|
// Process COMPOUNDs separately in order to handle sharing in assemblies
|
|
if ( SF.ShapeType() == TopAbs_COMPOUND ) {
|
|
Standard_Boolean locModified = Standard_False;
|
|
TopoDS_Compound C;
|
|
BRep_Builder B;
|
|
B.MakeCompound ( C );
|
|
|
|
Standard_Integer aShapeCount = SF.NbChildren();
|
|
Message_ProgressScope aPS(theProgress, "Applying Modifier For Solids", aShapeCount);
|
|
for ( TopoDS_Iterator it(SF); it.More() && aPS.More(); it.Next()) {
|
|
TopoDS_Shape shape = it.Value();
|
|
TopLoc_Location L = shape.Location(), nullLoc;
|
|
shape.Location ( nullLoc );
|
|
TopoDS_Shape res;
|
|
Message_ProgressRange aRange = aPS.Next();
|
|
if ( context.IsBound ( shape ) )
|
|
res = context.Find ( shape ).Oriented ( shape.Orientation() );
|
|
else
|
|
res = ApplyModifier ( shape, M, context ,MD, aRange);
|
|
|
|
if ( ! res.IsSame ( shape ) ) {
|
|
context.Bind ( shape, res );
|
|
locModified = Standard_True;
|
|
}
|
|
res.Location ( L );
|
|
B.Add ( C, res );
|
|
}
|
|
|
|
if ( !aPS.More() )
|
|
{
|
|
// Was cancelled
|
|
return S;
|
|
}
|
|
|
|
if ( ! locModified ) return S;
|
|
context.Bind ( SF, C );
|
|
return C.Oriented ( S.Orientation() );
|
|
}
|
|
|
|
Message_ProgressScope aPS(theProgress, "Modify the Shape", 1);
|
|
// Modify the shape
|
|
MD.Init(SF);
|
|
MD.Perform(M, aPS.Next());
|
|
|
|
if ( !aPS.More() || !MD.IsDone() ) return S;
|
|
if ( !aReShape.IsNull() )
|
|
{
|
|
for(TopoDS_Iterator theIterator(SF,Standard_False);theIterator.More();theIterator.Next())
|
|
{
|
|
const TopoDS_Shape & current = theIterator.Value();
|
|
TopoDS_Shape result;
|
|
try
|
|
{
|
|
OCC_CATCH_SIGNALS
|
|
result = MD.ModifiedShape( current );
|
|
}
|
|
catch (Standard_NoSuchObject const&)
|
|
{
|
|
// the sub shape isn't in the map
|
|
result.Nullify();
|
|
}
|
|
|
|
if (!result.IsNull() && !current.IsSame(result))
|
|
{
|
|
aReShape->Replace(current, result);
|
|
}
|
|
}
|
|
}
|
|
|
|
return MD.ModifiedShape(SF).Oriented(S.Orientation());
|
|
}
|
|
|
|
|
|
//=======================================================================
|
|
//function : DirectFaces
|
|
//purpose :
|
|
//=======================================================================
|
|
|
|
TopoDS_Shape ShapeCustom::DirectFaces (const TopoDS_Shape& S)
|
|
{
|
|
// Create a modification description
|
|
Handle(ShapeCustom_DirectModification) DM =
|
|
new ShapeCustom_DirectModification();
|
|
TopTools_DataMapOfShapeShape context;
|
|
BRepTools_Modifier MD;
|
|
return ApplyModifier ( S, DM, context, MD );
|
|
}
|
|
|
|
|
|
//=======================================================================
|
|
//function : ScaleShape
|
|
//purpose :
|
|
//=======================================================================
|
|
|
|
TopoDS_Shape ShapeCustom::ScaleShape (const TopoDS_Shape& S, const Standard_Real scale)
|
|
{
|
|
// Create a modification description
|
|
gp_Trsf T;
|
|
T.SetScale (gp_Pnt (0, 0, 0), scale);
|
|
Handle(ShapeCustom_TrsfModification) TM = new ShapeCustom_TrsfModification(T);
|
|
TopTools_DataMapOfShapeShape context;
|
|
BRepTools_Modifier MD;
|
|
return ShapeCustom::ApplyModifier ( S, TM, context,MD );
|
|
}
|
|
|
|
|
|
//=======================================================================
|
|
//function : BSplineRestriction
|
|
//purpose :
|
|
//=======================================================================
|
|
|
|
TopoDS_Shape ShapeCustom::BSplineRestriction (const TopoDS_Shape& S, const Standard_Real Tol3d,
|
|
const Standard_Real Tol2d, const Standard_Integer MaxDegree,
|
|
const Standard_Integer MaxNbSegment,
|
|
const GeomAbs_Shape Continuity3d,
|
|
const GeomAbs_Shape Continuity2d,
|
|
const Standard_Boolean Degree,
|
|
const Standard_Boolean Rational,
|
|
const Handle(ShapeCustom_RestrictionParameters)& aParameters)
|
|
{
|
|
// Create a modification description
|
|
|
|
Handle(ShapeCustom_BSplineRestriction) BSR = new ShapeCustom_BSplineRestriction();
|
|
BSR->SetTol3d(Tol3d);
|
|
BSR->SetTol2d(Tol2d);
|
|
BSR->SetMaxDegree(MaxDegree);
|
|
BSR->SetMaxNbSegments(MaxNbSegment);
|
|
BSR->SetContinuity3d(Continuity3d);
|
|
BSR->SetContinuity2d(Continuity2d);
|
|
BSR->SetPriority(Degree);
|
|
BSR->SetConvRational(Rational);
|
|
BSR->SetRestrictionParameters(aParameters);
|
|
// Modify the shape
|
|
TopTools_DataMapOfShapeShape context;
|
|
BRepTools_Modifier MD;
|
|
return ShapeCustom::ApplyModifier ( S, BSR, context ,MD);
|
|
}
|
|
|
|
|
|
//=======================================================================
|
|
//function : ConvertToRevolution
|
|
//purpose :
|
|
//=======================================================================
|
|
|
|
TopoDS_Shape ShapeCustom::ConvertToRevolution (const TopoDS_Shape& S)
|
|
{
|
|
// Create a modification description
|
|
Handle(ShapeCustom_ConvertToRevolution) CRev =
|
|
new ShapeCustom_ConvertToRevolution();
|
|
TopTools_DataMapOfShapeShape context;
|
|
BRepTools_Modifier MD;
|
|
return ShapeCustom::ApplyModifier ( S, CRev, context,MD );
|
|
}
|
|
|
|
|
|
//=======================================================================
|
|
//function : SweptToElementary
|
|
//purpose :
|
|
//=======================================================================
|
|
|
|
TopoDS_Shape ShapeCustom::SweptToElementary (const TopoDS_Shape& S)
|
|
{
|
|
// Create a modification description
|
|
Handle(ShapeCustom_SweptToElementary) SE =
|
|
new ShapeCustom_SweptToElementary();
|
|
TopTools_DataMapOfShapeShape context;
|
|
BRepTools_Modifier MD;
|
|
return ShapeCustom::ApplyModifier(S,SE,context,MD);
|
|
}
|
|
|
|
|
|
//=======================================================================
|
|
//function : ConvertToBSpline
|
|
//purpose :
|
|
//=======================================================================
|
|
|
|
TopoDS_Shape ShapeCustom::ConvertToBSpline (const TopoDS_Shape& S,
|
|
const Standard_Boolean extrMode,
|
|
const Standard_Boolean revolMode,
|
|
const Standard_Boolean offsetMode,
|
|
const Standard_Boolean planeMode)
|
|
{
|
|
// Create a modification description
|
|
Handle(ShapeCustom_ConvertToBSpline) BSRev = new ShapeCustom_ConvertToBSpline();
|
|
BSRev->SetExtrusionMode(extrMode);
|
|
BSRev->SetRevolutionMode(revolMode);
|
|
BSRev->SetOffsetMode(offsetMode);
|
|
BSRev->SetPlaneMode(planeMode);
|
|
TopTools_DataMapOfShapeShape context;
|
|
BRepTools_Modifier MD;
|
|
return ShapeCustom::ApplyModifier ( S, BSRev, context, MD);
|
|
}
|