OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-21 10:13:43 +03:00
Code

0022746: Progress indicator in ShapeHealing

Browse Source
This commit is contained in:
KGV and DBV 2011-11-18 14:51:14 +00:00 committed by bugmaster
parent ffe74e4685
commit b485ee79ca
23 changed files with 515 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/IGESControl/IGESControl_ActorWrite.cxx
View File

@ -53,7 +53,8 @@ Handle(Transfer_Binder) IGESControl_ActorWrite::Transfer
Standard_Real maxTol = Interface_Static::RVal("read.maxprecision.val"); Standard_Real maxTol = Interface_Static::RVal("read.maxprecision.val");
shape = XSAlgo::AlgoContainer()->ProcessShape( shape, Tol, maxTol, shape = XSAlgo::AlgoContainer()->ProcessShape( shape, Tol, maxTol,
"write.iges.resource.name", "write.iges.resource.name",
"write.iges.sequence", info ); "write.iges.sequence", info,
FP->GetProgress() );
// modified by NIZHNY-EAP Tue Aug 29 11:17:01 2000 ___END___ // modified by NIZHNY-EAP Tue Aug 29 11:17:01 2000 ___END___
BRepToIGES_BREntity BR0; BR0.SetModel(modl); BR0.SetTransferProcess(FP); BRepToIGES_BREntity BR0; BR0.SetModel(modl); BR0.SetTransferProcess(FP);

3
src/IGESControl/IGESControl_Writer.cxx
View File

@ -101,7 +101,8 @@ Standard_Boolean IGESControl_Writer::AddShape (const TopoDS_Shape& theShape)
Standard_Real maxTol = Interface_Static::RVal("read.maxprecision.val"); Standard_Real maxTol = Interface_Static::RVal("read.maxprecision.val");
TopoDS_Shape Shape = XSAlgo::AlgoContainer()->ProcessShape( theShape, Tol, maxTol, TopoDS_Shape Shape = XSAlgo::AlgoContainer()->ProcessShape( theShape, Tol, maxTol,
"write.iges.resource.name", "write.iges.resource.name",
"write.iges.sequence", info ); "write.iges.sequence", info,
progress );
// modified by NIZHNY-EAP Tue Aug 29 11:17:01 2000 ___END___ // modified by NIZHNY-EAP Tue Aug 29 11:17:01 2000 ___END___
Handle(IGESData_IGESEntity) ent; Handle(IGESData_IGESEntity) ent;
BRepToIGES_BREntity B0; B0.SetTransferProcess(theTP); B0.SetModel(themod); BRepToIGES_BREntity B0; B0.SetTransferProcess(theTP); B0.SetModel(themod);

30
src/IGESToBRep/IGESToBRep_Actor.cxx
View File

@ -1,27 +1,28 @@
#include <Standard_ErrorHandler.hxx>
#include <IGESToBRep_Actor.ixx> #include <IGESToBRep_Actor.ixx>
#include <Standard_Failure.hxx>
#include <IGESToBRep.hxx> #include <IGESToBRep.hxx>
#include <IGESData_IGESEntity.hxx> #include <IGESData_IGESEntity.hxx>
#include <IGESData_IGESModel.hxx> #include <IGESData_IGESModel.hxx>
#include <IGESData_GlobalSection.hxx> #include <IGESData_GlobalSection.hxx>
#include <IGESToBRep_CurveAndSurface.hxx> #include <IGESToBRep_CurveAndSurface.hxx>
#include <BRepLib.hxx>
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx>
#include <ShapeExtend_Explorer.hxx>
#include <ShapeFix_ShapeTolerance.hxx>
#include <Interface_Macros.hxx> #include <Interface_Macros.hxx>
#include <Interface_Static.hxx> #include <Interface_Static.hxx>
#include <TopoDS_Shape.hxx> #include <Message_ProgressSentry.hxx>
#include <TopoDS_Shape.hxx>
#include <TransferBRep.hxx> #include <TransferBRep.hxx>
#include <TransferBRep_ShapeBinder.hxx> #include <TransferBRep_ShapeBinder.hxx>
#include <XSAlgo.hxx> #include <XSAlgo.hxx>
#include <XSAlgo_AlgoContainer.hxx> #include <XSAlgo_AlgoContainer.hxx>
#include <ShapeFix_ShapeTolerance.hxx>
#include <BRepLib.hxx>
#include <ShapeExtend_Explorer.hxx>
//======================================================================= //=======================================================================
//function : IGESToBRep_Actor //function : IGESToBRep_Actor
@ -144,6 +145,10 @@ Handle(Transfer_Binder) IGESToBRep_Actor::Transfer
(typnum == 402 && (fornum == 1 || fornum == 7|| (typnum == 402 && (fornum == 1 || fornum == 7||
fornum == 14 || fornum == 15)) || fornum == 14 || fornum == 15)) ||
(typnum == 408) || (typnum == 308)) { (typnum == 408) || (typnum == 308)) {
// Start progress scope (no need to check if progress exists -- it is safe)
Message_ProgressSentry aPSentry(TP->GetProgress(), "Transfer stage", 0, 2, 1);
XSAlgo::AlgoContainer()->PrepareForTransfer(); XSAlgo::AlgoContainer()->PrepareForTransfer();
IGESToBRep_CurveAndSurface CAS; IGESToBRep_CurveAndSurface CAS;
CAS.SetModel(mymodel); CAS.SetModel(mymodel);
@ -176,15 +181,18 @@ Handle(Transfer_Binder) IGESToBRep_Actor::Transfer
} }
} }
// Switch to fix stage.
aPSentry.Next();
// fixing shape // fixing shape
// shape = XSAlgo::AlgoContainer()->PerformFixShape( shape, TP, theeps, CAS.GetMaxTol() );
Handle(Standard_Transient) info; Handle(Standard_Transient) info;
shape = XSAlgo::AlgoContainer()->ProcessShape( shape, theeps, CAS.GetMaxTol(), shape = XSAlgo::AlgoContainer()->ProcessShape( shape, theeps, CAS.GetMaxTol(),
"read.iges.resource.name", "read.iges.resource.name",
"read.iges.sequence", info ); "read.iges.sequence", info,
TP->GetProgress() );
XSAlgo::AlgoContainer()->MergeTransferInfo(TP, info, nbTPitems); XSAlgo::AlgoContainer()->MergeTransferInfo(TP, info, nbTPitems);
} }
// if (!shape.IsNull()) TransferBRep::SameParameter (shape,Standard_False,eps);
ShapeExtend_Explorer SBE; ShapeExtend_Explorer SBE;
if (SBE.ShapeType(shape,Standard_True) != TopAbs_SHAPE) { if (SBE.ShapeType(shape,Standard_True) != TopAbs_SHAPE) {
if (!shape.IsNull()) { if (!shape.IsNull()) {

3
src/IGESToBRep/IGESToBRep_Reader.cxx
View File

@ -545,7 +545,8 @@ Standard_Boolean IGESToBRep_Reader::Transfer(const Standard_Integer num)
Handle(Standard_Transient) info; Handle(Standard_Transient) info;
shape = XSAlgo::AlgoContainer()->ProcessShape( shape, eps*CAS.GetUnitFactor(), CAS.GetMaxTol(), shape = XSAlgo::AlgoContainer()->ProcessShape( shape, eps*CAS.GetUnitFactor(), CAS.GetMaxTol(),
"read.iges.resource.name", "read.iges.resource.name",
"read.iges.sequence", info ); "read.iges.sequence", info,
theProc->GetProgress() );
XSAlgo::AlgoContainer()->MergeTransferInfo(theProc, info, nbTPitems); XSAlgo::AlgoContainer()->MergeTransferInfo(theProc, info, nbTPitems);
ShapeExtend_Explorer SBE; ShapeExtend_Explorer SBE;

25
src/STEPControl/STEPControl_ActorRead.cxx
View File

@ -810,9 +810,10 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
Handle(Standard_Transient) info; Handle(Standard_Transient) info;
// IMPORTANT: any fixing on non-manifold topology must be done after the shape is transferred from STEP // IMPORTANT: any fixing on non-manifold topology must be done after the shape is transferred from STEP
TopoDS_Shape fixedResult = TopoDS_Shape fixedResult =
XSAlgo::AlgoContainer()->ProcessShape(comp, myPrecision, myMaxTol, XSAlgo::AlgoContainer()->ProcessShape( comp, myPrecision, myMaxTol,
"read.step.resource.name", "read.step.resource.name",
"read.step.sequence", info); "read.step.sequence", info,
TP->GetProgress() );
XSAlgo::AlgoContainer()->MergeTransferInfo(TP, info, nbTPitems); XSAlgo::AlgoContainer()->MergeTransferInfo(TP, info, nbTPitems);
BRep_Builder brepBuilder; BRep_Builder brepBuilder;
@ -1187,6 +1188,10 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
} }
myShapeBuilder.SetPrecision(myPrecision); myShapeBuilder.SetPrecision(myPrecision);
myShapeBuilder.SetMaxTol(myMaxTol); myShapeBuilder.SetMaxTol(myMaxTol);
// Start progress scope (no need to check if progress exists -- it is safe)
Message_ProgressSentry aPSentry(TP->GetProgress(), "Transfer stage", 0, 2, 1);
try { try {
OCC_CATCH_SIGNALS OCC_CATCH_SIGNALS
if (start->IsKind(STANDARD_TYPE(StepShape_FacetedBrep))) { if (start->IsKind(STANDARD_TYPE(StepShape_FacetedBrep))) {
@ -1228,15 +1233,18 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
return shbinder; return shbinder;
} }
aPSentry.Next();
if (found && myShapeBuilder.IsDone()) { if (found && myShapeBuilder.IsDone()) {
mappedShape = myShapeBuilder.Value(); mappedShape = myShapeBuilder.Value();
// Apply ShapeFix (on manifold shapes only. Non-manifold topology is processed separately: ssv; 13.11.2010) // Apply ShapeFix (on manifold shapes only. Non-manifold topology is processed separately: ssv; 13.11.2010)
if (isManifold) { if (isManifold) {
Handle(Standard_Transient) info; Handle(Standard_Transient) info;
mappedShape = mappedShape =
XSAlgo::AlgoContainer()->ProcessShape(mappedShape, myPrecision, myMaxTol, XSAlgo::AlgoContainer()->ProcessShape( mappedShape, myPrecision, myMaxTol,
"read.step.resource.name", "read.step.resource.name",
"read.step.sequence", info); "read.step.sequence", info,
TP->GetProgress() );
XSAlgo::AlgoContainer()->MergeTransferInfo(TP, info, nbTPitems); XSAlgo::AlgoContainer()->MergeTransferInfo(TP, info, nbTPitems);
} }
} }
@ -1365,8 +1373,9 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
Handle(Standard_Transient) info; Handle(Standard_Transient) info;
TopoDS_Shape shape = XSAlgo::AlgoContainer()->ProcessShape( S, myPrecision, myMaxTol, TopoDS_Shape shape = XSAlgo::AlgoContainer()->ProcessShape( S, myPrecision, myMaxTol,
"read.step.resource.name", "read.step.resource.name",
"read.step.sequence", info ); "read.step.sequence", info,
TP->GetProgress() );
// TopoDS_Shape shape = XSAlgo::AlgoContainer()->PerformFixShape( S, TP, myPrecision, myMaxTol ); // TopoDS_Shape shape = XSAlgo::AlgoContainer()->PerformFixShape( S, TP, myPrecision, myMaxTol );
if ( shape != S ) if ( shape != S )
sb->SetResult ( shape ); sb->SetResult ( shape );

3
src/STEPControl/STEPControl_ActorWrite.cxx
View File

@ -863,7 +863,8 @@ Handle(Transfer_Binder) STEPControl_ActorWrite::TransferShape (const Handle(Tran
if (isManifold) if (isManifold)
aShape = XSAlgo::AlgoContainer()->ProcessShape(xShape, Tol, maxTol, aShape = XSAlgo::AlgoContainer()->ProcessShape(xShape, Tol, maxTol,
"write.step.resource.name", "write.step.resource.name",
"write.step.sequence", info); "write.step.sequence", info,
FP->GetProgress() );
else else
aShape = xShape; aShape = xShape;

5
src/SWDRAW/SWDRAW.cxx
View File

@ -32,6 +32,8 @@
#include <XSAlgo.hxx> #include <XSAlgo.hxx>
#include <XSAlgo_AlgoContainer.hxx> #include <XSAlgo_AlgoContainer.hxx>
#include <Draw_ProgressIndicator.hxx>
static int dejadraw = 0; static int dejadraw = 0;
//======================================================================= //=======================================================================
@ -168,8 +170,9 @@ static Standard_Integer NSPApply (Draw_Interpretor& di, Standard_Integer argc, c
XSAlgo::AlgoContainer()->PrepareForTransfer(); XSAlgo::AlgoContainer()->PrepareForTransfer();
Handle(Standard_Transient) info; // reserved for special uses Handle(Standard_Transient) info; // reserved for special uses
Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (di, 1);
newshape = XSAlgo::AlgoContainer()->ProcessShape newshape = XSAlgo::AlgoContainer()->ProcessShape
( shape, tol, maxtol, argv[3] , argv[4] , info); ( shape, tol, maxtol, argv[3] , argv[4] , info, aProgress);
// WHAT IS MISSING HERE IS MERGING with starting transfer map // WHAT IS MISSING HERE IS MERGING with starting transfer map
if (newshape.IsNull()) { if (newshape.IsNull()) {

5
src/SWDRAW/SWDRAW_ShapeFix.cxx
View File

@ -44,6 +44,8 @@
#include <TopTools_DataMapOfShapeListOfShape.hxx> #include <TopTools_DataMapOfShapeListOfShape.hxx>
#include <TopAbs_State.hxx> #include <TopAbs_State.hxx>
#include <Draw_ProgressIndicator.hxx>
#ifdef AIX #ifdef AIX
#include <strings.h> #include <strings.h>
#endif #endif
@ -438,7 +440,8 @@ static Standard_Integer fixshape (Draw_Interpretor& di, Standard_Integer argc, c
return 1; return 1;
} }
sfs->Perform(); Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (di, 1);
sfs->Perform (aProgress);
DBRep::Set (res,sfs->Shape()); DBRep::Set (res,sfs->Shape());
if ( mess ) { if ( mess ) {

57
src/ShapeFix/ShapeFix.cdl
View File

@ -4,15 +4,14 @@
-- <det@nnov.matra-dtv.fr> -- <det@nnov.matra-dtv.fr>
---Copyright: Matra Datavision 1998 ---Copyright: Matra Datavision 1998
package ShapeFix package ShapeFix
---Purpose: This package provides algorithms for fixing ---Purpose: This package provides algorithms for fixing
-- problematic (violating Open CASCADE requirements) shapes. -- problematic (violating Open CASCADE requirements) shapes.
-- Tools from package ShapeAnalysis are used for detecting the problems. The -- Tools from package ShapeAnalysis are used for detecting the problems. The
-- detecting and fixing is done taking in account various -- detecting and fixing is done taking in account various
-- criteria implemented in BRepCheck package. -- criteria implemented in BRepCheck package.
-- Each class of package ShapeFix deals with one -- Each class of package ShapeFix deals with one
-- certain type of shapes or with some family of problems. -- certain type of shapes or with some family of problems.
uses uses
@ -47,31 +46,31 @@ is
---Purpose: Fixing different problems on edge ---Purpose: Fixing different problems on edge
class Wire; class Wire;
---Purpose: Fixing different problems with wires ---Purpose: Fixing different problems with wires
class Face; class Face;
---Purpose: Fixing problems with face (orientation of wires and wrong wires) ---Purpose: Fixing problems with face (orientation of wires and wrong wires)
class FixSmallFace; class FixSmallFace;
---Purpose: Fixing face with small size ---Purpose: Fixing face with small size
class WireVertex; class WireVertex;
---Purpose: Fixing disconnected edges in the wire ---Purpose: Fixing disconnected edges in the wire
class Wireframe; class Wireframe;
---Purpose: Provides methods to fix wireframe of shape ---Purpose: Provides methods to fix wireframe of shape
class FreeBounds; class FreeBounds;
---Purpose: Fixing free bounds of the shape (connecting open wires) ---Purpose: Fixing free bounds of the shape (connecting open wires)
class FaceConnect; class FaceConnect;
---Purpose: Rebuilds connectivity between faces in shell ---Purpose: Rebuilds connectivity between faces in shell
class Shell; class Shell;
---Purpose: Fixing orientation of faces in shell ---Purpose: Fixing orientation of faces in shell
class Solid; class Solid;
---Purpose: Creating solid from shell and orienting it to have finite volume ---Purpose: Creating solid from shell and orienting it to have finite volume
class ShapeTolerance; class ShapeTolerance;
---Purpose: Modifying shape tolerances ---Purpose: Modifying shape tolerances
@ -87,21 +86,18 @@ is
class SplitCommonVertex; class SplitCommonVertex;
---Purpose: Splits vertex which is common for two wires ---Purpose: Splits vertex which is common for two wires
-- (for writing into STEP) -- (for writing into STEP)
class WireSegment; class WireSegment;
---Purpose: Auxiliary class (data storage) for ComposeShell ---Purpose: Auxiliary class (data storage) for ComposeShell
class IntersectionTool; class IntersectionTool;
---Purpose: Tool for fixing selfintersecting wire ---Purpose: Tool for fixing selfintersecting wire
-- and intersecting wires -- and intersecting wires
--class OverlappingTool; now it is in package OverlapShape of Products
---Purpose: Tool for fixing overlapping
class SplitTool; class SplitTool;
---Purpose: Tool for splitting and cutting edges; incudes methods ---Purpose: Tool for splitting and cutting edges; incudes methods
-- used in OverlappingTool and IntersectionTool -- used in OverlappingTool and IntersectionTool
class SequenceOfWireSegment instantiates Sequence from TCollection class SequenceOfWireSegment instantiates Sequence from TCollection
(WireSegment from ShapeFix); (WireSegment from ShapeFix);
@ -110,9 +106,10 @@ is
(Shape from TopoDS, Box2d from Bnd, ShapeMapHasher from TopTools); (Shape from TopoDS, Box2d from Bnd, ShapeMapHasher from TopTools);
SameParameter (shape : Shape from TopoDS; SameParameter (shape : Shape from TopoDS;
enforce: Boolean; enforce : Boolean;
preci : Real = 0.0) preci : Real = 0.0;
theProgress : ProgressIndicator from Message = 0)
returns Boolean; returns Boolean;
---Purpose : Runs SameParameter from BRepLib with these adaptations : ---Purpose : Runs SameParameter from BRepLib with these adaptations :
-- <enforce> forces computations, else they are made only on -- <enforce> forces computations, else they are made only on
@ -121,25 +118,27 @@ is
-- Tolerance -- Tolerance
-- Returns True when done, False if an exception has been raised -- Returns True when done, False if an exception has been raised
-- In case of exception anyway, as many edges as possible have -- In case of exception anyway, as many edges as possible have
-- been processed -- been processed. The passed progress indicator allows user
-- to consult the current progress stage and abort algorithm
-- if needed.
EncodeRegularity (shape: Shape from TopoDS; tolang: Real = 1.0e-10); EncodeRegularity (shape: Shape from TopoDS; tolang: Real = 1.0e-10);
---Purpose : Runs EncodeRegularity from BRepLib taking into account ---Purpose : Runs EncodeRegularity from BRepLib taking into account
-- shared components of assemblies, so that each component -- shared components of assemblies, so that each component
-- is processed only once -- is processed only once
RemoveSmallEdges (shape: in out Shape from TopoDS; Tolerance: Real; context: in out ReShape from ShapeBuild) RemoveSmallEdges (shape: in out Shape from TopoDS; Tolerance: Real; context: in out ReShape from ShapeBuild)
returns Shape from TopoDS; returns Shape from TopoDS;
---Purpose: Removes edges which are less than given tolerance from shape ---Purpose: Removes edges which are less than given tolerance from shape
-- with help of ShapeFix_Wire::FixSmall() -- with help of ShapeFix_Wire::FixSmall()
FixVertexPosition(theshape: in out Shape from TopoDS; FixVertexPosition(theshape: in out Shape from TopoDS;
theTolerance: Real; theTolerance: Real;
thecontext: ReShape from ShapeBuild) returns Boolean; thecontext: ReShape from ShapeBuild) returns Boolean;
---Purpose: Fix position of the vertices having tolerance more tnan specified one.; ---Purpose: Fix position of the vertices having tolerance more tnan specified one.;
LeastEdgeSize(theshape: in out Shape from TopoDS) returns Real; LeastEdgeSize(theshape: in out Shape from TopoDS) returns Real;
---Purpose: Calculate size of least edge; ---Purpose: Calculate size of least edge;
end ShapeFix; end ShapeFix;

187
src/ShapeFix/ShapeFix.cxx
View File

@ -59,6 +59,7 @@
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <Message_ProgressSentry.hxx>
//======================================================================= //=======================================================================
//function : SameParameter //function : SameParameter
@ -67,8 +68,19 @@
Standard_Boolean ShapeFix::SameParameter(const TopoDS_Shape& shape, Standard_Boolean ShapeFix::SameParameter(const TopoDS_Shape& shape,
const Standard_Boolean enforce, const Standard_Boolean enforce,
const Standard_Real preci) const Standard_Real preci,
const Handle(Message_ProgressIndicator)& theProgress)
{ {
// Calculate number of edges
Standard_Integer aNbEdges = 0;
for ( TopExp_Explorer anEdgeExp(shape, TopAbs_EDGE); anEdgeExp.More(); anEdgeExp.Next() )
++aNbEdges;
// Calculate number of faces
Standard_Integer aNbFaces = 0;
for ( TopExp_Explorer anEdgeExp(shape, TopAbs_FACE); anEdgeExp.More(); anEdgeExp.Next() )
++aNbFaces;
BRep_Builder B; BRep_Builder B;
//Standard_Integer nbexcp = 0; //Standard_Integer nbexcp = 0;
Standard_Integer nbfail = 0, numedge = 0; Standard_Integer nbfail = 0, numedge = 0;
@ -78,88 +90,118 @@ Standard_Boolean ShapeFix::SameParameter(const TopoDS_Shape& shape,
Handle(ShapeFix_Edge) sfe = new ShapeFix_Edge; Handle(ShapeFix_Edge) sfe = new ShapeFix_Edge;
TopExp_Explorer ex(shape,TopAbs_EDGE); TopExp_Explorer ex(shape,TopAbs_EDGE);
while (ex.More()) { // Start progress scope (no need to check if progress exists -- it is safe)
TopoDS_Edge E; Message_ProgressSentry aPSentry(theProgress, "Fixing same parameter problem", 0, 2, 1);
while (ex.More()) {
numedge ++;
int ierr = 0;
TopLoc_Location loc; //Standard_Real u0,u1; //szv#4:S4163:12Mar99 moved down unused
E = TopoDS::Edge (ex.Current());
ex.Next();
//pdn degenerated edges shuld be samerange and sameparameter. {
//if (BRep_Tool::Degenerated(E)) continue; // ne vaut pas // Start progress scope (no need to check if progress exists -- it is safe)
if (!iatol) tol = BRep_Tool::Tolerance (E); Message_ProgressSentry aPSentry(theProgress, "Fixing edge", 0, aNbEdges, 1);
if (enforce) {
B.SameRange (E,Standard_False);
B.SameParameter (E,Standard_False);
}
//:pdn if (BRep_Tool::SameParameter(E)) continue;
// Handle(Geom_Curve) crv = BRep_Tool::Curve (E,loc,u0,u1);
// if (crv.IsNull()) BRepLib::BuildCurve3d (E,tol);
sfe->FixSameParameter (E); // et non BRepLib:: jusqu a K2-SEP97
if (!BRep_Tool::SameParameter (E)) { ierr = 1; nbfail ++; }
if (ierr) { while ( ex.More() )
status = Standard_False; {
B.SameRange (E,Standard_False); TopoDS_Edge E;
B.SameParameter (E,Standard_False); while ( ex.More() && aPSentry.More() )
} {
numedge ++;
int ierr = 0;
TopLoc_Location loc;
E = TopoDS::Edge (ex.Current());
ex.Next();
} // -- end while if (!iatol)
} tol = BRep_Tool::Tolerance (E);
if (enforce)
{
B.SameRange (E,Standard_False);
B.SameParameter (E,Standard_False);
}
//:i2 abv 21 Aug 98: ProSTEP TR8 Motor.rle face 710: sfe->FixSameParameter (E); // K2-SEP97
// Update tolerance of edges on planes (no pcurves are stored)
for ( TopExp_Explorer exp ( shape, TopAbs_FACE ); exp.More(); exp.Next() ) {
TopoDS_Face face = TopoDS::Face ( exp.Current() );
Handle(Geom_Surface) Surf = BRep_Tool::Surface ( face );
Handle(Geom_Plane) plane = Handle(Geom_Plane)::DownCast ( Surf ); if (!BRep_Tool::SameParameter (E)) { ierr = 1; nbfail ++; }
if ( plane.IsNull() ) {
Handle(Geom_RectangularTrimmedSurface) GRTS = if (ierr)
Handle(Geom_RectangularTrimmedSurface)::DownCast ( Surf ); {
if ( ! GRTS.IsNull() ) status = Standard_False;
plane = Handle(Geom_Plane)::DownCast ( GRTS->BasisSurface() ); B.SameRange (E,Standard_False);
if ( plane.IsNull() ) continue; B.SameParameter (E,Standard_False);
}
// Complete step in current progress scope
aPSentry.Next();
} // -- end while
// Halt algorithm in case of user's abort
if ( !aPSentry.More() )
return Standard_False;
} }
// Handle(ShapeConstruct_ProjectCurveOnSurface) Proj = new ShapeConstruct_ProjectCurveOnSurface; //:k2 abv 16 Dec 98: use existing tool //smh#14 }
// Handle(ShapeAnalysis_Surface) sas = new ShapeAnalysis_Surface ( plane ); // Switch to "Update tolerances" step
// Proj->Init ( sas, Precision::Confusion() ); // projection will be analitic aPSentry.Next();
Handle(GeomAdaptor_HSurface) AS = new GeomAdaptor_HSurface ( plane );
for ( TopExp_Explorer ed ( face, TopAbs_EDGE ); ed.More(); ed.Next() ) {
TopoDS_Edge edge = TopoDS::Edge ( ed.Current() );
Standard_Real f, l;
Handle(Geom_Curve) crv = BRep_Tool::Curve ( edge, f, l );
if ( crv.IsNull() ) continue;
// Handle(Geom2d_Curve) c2d; {
// Proj->Perform ( crv, f, l, c2d ); // Start progress scope (no need to check if progress exists -- it is safe)
Handle(Geom2d_Curve) c2d = BRep_Tool::CurveOnSurface ( edge, face, f, l );; Message_ProgressSentry aPSentry(theProgress, "Update tolerances", 0, aNbFaces, 1);
if ( c2d.IsNull() ) continue;
Handle(Geom2dAdaptor_HCurve) GHPC = new Geom2dAdaptor_HCurve ( c2d, f, l );
Adaptor3d_CurveOnSurface ACS(GHPC,AS);//sas->Adaptor3d());
Standard_Real tol0 = BRep_Tool::Tolerance ( edge ); //:i2 abv 21 Aug 98: ProSTEP TR8 Motor.rle face 710:
tol = tol0; // Update tolerance of edges on planes (no pcurves are stored)
Standard_Real tol2 = tol*tol; for ( TopExp_Explorer exp ( shape, TopAbs_FACE ); exp.More() && aPSentry.More(); exp.Next(), aPSentry.Next() )
const Standard_Integer NCONTROL = 23; {
for ( Standard_Integer i=0; i < NCONTROL; i++ ) { TopoDS_Face face = TopoDS::Face ( exp.Current() );
Standard_Real par = ( f * ( NCONTROL - 1 - i ) + l * i ) / ( NCONTROL - 1 ); Handle(Geom_Surface) Surf = BRep_Tool::Surface ( face );
gp_Pnt pnt = crv->Value ( par );
gp_Pnt prj = ACS.Value( par ); Handle(Geom_Plane) plane = Handle(Geom_Plane)::DownCast ( Surf );
Standard_Real dist = pnt.SquareDistance(prj); if ( plane.IsNull() ) {
if ( tol2 < dist ) tol2 = dist; Handle(Geom_RectangularTrimmedSurface) GRTS =
Handle(Geom_RectangularTrimmedSurface)::DownCast ( Surf );
if ( ! GRTS.IsNull() )
plane = Handle(Geom_Plane)::DownCast ( GRTS->BasisSurface() );
if ( plane.IsNull() )
continue;
} }
tol = 1.00005 * sqrt(tol2); // coeff: see trj3_pm1-ct-203.stp #19681, edge 10
if ( tol >= tol0 ) { Handle(GeomAdaptor_HSurface) AS = new GeomAdaptor_HSurface ( plane );
B.UpdateEdge ( edge, tol ); for ( TopExp_Explorer ed ( face, TopAbs_EDGE ); ed.More(); ed.Next() ) {
for ( TopoDS_Iterator itV(edge); itV.More(); itV.Next() ) { TopoDS_Edge edge = TopoDS::Edge ( ed.Current() );
TopoDS_Shape S = itV.Value(); Standard_Real f, l;
B.UpdateVertex ( TopoDS::Vertex ( S ), tol ); Handle(Geom_Curve) crv = BRep_Tool::Curve ( edge, f, l );
} if ( crv.IsNull() )
continue;
Handle(Geom2d_Curve) c2d = BRep_Tool::CurveOnSurface ( edge, face, f, l );;
if ( c2d.IsNull() ) continue;
Handle(Geom2dAdaptor_HCurve) GHPC = new Geom2dAdaptor_HCurve ( c2d, f, l );
Adaptor3d_CurveOnSurface ACS(GHPC,AS);
Standard_Real tol0 = BRep_Tool::Tolerance(edge);
tol = tol0;
Standard_Real tol2 = tol*tol;
const Standard_Integer NCONTROL = 23;
for ( Standard_Integer i = 0; i < NCONTROL; i++ )
{
Standard_Real par = ( f * ( NCONTROL - 1 - i ) + l * i ) / ( NCONTROL - 1 );
gp_Pnt pnt = crv->Value ( par );
gp_Pnt prj = ACS.Value( par );
Standard_Real dist = pnt.SquareDistance(prj);
if ( tol2 < dist )
tol2 = dist;
}
tol = 1.00005 * sqrt(tol2); // coeff: see trj3_pm1-ct-203.stp #19681, edge 10
if ( tol >= tol0 )
{
B.UpdateEdge ( edge, tol );
for ( TopoDS_Iterator itV(edge); itV.More(); itV.Next() )
{
TopoDS_Shape S = itV.Value();
B.UpdateVertex ( TopoDS::Vertex ( S ), tol );
}
}
} }
// Halt algorithm in case of user's abort
if ( !aPSentry.More() )
return Standard_False;
} }
} }
@ -167,7 +209,6 @@ Standard_Boolean ShapeFix::SameParameter(const TopoDS_Shape& shape,
#ifdef DEB #ifdef DEB
cout<<"** SameParameter not complete. On "<<numedge<<" Edges:"; cout<<"** SameParameter not complete. On "<<numedge<<" Edges:";
if (nbfail > 0) cout<<" "<<nbfail<<" Failed"; if (nbfail > 0) cout<<" "<<nbfail<<" Failed";
//if (nbexcp > 0) cout<<" "<<nbexcp<<" Raised"; //SK original
cout<<endl; cout<<endl;
#endif #endif
} }

14
src/ShapeFix/ShapeFix_Shape.cdl
View File

@ -19,7 +19,8 @@ uses
Edge from ShapeFix, Edge from ShapeFix,
Status from ShapeExtend, Status from ShapeExtend,
MapOfShape from TopTools, MapOfShape from TopTools,
BasicMsgRegistrator from ShapeExtend BasicMsgRegistrator from ShapeExtend,
ProgressIndicator from Message
is is
@ -33,10 +34,17 @@ is
Init (me: mutable; shape: Shape from TopoDS); Init (me: mutable; shape: Shape from TopoDS);
---Purpose: Initislises by shape. ---Purpose: Initislises by shape.
Perform (me: mutable) returns Boolean; Perform (me : mutable;
theProgress : ProgressIndicator from Message = 0) returns Boolean;
---Purpose: Iterates on sub- shape and performs fixes ---Purpose: Iterates on sub- shape and performs fixes
SameParameter (me: mutable; shape: Shape from TopoDS; force: Boolean) is protected; SameParameter (me : mutable;
shape : Shape from TopoDS;
enforce : Boolean;
theProgress : ProgressIndicator from Message = 0) is protected;
---Purpose: Fixes same parameterization problem on the passed shape
-- by updating tolerances of the corresponding topological
-- entitites.
Shape (me) returns Shape from TopoDS; Shape (me) returns Shape from TopoDS;
---Purpose: Returns resulting shape ---Purpose: Returns resulting shape

74
src/ShapeFix/ShapeFix_Shape.cxx
View File

@ -26,6 +26,8 @@
#include <ShapeFix_Shell.hxx> #include <ShapeFix_Shell.hxx>
#include <ShapeFix_Solid.hxx> #include <ShapeFix_Solid.hxx>
#include <Message_ProgressSentry.hxx>
//======================================================================= //=======================================================================
//function : ShapeFix_Shape //function : ShapeFix_Shape
//purpose : //purpose :
@ -81,11 +83,11 @@ void ShapeFix_Shape::Init(const TopoDS_Shape& shape)
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean ShapeFix_Shape::Perform() Standard_Boolean ShapeFix_Shape::Perform(const Handle(Message_ProgressIndicator)& theProgress)
{ {
Standard_Integer savFixSmallAreaWireMode = 0; Standard_Integer savFixSmallAreaWireMode = 0;
Handle(ShapeFix_Face) fft = Handle(ShapeFix_Face)::DownCast ( FixFaceTool() ); Handle(ShapeFix_Face) fft = Handle(ShapeFix_Face)::DownCast( FixFaceTool() );
if ( !fft.IsNull() ) { if ( !fft.IsNull() ) {
savFixSmallAreaWireMode = fft->FixSmallAreaWireMode(); savFixSmallAreaWireMode = fft->FixSmallAreaWireMode();
if ( savFixSmallAreaWireMode == -1 && if ( savFixSmallAreaWireMode == -1 &&
@ -117,41 +119,60 @@ Standard_Boolean ShapeFix_Shape::Perform()
ShapeFix::FixVertexPosition(S,Precision(),Context()); ShapeFix::FixVertexPosition(S,Precision(),Context());
st = S.ShapeType(); st = S.ShapeType();
// Open progress indication scope for the following fix stages:
// - Fix on Solid or Shell;
// - Fix same parameterization;
Message_ProgressSentry aPSentry(theProgress, "Fixing stage", 0, 2, 1);
switch ( st ) { switch ( st ) {
case TopAbs_COMPOUND: case TopAbs_COMPOUND:
case TopAbs_COMPSOLID: { case TopAbs_COMPSOLID: {
TopoDS_Shape shape = myShape; TopoDS_Shape shape = myShape;
Standard_Boolean savFixSameParameterMode = myFixSameParameterMode; Standard_Boolean savFixSameParameterMode = myFixSameParameterMode;
myFixSameParameterMode = Standard_False; myFixSameParameterMode = Standard_False;
for( TopoDS_Iterator iter(S); iter.More(); iter.Next()) {
myShape = iter.Value(); Standard_Integer aShapesNb = 0;
if ( Perform() ) status = Standard_True; for ( TopoDS_Iterator anIter(S); anIter.More(); anIter.Next() )
++aShapesNb;
// Open progress indication scope for sub-shape fixing
Message_ProgressSentry aPSentry(theProgress, "Fixing sub-shape", 0, aShapesNb, 1);
for ( TopoDS_Iterator anIter(S); anIter.More() && aPSentry.More(); anIter.Next(), aPSentry.Next() )
{
myShape = anIter.Value();
if ( Perform(theProgress) )
status = Standard_True;
} }
if ( !aPSentry.More() )
return Standard_False; // aborted execution
myFixSameParameterMode = savFixSameParameterMode; myFixSameParameterMode = savFixSameParameterMode;
myShape = shape; myShape = shape;
// myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE5 );
break; break;
} }
case TopAbs_SOLID: { case TopAbs_SOLID: {
if ( ! NeedFix ( myFixSolidMode ) ) break; if ( !NeedFix(myFixSolidMode) )
break;
myFixSolid->Init(TopoDS::Solid(S)); myFixSolid->Init(TopoDS::Solid(S));
myFixSolid->SetContext(Context()); myFixSolid->SetContext(Context());
if(myFixSolid->Perform()) {
// Context()->Replace(S,myFixSolid->Solid()); if ( myFixSolid->Perform(theProgress) )
status = Standard_True; status = Standard_True;
}
myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE4 ); myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE4 );
break; break;
} }
case TopAbs_SHELL: { case TopAbs_SHELL: {
if ( ! NeedFix ( myFixShellMode ) ) break; if ( !NeedFix(myFixShellMode) )
break;
Handle(ShapeFix_Shell) sfsh = FixShellTool(); Handle(ShapeFix_Shell) sfsh = FixShellTool();
sfsh->Init(TopoDS::Shell(S)); sfsh->Init( TopoDS::Shell(S) );
sfsh->SetContext(Context()); sfsh->SetContext( Context() );
if(sfsh->Perform()) {
// Context()->Replace(S,sfsh->Shell()); if ( sfsh->Perform(theProgress) )
status = Standard_True; status = Standard_True;
}
myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE4 ); myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE4 );
break; break;
} }
@ -162,8 +183,8 @@ Standard_Boolean ShapeFix_Shape::Perform()
sff->FixWireTool()->ModifyTopologyMode() = Standard_True; sff->FixWireTool()->ModifyTopologyMode() = Standard_True;
sff->Init(TopoDS::Face(S)); sff->Init(TopoDS::Face(S));
sff->SetContext(Context()); sff->SetContext(Context());
if(sff->Perform()) { if(sff->Perform()) {
// Context()->Replace(S,sff->Face());
status = Standard_True; status = Standard_True;
} }
sff->FixWireTool()->ModifyTopologyMode() = savTopoMode; sff->FixWireTool()->ModifyTopologyMode() = savTopoMode;
@ -178,7 +199,6 @@ Standard_Boolean ShapeFix_Shape::Perform()
sfw->ModifyTopologyMode() = Standard_True; sfw->ModifyTopologyMode() = Standard_True;
if ( ! S.Closed() ) if ( ! S.Closed() )
sfw->ClosedWireMode() = Standard_False; sfw->ClosedWireMode() = Standard_False;
// sfw->FixEdgeCurvesMode() =0;
sfw->SetFace(TopoDS_Face()); sfw->SetFace(TopoDS_Face());
sfw->Load(TopoDS::Wire(S)); sfw->Load(TopoDS::Wire(S));
sfw->SetContext(Context()); sfw->SetContext(Context());
@ -202,9 +222,15 @@ Standard_Boolean ShapeFix_Shape::Perform()
default : break; default : break;
} }
myResult = Context()->Apply(S); // Switch to the second progress indication scope if it exists
if ( NeedFix ( myFixSameParameterMode ) ) aPSentry.Next();
SameParameter (myResult,Standard_False);
myResult = Context()->Apply(S);
if ( NeedFix(myFixSameParameterMode) )
{
SameParameter(myResult, Standard_False, theProgress);
}
if ( !fft.IsNull() ) if ( !fft.IsNull() )
fft->FixSmallAreaWireMode() = savFixSmallAreaWireMode; fft->FixSmallAreaWireMode() = savFixSmallAreaWireMode;
@ -217,9 +243,11 @@ Standard_Boolean ShapeFix_Shape::Perform()
//purpose : //purpose :
//======================================================================= //=======================================================================
void ShapeFix_Shape::SameParameter(const TopoDS_Shape& sh, const Standard_Boolean enforce) void ShapeFix_Shape::SameParameter(const TopoDS_Shape& sh,
const Standard_Boolean enforce,
const Handle(Message_ProgressIndicator)& theProgress)
{ {
ShapeFix::SameParameter(sh, enforce); ShapeFix::SameParameter(sh, enforce, 0.0, theProgress);
} }
//======================================================================= //=======================================================================

72
src/ShapeFix/ShapeFix_Shell.cdl
View File

@ -16,7 +16,9 @@ uses
Shape from TopoDS, Shape from TopoDS,
Status from ShapeExtend, Status from ShapeExtend,
BasicMsgRegistrator from ShapeExtend, BasicMsgRegistrator from ShapeExtend,
Face from ShapeFix Face from ShapeFix,
ProgressIndicator from Message
is is
Create returns Shell from ShapeFix; Create returns Shell from ShapeFix;
@ -29,33 +31,36 @@ is
Init (me: mutable; shell: Shell from TopoDS); Init (me: mutable; shell: Shell from TopoDS);
---Purpose: Initializes by shell. ---Purpose: Initializes by shell.
Perform (me: mutable) returns Boolean; Perform (me: mutable;
---Purpose: Iterates on subshapes and performs fixes theProgress : ProgressIndicator from Message = 0) returns Boolean;
-- (for each face calls ShapeFix_Face::Perform and ---Purpose: Iterates on subshapes and performs fixes
-- then calls FixFaceOrientation) -- (for each face calls ShapeFix_Face::Perform and
-- then calls FixFaceOrientation). The passed progress
-- indicator allows user to consult the current progress
-- stage and abort algorithm if needed.
FixFaceOrientation (me : mutable; shell : Shell from TopoDS; FixFaceOrientation (me : mutable; shell : Shell from TopoDS;
isAccountMultiConex : Boolean = Standard_True; isAccountMultiConex : Boolean = Standard_True;
NonManifold : Boolean = Standard_False ) returns Boolean; NonManifold : Boolean = Standard_False ) returns Boolean;
---Purpose: Fixes orientation of faces in shell. ---Purpose: Fixes orientation of faces in shell.
-- Changes orientation of face in the shell, if it is oriented opposite -- Changes orientation of face in the shell, if it is oriented opposite
-- to neigbouring faces. If it is not possible to orient all faces in the -- to neigbouring faces. If it is not possible to orient all faces in the
-- shell (like in case of mebious band), this method orients only subset -- shell (like in case of mebious band), this method orients only subset
-- of faces. Other faces are stored in Error compound. -- of faces. Other faces are stored in Error compound.
-- Modes : -- Modes :
-- isAccountMultiConex - mode for account cases of multiconnexity. -- isAccountMultiConex - mode for account cases of multiconnexity.
-- If this mode is equal to Standard_True, separate shells will be created -- If this mode is equal to Standard_True, separate shells will be created
-- in the cases of multiconnexity. If this mode is equal to Standard_False, -- in the cases of multiconnexity. If this mode is equal to Standard_False,
-- one shell will be created without account of multiconnexity.By defautt - Standard_True; -- one shell will be created without account of multiconnexity.By defautt - Standard_True;
-- NonManifold - mode for creation of non-manifold shells. -- NonManifold - mode for creation of non-manifold shells.
-- If this mode is equal to Standard_True one non-manifold will be created from shell -- If this mode is equal to Standard_True one non-manifold will be created from shell
-- contains multishared edges. Else if this mode is equal to Standard_False only -- contains multishared edges. Else if this mode is equal to Standard_False only
-- manifold shells will be created. By default - Standard_False. -- manifold shells will be created. By default - Standard_False.
-- --
---Returns: If resulting shell is ok returns TRUE, else returns FALSE. ---Returns: If resulting shell is ok returns TRUE, else returns FALSE.
---Status : OK - faces in shall were oriented correcty. ---Status : OK - faces in shall were oriented correcty.
-- DONE - faces in shell oriented succesfully -- DONE - faces in shell oriented succesfully
-- FAIL - faces orientation process has been failed -- FAIL - faces orientation process has been failed
Shell(me : mutable) returns Shell from TopoDS; Shell(me : mutable) returns Shell from TopoDS;
---Purpose: Returns fixed shell (or subset of oriented faces). ---Purpose: Returns fixed shell (or subset of oriented faces).
@ -74,10 +79,10 @@ is
FixFaceTool (me:mutable) returns Face from ShapeFix; FixFaceTool (me:mutable) returns Face from ShapeFix;
---Purpose: Returns tool for fixing faces. ---Purpose: Returns tool for fixing faces.
---C++:inline ---C++:inline
SetMsgRegistrator (me: mutable; msgreg: BasicMsgRegistrator from ShapeExtend) is redefined; SetMsgRegistrator (me: mutable; msgreg: BasicMsgRegistrator from ShapeExtend) is redefined;
---Purpose: Sets message registrator ---Purpose: Sets message registrator
SetPrecision (me: mutable; preci: Real) is redefined; SetPrecision (me: mutable; preci: Real) is redefined;
---Purpose: Sets basic precision value (also to FixWireTool) ---Purpose: Sets basic precision value (also to FixWireTool)
@ -90,15 +95,15 @@ is
FixFaceMode (me: mutable) returns Integer; FixFaceMode (me: mutable) returns Integer;
---C++: return & ---C++: return &
---C++: inline ---C++: inline
---Purpose: Returns (modifiable) the mode for applying fixes of ---Purpose: Returns (modifiable) the mode for applying fixes of
-- ShapeFix_Face, by default True. -- ShapeFix_Face, by default True.
FixOrientationMode (me: mutable) returns Integer; FixOrientationMode (me: mutable) returns Integer;
---C++: return & ---C++: return &
---C++: inline ---C++: inline
---Purpose: Returns (modifiable) the mode for applying ---Purpose: Returns (modifiable) the mode for applying
-- FixFaceOrientation, by default True. -- FixFaceOrientation, by default True.
fields fields
@ -108,5 +113,6 @@ fields
myFixFace : Face from ShapeFix is protected; myFixFace : Face from ShapeFix is protected;
myFixFaceMode : Integer is protected; myFixFaceMode : Integer is protected;
myFixOrientationMode : Integer is protected; myFixOrientationMode : Integer is protected;
myNbShells : Integer is protected; myNbShells : Integer is protected;
end Shell; end Shell;

39
src/ShapeFix/ShapeFix_Shell.cxx
View File

@ -33,6 +33,7 @@
#include <ShapeExtend.hxx> #include <ShapeExtend.hxx>
#include <ShapeBuild_ReShape.hxx> #include <ShapeBuild_ReShape.hxx>
#include <Message_Msg.hxx> #include <Message_Msg.hxx>
#include <Message_ProgressSentry.hxx>
#include <TopTools_DataMapOfShapeInteger.hxx> #include <TopTools_DataMapOfShapeInteger.hxx>
#include <TopTools_DataMapOfShapeInteger.hxx> #include <TopTools_DataMapOfShapeInteger.hxx>
#include <TopTools_DataMapOfShapeInteger.hxx> #include <TopTools_DataMapOfShapeInteger.hxx>
@ -93,26 +94,40 @@ void ShapeFix_Shell::Init(const TopoDS_Shell& shell)
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean ShapeFix_Shell::Perform() Standard_Boolean ShapeFix_Shell::Perform(const Handle(Message_ProgressIndicator)& theProgress)
{ {
Standard_Boolean status = Standard_False; Standard_Boolean status = Standard_False;
if(Context().IsNull()) if ( Context().IsNull() )
SetContext ( new ShapeBuild_ReShape ); SetContext(new ShapeBuild_ReShape);
myFixFace->SetContext(Context()); myFixFace->SetContext(Context());
if ( NeedFix ( myFixFaceMode ) ) {
TopoDS_Shape S = Context()->Apply ( myShell ); if ( NeedFix(myFixFaceMode) )
for( TopoDS_Iterator iter(S); iter.More(); iter.Next()) { {
TopoDS_Shape S = Context()->Apply(myShell);
// Get the number of faces for progress indication
Standard_Integer aNbFaces = 0;
for ( TopExp_Explorer aFaceExp(S, TopAbs_FACE); aFaceExp.More(); aFaceExp.Next() )
++aNbFaces;
// Start progress scope (no need to check if progress exists -- it is safe)
Message_ProgressSentry aPSentry(theProgress, "Fixing face", 0, aNbFaces, 1);
for( TopoDS_Iterator iter(S); iter.More() && aPSentry.More(); iter.Next(), aPSentry.Next() )
{
TopoDS_Shape sh = iter.Value(); TopoDS_Shape sh = iter.Value();
TopoDS_Face tmpFace = TopoDS::Face(sh); TopoDS_Face tmpFace = TopoDS::Face(sh);
myFixFace->Init(tmpFace); myFixFace->Init(tmpFace);
// myFixFace->SetPrecision(Precision()); if ( myFixFace->Perform() )
if(myFixFace->Perform()) { {
// if(!Context().IsNull()) status = Standard_True;
// Context()->Replace(tmpFace,myFixFace->Face()); myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE1 );
status = Standard_True;
myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE1 );
} }
} }
// Halt algorithm in case of user's abort
if ( !aPSentry.More() )
return Standard_False;
} }
TopoDS_Shape newsh = Context()->Apply(myShell); TopoDS_Shape newsh = Context()->Apply(myShell);
if ( NeedFix ( myFixOrientationMode) ) if ( NeedFix ( myFixOrientationMode) )

32
src/ShapeFix/ShapeFix_Solid.cdl
View File

@ -17,7 +17,8 @@ uses
Shape from TopoDS, Shape from TopoDS,
Shell from ShapeFix, Shell from ShapeFix,
Status from ShapeExtend, Status from ShapeExtend,
BasicMsgRegistrator from ShapeExtend BasicMsgRegistrator from ShapeExtend,
ProgressIndicator from Message
is is
Create returns Solid from ShapeFix; Create returns Solid from ShapeFix;
@ -29,9 +30,12 @@ is
Init(me: mutable; solid : Solid from TopoDS) is virtual; Init(me: mutable; solid : Solid from TopoDS) is virtual;
---Purpose: Initializes by solid . ---Purpose: Initializes by solid .
Perform(me: mutable) returns Boolean is virtual; Perform(me: mutable;
theProgress : ProgressIndicator from Message = 0) returns Boolean is virtual;
---Purpose: Iterates on shells and performs fixes ---Purpose: Iterates on shells and performs fixes
-- (calls ShapeFix_Shell for each subshell) -- (calls ShapeFix_Shell for each subshell). The passed
-- progress indicator allows user to consult the current
-- progress stage and abort algorithm if needed.
SolidFromShell (me: mutable; shell: Shell from TopoDS) SolidFromShell (me: mutable; shell: Shell from TopoDS)
returns Solid from TopoDS; returns Solid from TopoDS;
@ -45,10 +49,10 @@ is
FixShellTool (me) returns Shell from ShapeFix; FixShellTool (me) returns Shell from ShapeFix;
---Purpose: Returns tool for fixing shells. ---Purpose: Returns tool for fixing shells.
---C++:inline ---C++:inline
SetMsgRegistrator (me: mutable; msgreg: BasicMsgRegistrator from ShapeExtend) is redefined; SetMsgRegistrator (me: mutable; msgreg: BasicMsgRegistrator from ShapeExtend) is redefined;
---Purpose: Sets message registrator ---Purpose: Sets message registrator
SetPrecision (me: mutable; preci: Real) is redefined; SetPrecision (me: mutable; preci: Real) is redefined;
---Purpose: Sets basic precision value (also to FixShellTool) ---Purpose: Sets basic precision value (also to FixShellTool)
@ -61,17 +65,17 @@ is
FixShellMode (me: mutable) returns Integer; FixShellMode (me: mutable) returns Integer;
---C++: return & ---C++: return &
---C++: inline ---C++: inline
---Purpose: Returns (modifiable) the mode for applying fixes of ---Purpose: Returns (modifiable) the mode for applying fixes of
-- ShapeFix_Shell, by default True. -- ShapeFix_Shell, by default True.
CreateOpenSolidMode(me: mutable) returns Boolean; CreateOpenSolidMode(me: mutable) returns Boolean;
---C++: return & ---C++: return &
---C++: inline ---C++: inline
---Purpose: Returns (modifiable) the mode for creation of solids. ---Purpose: Returns (modifiable) the mode for creation of solids.
-- If mode myCreateOpenSolidMode is equal to true -- If mode myCreateOpenSolidMode is equal to true
-- solids are created from open shells -- solids are created from open shells
-- else solids are created from closed shells only. -- else solids are created from closed shells only.
-- ShapeFix_Shell, by default False. -- ShapeFix_Shell, by default False.
Shape(me : mutable) returns Shape from TopoDS; Shape(me : mutable) returns Shape from TopoDS;
---Purpose: In case of multiconnexity returns compound of fixed solids ---Purpose: In case of multiconnexity returns compound of fixed solids
-- else returns one solid. -- else returns one solid.

63
src/ShapeFix/ShapeFix_Solid.cxx
View File

@ -44,6 +44,7 @@
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TopTools_IndexedDataMapOfShapeShape.hxx> #include <TopTools_IndexedDataMapOfShapeShape.hxx>
#include <Message_Msg.hxx> #include <Message_Msg.hxx>
#include <Message_ProgressSentry.hxx>
#include <TopoDS_Vertex.hxx> #include <TopoDS_Vertex.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
@ -51,7 +52,6 @@
#include <Geom_Curve.hxx> #include <Geom_Curve.hxx>
#include <ShapeAnalysis_FreeBounds.hxx> #include <ShapeAnalysis_FreeBounds.hxx>
//====================================================== //======================================================
//function : ShapeFix_Solid //function : ShapeFix_Solid
//purpose : //purpose :
@ -341,36 +341,55 @@ static Standard_Boolean CreateSolids(const TopoDS_Shape aShape,TopTools_IndexedM
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean ShapeFix_Solid::Perform() Standard_Boolean ShapeFix_Solid::Perform(const Handle(Message_ProgressIndicator)& theProgress)
{ {
Standard_Boolean status = Standard_False; Standard_Boolean status = Standard_False;
if(Context().IsNull()) if ( Context().IsNull() )
SetContext ( new ShapeBuild_ReShape ); SetContext ( new ShapeBuild_ReShape );
myFixShell->SetContext(Context()); myFixShell->SetContext(Context());
Standard_Integer NbShells =0;
TopoDS_Shape S = Context()->Apply ( myShape );
if ( NeedFix ( myFixShellMode ) ) {
// call FixShell Standard_Integer NbShells = 0;
for( TopoDS_Iterator iter(S); iter.More(); iter.Next()) { TopoDS_Shape S = Context()->Apply ( myShape );
TopoDS_Shape sh = iter.Value();
if(sh.ShapeType() != TopAbs_SHELL) // Calculate number of underlying shells
continue; Standard_Integer aNbShells = 0;
myFixShell->Init(TopoDS::Shell(sh)); for ( TopExp_Explorer aExpSh(S, TopAbs_SHELL); aExpSh.More(); aExpSh.Next() )
if(myFixShell->Perform()) { aNbShells++;
// Context()->Replace(sh,myFixShell->Shell());
// Start progress scope (no need to check if progress exists -- it is safe)
Message_ProgressSentry aPSentry(theProgress, "Fixing solid stage", 0, 2, 1);
if ( NeedFix(myFixShellMode) )
{
// Start progress scope (no need to check if progress exists -- it is safe)
Message_ProgressSentry aPSentry(theProgress, "Fixing shell", 0, aNbShells, 1);
// Fix shell by shell using ShapeFix_Shell tool
for ( TopExp_Explorer aExpSh(S, TopAbs_SHELL); aExpSh.More() && aPSentry.More(); aExpSh.Next(), aPSentry.Next() )
{
TopoDS_Shape sh = aExpSh.Current();
myFixShell->Init( TopoDS::Shell(sh) );
if ( myFixShell->Perform(theProgress) )
{
status = Standard_True; status = Standard_True;
myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE1 ); myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE1 );
} }
NbShells+= myFixShell->NbShells(); NbShells+= myFixShell->NbShells();
} }
// Halt algorithm in case of user's abort
if ( !aPSentry.More() )
return Standard_False;
} }
else { else
for(TopExp_Explorer aExpSh(myShape,TopAbs_SHELL); aExpSh.More(); aExpSh.Next()) {
NbShells++; NbShells = aNbShells;
} }
//if(!status) return status;
// Switch to the second stage
aPSentry.Next();
if(NbShells ==1) { if(NbShells ==1) {
TopoDS_Shape tmpShape = Context()->Apply(myShape); TopoDS_Shape tmpShape = Context()->Apply(myShape);
@ -441,7 +460,11 @@ Standard_Boolean ShapeFix_Solid::Perform()
BRep_Builder aB; BRep_Builder aB;
TopoDS_Compound aComp; TopoDS_Compound aComp;
aB.MakeCompound(aComp); aB.MakeCompound(aComp);
for(Standard_Integer i =1; i <= aMapSolids.Extent(); i++) { Message_ProgressSentry aPSentry(theProgress, "Creating solid",
0, aMapSolids.Extent(), 1);
for(Standard_Integer i =1; (i <= aMapSolids.Extent()) && (aPSentry.More());
i++, aPSentry.Next())
{
TopoDS_Shape aResSh =aMapSolids.FindKey(i); TopoDS_Shape aResSh =aMapSolids.FindKey(i);
if(aResShape.ShapeType() == TopAbs_SHELL && myCreateOpenSolidMode) { if(aResShape.ShapeType() == TopAbs_SHELL && myCreateOpenSolidMode) {
aResSh.Closed(Standard_False); aResSh.Closed(Standard_False);
@ -456,6 +479,8 @@ Standard_Boolean ShapeFix_Solid::Perform()
aB.Add(aComp,aResSh); aB.Add(aComp,aResSh);
} }
if ( !aPSentry.More() )
return Standard_False; // aborted execution
Context()->Replace(aResShape,aComp); Context()->Replace(aResShape,aComp);
} }
} }

3
src/ShapeProcess/ShapeProcess.cxx
View File

@ -118,7 +118,8 @@ Standard_Boolean ShapeProcess::Perform (const Handle(ShapeProcess_Context)& cont
context->SetScope ( oper.ToCString() ); context->SetScope ( oper.ToCString() );
try { try {
OCC_CATCH_SIGNALS OCC_CATCH_SIGNALS
op->Perform ( context ); if ( !op->Perform(context) )
return Standard_False;
} }
catch (Standard_Failure) { catch (Standard_Failure) {
Message_Msg SMSG2 ("Sequence.MSG2"); //Operator %s failed with exception %s Message_Msg SMSG2 ("Sequence.MSG2"); //Operator %s failed with exception %s

20
src/ShapeProcess/ShapeProcess_Context.cdl
View File

@ -16,10 +16,11 @@ class Context from ShapeProcess inherits TShared from MMgt
uses uses
Manager from Resource, Manager from Resource,
AsciiString from TCollection, AsciiString from TCollection,
HSequenceOfHAsciiString from TColStd, HSequenceOfHAsciiString from TColStd,
Messenger from Message Messenger from Message,
ProgressIndicator from Message
is is
@ -76,6 +77,12 @@ is
Messenger (me) returns Messenger from Message; Messenger (me) returns Messenger from Message;
---Purpose : Returns Messenger used for outputting messages. ---Purpose : Returns Messenger used for outputting messages.
SetProgress (me: mutable; theProgress: ProgressIndicator from Message);
---Purpose : Sets Progress Indicator.
Progress (me) returns ProgressIndicator from Message;
---Purpose : Returns Progress Indicator.
SetTraceLevel (me: mutable; tracelev: Integer); SetTraceLevel (me: mutable; tracelev: Integer);
---Purpose : Sets trace level used for outputting messages ---Purpose : Sets trace level used for outputting messages
-- - 0: no trace at all -- - 0: no trace at all
@ -89,9 +96,10 @@ is
fields fields
myRC: Manager from Resource; myRC: Manager from Resource;
myScope: HSequenceOfHAsciiString from TColStd; myScope: HSequenceOfHAsciiString from TColStd;
myMessenger: Messenger from Message; myMessenger: Messenger from Message;
myTraceLev : Integer; myProgress: ProgressIndicator from Message;
myTraceLev: Integer;
end Context; end Context;

20
src/ShapeProcess/ShapeProcess_Context.cxx
View File

@ -353,6 +353,26 @@ Handle(Message_Messenger) ShapeProcess_Context::Messenger () const
return myMessenger; return myMessenger;
} }
//=======================================================================
//function : SetProgress
//purpose :
//=======================================================================
void ShapeProcess_Context::SetProgress (const Handle(Message_ProgressIndicator)& progress)
{
myProgress = progress;
}
//=======================================================================
//function : Progress
//purpose :
//=======================================================================
Handle(Message_ProgressIndicator) ShapeProcess_Context::Progress() const
{
return myProgress;
}
//======================================================================= //=======================================================================
//function : SetTraceLevel //function : SetTraceLevel
//purpose : //purpose :

10
src/ShapeProcess/ShapeProcess_OperLibrary.cxx
View File

@ -13,6 +13,8 @@
#include <BRepLib.hxx> #include <BRepLib.hxx>
#include <Message_MsgFile.hxx> #include <Message_MsgFile.hxx>
#include <Message_ProgressIndicator.hxx>
#include <ShapeExtend_MsgRegistrator.hxx> #include <ShapeExtend_MsgRegistrator.hxx>
#include <ShapeProcess.hxx> #include <ShapeProcess.hxx>
#include <ShapeProcess_UOperator.hxx> #include <ShapeProcess_UOperator.hxx>
@ -109,7 +111,7 @@ static Standard_Boolean directfaces (const Handle(ShapeProcess_Context)& context
TopoDS_Shape res = ShapeProcess_OperLibrary::ApplyModifier ( ctx->Result(), ctx, DM, map ); TopoDS_Shape res = ShapeProcess_OperLibrary::ApplyModifier ( ctx->Result(), ctx, DM, map );
ctx->RecordModification ( map ); ctx->RecordModification ( map );
ctx->SetResult ( res ); ctx->SetResult ( res );
return 0; return Standard_True;
} }
@ -623,7 +625,11 @@ static Standard_Boolean fixshape (const Handle(ShapeProcess_Context)& context)
sfw->FixNonAdjacentIntersectingEdgesMode() = ctx->IntegerVal ( "FixNonAdjacentIntersectingEdgesMode", -1 ); sfw->FixNonAdjacentIntersectingEdgesMode() = ctx->IntegerVal ( "FixNonAdjacentIntersectingEdgesMode", -1 );
sfs->Init(ctx->Result()); sfs->Init(ctx->Result());
sfs->Perform(); sfs->Perform(ctx->Progress());
if ( !ctx->Progress().IsNull() && ctx->Progress()->UserBreak() )
return Standard_False;
TopoDS_Shape result = sfs->Shape(); TopoDS_Shape result = sfs->Shape();
if ( result != ctx->Result() ) { if ( result != ctx->Result() ) {
ctx->RecordModification ( sfs->Context(), msg ); ctx->RecordModification ( sfs->Context(), msg );

9
src/XSAlgo/XSAlgo.cdl
View File

@ -18,15 +18,16 @@ uses
ShapeExtend, ShapeExtend,
ShapeAnalysis, ShapeAnalysis,
ShapeFix, ShapeFix,
Transfer Transfer,
Message
is is
enumeration Caller is enumeration Caller is
---Purpose: Identifies the caller of the algorithm ---Purpose: Identifies the caller of the algorithm
DEFAULT, DEFAULT,
IGES, IGES,
STEP STEP
end Caller; end Caller;
class ToolContainer; class ToolContainer;

115
src/XSAlgo/XSAlgo_AlgoContainer.cdl
View File

@ -11,18 +11,19 @@ class AlgoContainer from XSAlgo inherits TShared from MMgt
uses uses
Curve from Geom2d, Curve from Geom2d,
Surface from Geom, Surface from Geom,
Edge from TopoDS, Edge from TopoDS,
Face from TopoDS, Face from TopoDS,
Shape from TopoDS, Shape from TopoDS,
Caller from XSAlgo, Caller from XSAlgo,
ToolContainer from XSAlgo, ToolContainer from XSAlgo,
WireData from ShapeExtend, WireData from ShapeExtend,
Wire from ShapeAnalysis, Wire from ShapeAnalysis,
Wire from ShapeFix, Wire from ShapeFix,
TransientProcess from Transfer, TransientProcess from Transfer,
FinderProcess from Transfer FinderProcess from Transfer,
ProgressIndicator from Message
is is
@ -40,65 +41,59 @@ is
PrepareForTransfer (me) is virtual; PrepareForTransfer (me) is virtual;
---Purpose: Performs actions necessary for preparing environment ---Purpose: Performs actions necessary for preparing environment
-- for transfer. Empty in Open version. -- for transfer. Empty in Open version.
-- PerformFixShape (me; shape : Shape from TopoDS; ProcessShape (me; shape:
-- TP : TransientProcess from Transfer; Shape from TopoDS;
-- Prec, MaxTol: Real) Prec, MaxTol: Real;
-- returns Shape from TopoDS is virtual; rscfile: CString;
---Purpose: Applies fixes to the shape resulting from transfer, seq: CString;
-- and updates map of entity-shape in TP in accordance with info: out Transient;
-- substitutions made during fixes (if any) progress: ProgressIndicator from Message = 0)
ProcessShape (me; shape: Shape from TopoDS;
Prec, MaxTol: Real;
rscfile: CString;
seq: CString;
info: out Transient)
returns Shape from TopoDS is virtual; returns Shape from TopoDS is virtual;
---Purpose: Does shape processing with specified tolerances ---Purpose: Does shape processing with specified tolerances
-- and returns resulting shape and associated information -- and returns resulting shape and associated information
-- in the form of Transient. -- in the form of Transient.
-- This information should be later transmitted to -- This information should be later transmitted to
-- MergeTransferInfo in order to be recorded in the -- MergeTransferInfo in order to be recorded in the
-- translation map -- translation map
-- --
---Default behaviour: ---Default behaviour:
-- Applies sequence with name identified by parameter named -- Applies sequence with name identified by parameter named
-- <seq> (see Interface_Static), defined in resource file -- <seq> (see Interface_Static), defined in resource file
-- identified by parameter with name <rscfile>, to shape, -- identified by parameter with name <rscfile>, to shape,
-- and keeps info of substitutions made during the process. -- and keeps info of substitutions made during the process.
-- The Prec and MaxTol define run-time parameters -- The Prec and MaxTol define run-time parameters
-- Runtime.Tolerance and Runtime.MaxTolerance which can be -- Runtime.Tolerance and Runtime.MaxTolerance which can be
-- referred from the resource file -- referred from the resource file
-- ("param : &Runtime.Tolerance") -- ("param : &Runtime.Tolerance")
-- In the info returns ShapeProcess_ShapeContext with recorded -- In the info returns ShapeProcess_ShapeContext with recorded
-- modifications. If info has already this type on input, uses it. -- modifications. If info has already this type on input, uses it.
-- --
-- If resource file is not found, or sequence is not defined -- If resource file is not found, or sequence is not defined
-- there, performs default fixes: -- there, performs default fixes:
-- - if <seq> is write.iges.sequence or write.step.sequence, does DirectFaces -- - if <seq> is write.iges.sequence or write.step.sequence, does DirectFaces
-- - if <seq> is read.iges.sequence or read.step.sequence, performs FixShape -- - if <seq> is read.iges.sequence or read.step.sequence, performs FixShape
CheckPCurve (me; edge : Edge from TopoDS; CheckPCurve (me; edge : Edge from TopoDS;
face : Face from TopoDS; face : Face from TopoDS;
preci : Real; preci : Real;
isSeam: Boolean) isSeam: Boolean)
returns Boolean is virtual; returns Boolean is virtual;
---Purpose: Checks quality of pcurve of the edge on the given face, ---Purpose: Checks quality of pcurve of the edge on the given face,
-- and corrects it if necessary. -- and corrects it if necessary.
---Remark : In Open CASCADE does nothing. ---Remark : In Open CASCADE does nothing.
MergeTransferInfo (me; TP : TransientProcess from Transfer; MergeTransferInfo (me; TP : TransientProcess from Transfer;
info: Transient; info: Transient;
startTPitem: Integer = 1) is virtual; startTPitem: Integer = 1) is virtual;
MergeTransferInfo (me; FP : FinderProcess from Transfer; MergeTransferInfo (me; FP : FinderProcess from Transfer;
info: Transient) is virtual; info: Transient) is virtual;
---Purpose: Updates translation map (TP or FP) with information ---Purpose: Updates translation map (TP or FP) with information
-- resulting from ShapeProcessing -- resulting from ShapeProcessing
-- Parameter startTPitem can be used for optimisation, to -- Parameter startTPitem can be used for optimisation, to
-- restrict modifications to entities stored in TP starting -- restrict modifications to entities stored in TP starting
-- from item startTPitem -- from item startTPitem
fields fields

25
src/XSAlgo/XSAlgo_AlgoContainer.cxx
View File

@ -80,16 +80,21 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape,
const Standard_Real maxTol, const Standard_Real maxTol,
const Standard_CString prscfile, const Standard_CString prscfile,
const Standard_CString pseq, const Standard_CString pseq,
Handle(Standard_Transient)& info) const Handle(Standard_Transient)& info,
const Handle(Message_ProgressIndicator)& progress) const
{ {
if ( shape.IsNull() ) return shape; if ( shape.IsNull() ) return shape;
Handle(ShapeProcess_ShapeContext) context = Handle(ShapeProcess_ShapeContext)::DownCast ( info ); Handle(ShapeProcess_ShapeContext) context = Handle(ShapeProcess_ShapeContext)::DownCast(info);
if ( context.IsNull() ) { if ( context.IsNull() )
Standard_CString rscfile = Interface_Static::CVal ( prscfile ); {
if ( ! rscfile ) rscfile = prscfile; Standard_CString rscfile = Interface_Static::CVal(prscfile);
context = new ShapeProcess_ShapeContext (shape, rscfile); if (!rscfile)
context->SetDetalisation ( TopAbs_EDGE ); rscfile = prscfile;
context = new ShapeProcess_ShapeContext(shape, rscfile);
context->SetDetalisation(TopAbs_EDGE);
if ( !progress.IsNull() )
context->SetProgress(progress);
} }
info = context; info = context;
@ -123,7 +128,7 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape,
sfs->SetMaxTolerance ( maxTol ); sfs->SetMaxTolerance ( maxTol );
sfs->FixFaceTool()->FixWireTool()->FixSameParameterMode() = Standard_False; sfs->FixFaceTool()->FixWireTool()->FixSameParameterMode() = Standard_False;
sfs->FixSolidTool()->CreateOpenSolidMode() = Standard_False; sfs->FixSolidTool()->CreateOpenSolidMode() = Standard_False;
sfs->Perform(); sfs->Perform(progress);
TopoDS_Shape S = sfs->Shape(); TopoDS_Shape S = sfs->Shape();
if ( ! S.IsNull() && S != shape ) { if ( ! S.IsNull() && S != shape ) {
@ -151,7 +156,9 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape,
// Define runtime tolerances and do Shape Processing // Define runtime tolerances and do Shape Processing
rsc->SetResource ( "Runtime.Tolerance", Prec ); rsc->SetResource ( "Runtime.Tolerance", Prec );
rsc->SetResource ( "Runtime.MaxTolerance", maxTol ); rsc->SetResource ( "Runtime.MaxTolerance", maxTol );
ShapeProcess::Perform ( context, seq );
if ( !ShapeProcess::Perform(context, seq) )
return TopoDS_Shape(); // Null shape
return context->Result(); return context->Result();
} }