OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-02 17:46:22 +03:00
Code Packages Releases Activity

0029523: Problem with BRepOffsetAPI_MakeEvolved

Browse Source 
The capabilities of the class BRepOffsetAPI_MakeEvolved have been extended with involving alternate algorithm of resolving the loops in the piped shape. The new option theIsVolume is added for that in the constructor.

New class BRepFill_AdvancedEvolved has been created in order to provide new OCCT-algorithm combining BRepFill_PipeShell and BOPAlgo_MakerVolume.

A change in BOPAlgo_PaveFiller.cxx has been made in order to solve a specific problem of Boolean operation.

The interface of DRAW-command "evolved" has been updated to add the new option. DRAW-command "evolvedsolid" has been deleted. Now it is replaced with DRAW-command "evolved" with the option "-solid".

Testgrid "evolved" has been created.
This commit is contained in:
nbv 2018-04-11 12:23:29 +03:00 committed by bugmaster
parent 1ac1059961
commit 858435884d
50 changed files with 3512 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BOPAlgo/BOPAlgo_PaveFiller.cxx
View File

@ -294,6 +294,8 @@ void BOPAlgo_PaveFiller::PerformInternal()
//
UpdateBlocksWithSharedVertices();
//
myDS->RefineFaceInfoIn();
//
MakeSplitEdges();
if (HasErrors()) {
return;

38
src/BOPDS/BOPDS_DS.cxx
View File

@ -1385,6 +1385,44 @@ void BOPDS_DS::RefineFaceInfoOn()
}
}
}
//=======================================================================
//function : RefineFaceInfoIn
//purpose :
//=======================================================================
void BOPDS_DS::RefineFaceInfoIn()
{
for (Standard_Integer i = 0; i < myNbSourceShapes; ++i)
{
const BOPDS_ShapeInfo& aSI = ShapeInfo(i);
if (aSI.ShapeType() != TopAbs_FACE)
continue;
if (!aSI.HasReference())
continue;
BOPDS_FaceInfo& aFI = ChangeFaceInfo(i);
const BOPDS_IndexedMapOfPaveBlock& aMPBOn = aFI.PaveBlocksOn();
BOPDS_IndexedMapOfPaveBlock& aMPBIn = aFI.ChangePaveBlocksIn();
if (aMPBIn.IsEmpty() || aMPBOn.IsEmpty())
continue;
BOPDS_IndexedMapOfPaveBlock aMPBInNew;
const Standard_Integer aNbPBIn = aMPBIn.Extent();
for (Standard_Integer j = 1; j <= aNbPBIn; ++j)
{
if (!aMPBOn.Contains(aMPBIn(j)))
aMPBInNew.Add(aMPBIn(j));
}
if (aMPBInNew.Extent() < aNbPBIn)
aMPBIn = aMPBInNew;
}
}
//=======================================================================
//function : AloneVertices
//purpose :

2
src/BOPDS/BOPDS_DS.hxx
View File

@ -303,6 +303,8 @@ Standard_EXPORT virtual ~BOPDS_DS();
//! ++
Standard_EXPORT void RefineFaceInfoOn();
//! Removes any pave block from list of having IN state if it has also the state ON.
Standard_EXPORT void RefineFaceInfoIn();
//! Returns information about ON/IN sub-shapes of the given faces.
//! @param theMVOnIn the indices of ON/IN vertices from both faces

2034
src/BRepFill/BRepFill_AdvancedEvolved.cxx Normal file
View File

File diff suppressed because it is too large Load Diff

141
src/BRepFill/BRepFill_AdvancedEvolved.hxx Normal file
View File

@ -0,0 +1,141 @@
// Created on: 2018-03-14
// Created by: Nikolai BUKHALOV
// Copyright (c) 1999-2018 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.
#ifndef _BRepFill_AdvancedEvolved_HeaderFile
#define _BRepFill_AdvancedEvolved_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <TopoDS_Compound.hxx>
#include <TopoDS_Wire.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <Standard_CString.hxx>
class BOPAlgo_MakerVolume;
class TopoDS_Face;
//! Constructs an evolved volume from a spine (wire or face)
//! and a profile ( wire).
class BRepFill_AdvancedEvolved
{
public:
DEFINE_STANDARD_ALLOC;
//! Constructor
Standard_EXPORT BRepFill_AdvancedEvolved() :myErrorStatus(BRepFill_AdvancedEvolved_Empty),
myFuzzyValue(0.0),
myIsParallel(Standard_True),
myDebugShapesPath("C:\\Temp")
{
}
Standard_EXPORT void Perform(const TopoDS_Wire& theSpine,
const TopoDS_Wire& theProfile,
const Standard_Real theTolerance,
const Standard_Boolean theSolidReq = Standard_True);
Standard_Boolean IsDone(unsigned int* theErrorCode = 0) const
{
if (theErrorCode)
*theErrorCode = myErrorStatus;
return (myErrorStatus == BRepFill_AdvancedEvolved_OK);
}
//! returns the resulting shape.
const TopoDS_Shape& Shape() const
{
return myResult;
}
//! Sets directory where the debug shapes will be saved
void SetTemporaryDirectory(const Standard_CString& thePath)
{
myDebugShapesPath = thePath;
}
//! Sets/Unsets computation in parallel mode
void SetParallelMode(const Standard_Boolean theVal)
{
myIsParallel = theVal;
}
protected:
Standard_EXPORT void PerformSweep();
Standard_EXPORT void GetLids();
Standard_EXPORT void BuildSolid();
Standard_EXPORT void RemoveExcessSolids(const TopTools_ListOfShape& theLSplits,
const TopoDS_Shape& theShape,
TopTools_ListOfShape& theArgsList,
BOPAlgo_MakerVolume& theMV);
Standard_EXPORT void ExtractOuterSolid(TopoDS_Shape& theShape,
TopTools_ListOfShape& theArgsList);
Standard_EXPORT void GetSpineAndProfile(const TopoDS_Wire& theSpine,
const TopoDS_Wire& theProfile);
Standard_EXPORT void UnifyShape();
Standard_EXPORT Standard_Boolean PerformBoolean(const TopTools_ListOfShape& theArgsList,
TopoDS_Shape& theResult) const;
Standard_EXPORT Standard_Boolean CheckSingularityAndAdd(const TopoDS_Face& theF,
const Standard_Real theFuzzyToler,
TopTools_ListOfShape& theListOfFaces,
TopTools_ListOfShape& theListOfSplits) const;
Standard_EXPORT Standard_Boolean IsLid(const TopoDS_Face& theF,
const TopTools_IndexedMapOfShape& theMapOfLids) const;
private:
enum
{
BRepFill_AdvancedEvolved_Empty = 0,
BRepFill_AdvancedEvolved_NotPlanarSpine,
BRepFill_AdvancedEvolved_SweepError,
BRepFill_AdvancedEvolved_NoLids,
BRepFill_AdvancedEvolved_NotSolid,
BRepFill_AdvancedEvolved_NotVolume,
BRepFill_AdvancedEvolved_OK = UINT_MAX
} myErrorStatus;
TopoDS_Wire mySpine;
TopoDS_Wire myProfile;
TopoDS_Shape myPipeShell;
TopoDS_Compound myTopBottom; // Lids can be split on several faces
TopoDS_Shape myResult;
Standard_Real myFuzzyValue;
Standard_Boolean myIsParallel;
Standard_CString myDebugShapesPath;
};
#endif // _BRepFill_AdvancedEvolved_HeaderFile

7
src/BRepFill/BRepFill_PipeShell.cxx
View File

@ -690,7 +690,7 @@ void BRepFill_PipeShell::SetForceApproxC1(const Standard_Boolean ForceApproxC1)
//function : Build
//purpose : Construct the Shell and the history
//=======================================================================
Standard_Boolean BRepFill_PipeShell::Build()
Standard_Boolean BRepFill_PipeShell::Build()
{
Standard_Boolean Ok;
Standard_Real FirstS, LastS;
@ -744,8 +744,9 @@ void BRepFill_PipeShell::SetForceApproxC1(const Standard_Boolean ForceApproxC1)
MkSw.SetTolerance(myTol3d, myBoundTol, 1.e-5, myTolAngular);
MkSw.SetAngularControl(angmin, angmax);
MkSw.SetForceApproxC1(myForceApproxC1);
MkSw.SetBounds(TopoDS::Wire(myFirst),
TopoDS::Wire(myLast));
MkSw.SetBounds(TopoDS::Wire(myFirst),
TopoDS::Wire(myLast));
GeomAbs_Shape theContinuity = GeomAbs_C2;
if (myTrihedron == GeomFill_IsDiscreteTrihedron)
theContinuity = GeomAbs_C0;

29
src/BRepFill/BRepFill_Sweep.cxx
View File

@ -19,6 +19,7 @@
#include <Approx_CurveOnSurface.hxx>
#include <Approx_SameParameter.hxx>
#include <Bnd_Box.hxx>
#include <BOPTools_AlgoTools.hxx>
#include <BRep_Builder.hxx>
#include <BRep_CurveRepresentation.hxx>
#include <BRep_GCurve.hxx>
@ -702,7 +703,7 @@ static TopoDS_Edge BuildEdge(Handle(Geom_Curve)& C3d,
const Standard_Real l,
const Standard_Real Tol3d)
{
gp_Pnt P1, P2, P;
gp_Pnt P;
Standard_Real Tol1, Tol2, Tol, d;
// Class BRep_Tool without fields and without Constructor :
// BRep_Tool BT;
@ -710,11 +711,11 @@ static TopoDS_Edge BuildEdge(Handle(Geom_Curve)& C3d,
TopoDS_Edge E;
// P1 = BT.Pnt(VF);
P1 = BRep_Tool::Pnt(VF);
const gp_Pnt P1 = BRep_Tool::Pnt(VF);
// Tol1 = BT.Tolerance(VF);
Tol1 = BRep_Tool::Tolerance(VF);
// P2 = BT.Pnt(VL);
P2 = BRep_Tool::Pnt(VL);
const gp_Pnt P2 = BRep_Tool::Pnt(VL);
// Tol2 = BT.Tolerance(VF);
Tol2 = BRep_Tool::Tolerance(VL);
Tol = Max(Tol1, Tol2);
@ -750,8 +751,6 @@ static TopoDS_Edge BuildEdge(Handle(Geom_Curve)& C3d,
if (d > Tol1)
B.UpdateVertex(VF, d);
// P1 = BT.Pnt(VL);
P1 = BRep_Tool::Pnt(VL);
C3d->D0(l, P);
d = P2.Distance(P);
if (d > Tol2)
@ -777,6 +776,19 @@ static TopoDS_Edge BuildEdge(Handle(Geom_Curve)& C3d,
TopLoc_Location Loc;
B.UpdateEdge(E, C2d, S, Loc, Tol3d);
const Handle(IntTools_Context) aNullCtx;
if (BOPTools_AlgoTools::IsMicroEdge(E, aNullCtx))
{
TopoDS_Vertex aV = VF;
B.UpdateVertex(aV, P1.Distance(P2));
B.MakeEdge(E);
B.UpdateEdge(E, C2d, S, TopLoc_Location(), Tol);
B.Add(E, TopoDS::Vertex(aV.Oriented(TopAbs_FORWARD)));
B.Add(E, TopoDS::Vertex(aV.Oriented(TopAbs_REVERSED)));
B.Range(E, f, l);
B.Degenerated(E, Standard_True);
}
return E;
}
@ -914,7 +926,7 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
// Control the direction of the rotation
Standard_Boolean ToReverseResult = Standard_False;
gp_Vec d1u;
d1u = Surf->DN(0, (f1+l1)/2, 1, 0);
d1u = Surf->DN(0, aPrm[aMaxIdx], 1, 0);
if (d1u.Angle(TangentOnPart1) > M_PI/2) { //Invert everything
ToReverseResult = Standard_True;
/*
@ -1815,8 +1827,6 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
const Standard_Boolean WithKPart) :
isDone(Standard_False),
KPart(WithKPart)
{
mySec = Section;
myLoc = Location;
@ -3380,7 +3390,8 @@ TopoDS_Shape BRepFill_Sweep::Tape(const Standard_Integer Index) const
// Filling
B = Filling(It1.Value(), myFaces->Value(ii, I1),
It2.Value(), myFaces->Value(ii, I2),
myVEdgesModified, myTol3d, Axe, T1, Bord1, Bord2, FF);
myVEdgesModified, myTol3d, Axe, T1,
Bord1, Bord2, FF);
if (B) {
myAuxShape.Append(FF);

17
src/BRepFill/BRepFill_Sweep.hxx
View File

@ -80,7 +80,7 @@ public:
//! to be C0.
Standard_EXPORT void SetForceApproxC1 (const Standard_Boolean ForceApproxC1);
//! Build the Sweeep Surface
//! Build the Sweep Surface
//! Transition define Transition strategy
//! Approx define Approximation Strategy
//! - GeomFill_Section : The composed Function Location X Section
@ -118,13 +118,6 @@ public:
protected:
private:
Standard_EXPORT Standard_Boolean CorrectApproxParameters();
Standard_EXPORT Standard_Boolean BuildWire (const BRepFill_TransitionStyle Transition);
@ -142,6 +135,13 @@ private:
Standard_EXPORT void RebuildTopOrBottomEdge (const TopoDS_Edge& aNewEdge, TopoDS_Edge& anEdge, TopTools_MapOfShape& ReversedEdges) const;
private:
Standard_Boolean isDone;
Standard_Boolean KPart;
Standard_Real myTol3d;
@ -168,7 +168,6 @@ private:
TopoDS_Wire FirstShape;
TopoDS_Wire LastShape;
};

2
src/BRepFill/FILES
View File

@ -2,6 +2,8 @@ BRepFill.cxx
BRepFill.hxx
BRepFill_ACRLaw.cxx
BRepFill_ACRLaw.hxx
BRepFill_AdvancedEvolved.cxx
BRepFill_AdvancedEvolved.hxx
BRepFill_ApproxSeewing.cxx
BRepFill_ApproxSeewing.hxx
BRepFill_CompatibleWires.cxx

141
src/BRepOffsetAPI/BRepOffsetAPI_MakeEvolved.cxx
View File

@ -22,101 +22,116 @@
#include <TopoDS_Face.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Wire.hxx>
#include <TopoDS_Iterator.hxx>
#include <TopoDS.hxx>
#include <Standard_NotImplemented.hxx>
static const TopTools_ListOfShape anEmptyList;
//=======================================================================
//function : BRepOffsetAPI_MakeEvolved
//function : Constructor
//purpose :
//=======================================================================
BRepOffsetAPI_MakeEvolved::BRepOffsetAPI_MakeEvolved()
{
}
//=======================================================================
//function : BRepOffsetAPI_MakeEvolved
//function : Constructor
//purpose :
//=======================================================================
BRepOffsetAPI_MakeEvolved::BRepOffsetAPI_MakeEvolved(const TopoDS_Wire& Spine,
const TopoDS_Wire& Profil,
const GeomAbs_JoinType Join,
const Standard_Boolean AxeProf,
const Standard_Boolean Solid,
const Standard_Boolean ProfOnSpine,
const Standard_Real Tol)
BRepOffsetAPI_MakeEvolved::BRepOffsetAPI_MakeEvolved(const TopoDS_Shape& Spine,
const TopoDS_Wire& Profil,
const GeomAbs_JoinType Join,
const Standard_Boolean AxeProf,
const Standard_Boolean Solid,
const Standard_Boolean ProfOnSpine,
const Standard_Real Tol,
const Standard_Boolean theIsVolume,
const Standard_Boolean theRunInParallel)
: myIsVolume (theIsVolume)
{
gp_Ax3 Axis(gp_Pnt(0.,0.,0.),
gp_Dir(0.,0.,1.),
gp_Dir(1.,0.,0.));
if (Spine.ShapeType() != TopAbs_WIRE && Spine.ShapeType() != TopAbs_FACE)
{
Standard_TypeMismatch::Raise ("BRepOffsetAPI_MakeEvolved: face or wire is expected as a spine");
}
if (theIsVolume)
{
myVolume.SetParallelMode(theRunInParallel);
TopoDS_Wire aSpine;
if (Spine.ShapeType() == TopAbs_WIRE)
{
aSpine = TopoDS::Wire(Spine);
}
else
{
aSpine = TopoDS::Wire(TopoDS_Iterator(Spine).Value());
}
myVolume.Perform(aSpine, Profil, Tol, Solid);
if (!myVolume.IsDone())
{
return;
}
}
else
{
gp_Ax3 Axis(gp::Origin(), gp::DZ(), gp::DX());
if ( !AxeProf) {
Standard_Boolean POS;
BRepFill::Axe(Spine,Profil,Axis,POS,Tol);
if (ProfOnSpine && !POS) return;
if (!AxeProf)
{
Standard_Boolean POS;
BRepFill::Axe(Spine, Profil, Axis, POS, Max(Tol, Precision::Confusion()));
if (ProfOnSpine && !POS) return;
}
if (Spine.ShapeType() == TopAbs_WIRE)
{
myEvolved.Perform(TopoDS::Wire(Spine), Profil, Axis, Join, Solid);
}
else
{
myEvolved.Perform(TopoDS::Face(Spine), Profil, Axis, Join, Solid);
}
}
myEvolved.Perform(Spine,Profil,Axis,Join,Solid);
Build();
Done();
}
//=======================================================================
//function : BRepOffsetAPI_MakeEvolved
//purpose :
//=======================================================================
BRepOffsetAPI_MakeEvolved::BRepOffsetAPI_MakeEvolved(const TopoDS_Face& Spine,
const TopoDS_Wire& Profil,
const GeomAbs_JoinType Join,
const Standard_Boolean AxeProf,
const Standard_Boolean Solid,
const Standard_Boolean ProfOnSpine,
const Standard_Real Tol)
{
gp_Ax3 Axis(gp_Pnt(0.,0.,0.),
gp_Dir(0.,0.,1.),
gp_Dir(1.,0.,0.));
if ( !AxeProf) {
Standard_Boolean POS;
BRepFill::Axe(Spine,Profil,Axis,POS,Tol);
if (ProfOnSpine && !POS) return;
}
myEvolved.Perform(Spine,Profil,Axis,Join,Solid);
Build();
}
//=======================================================================
//function : BRepFill_Evolved&
//purpose :
//=======================================================================
const BRepFill_Evolved& BRepOffsetAPI_MakeEvolved::Evolved() const
const BRepFill_Evolved& BRepOffsetAPI_MakeEvolved::Evolved() const
{
if (myIsVolume)
{
Standard_TypeMismatch::Raise ("BRepOffsetAPI_MakeEvolved: myEvolved is accessed while in volume mode");
}
return myEvolved;
}
//=======================================================================
//function :
//function : Build
//purpose :
//=======================================================================
void BRepOffsetAPI_MakeEvolved::Build()
{
myShape = myEvolved.Shape();
if (myEvolved.IsDone()) Done();
if (myEvolved.IsDone())
{
myShape = myEvolved.Shape();
}
else if (myVolume.IsDone())
{
myShape = myVolume.Shape();
}
Done();
}
//=======================================================================
//function : Top
//purpose :
//=======================================================================
const TopoDS_Shape& BRepOffsetAPI_MakeEvolved::Top() const
{
return myEvolved.Top();
@ -126,7 +141,6 @@ const TopoDS_Shape& BRepOffsetAPI_MakeEvolved::Top() const
//function : Bottom
//purpose :
//=======================================================================
const TopoDS_Shape& BRepOffsetAPI_MakeEvolved::Bottom() const
{
return myEvolved.Bottom();
@ -136,11 +150,12 @@ const TopoDS_Shape& BRepOffsetAPI_MakeEvolved::Bottom() const
//function : GeneratedShapes
//purpose :
//=======================================================================
const TopTools_ListOfShape& BRepOffsetAPI_MakeEvolved::GeneratedShapes (
const TopoDS_Shape& SpineShape,
const TopoDS_Shape& ProfShape )
const
const TopTools_ListOfShape&
BRepOffsetAPI_MakeEvolved::GeneratedShapes(const TopoDS_Shape& SpineShape,
const TopoDS_Shape& ProfShape) const
{
if (!myEvolved.IsDone())
return anEmptyList;
return myEvolved.GeneratedShapes(SpineShape,ProfShape);
}

75
src/BRepOffsetAPI/BRepOffsetAPI_MakeEvolved.hxx
View File

@ -22,6 +22,7 @@
#include <Standard_Handle.hxx>
#include <BRepFill_Evolved.hxx>
#include <BRepFill_AdvancedEvolved.hxx>
#include <BRepBuilderAPI_MakeShape.hxx>
#include <GeomAbs_JoinType.hxx>
#include <Standard_Boolean.hxx>
@ -43,20 +44,42 @@ class TopoDS_Shape;
//! - implementing the construction algorithm, and
//! - consulting the result.
//! Computes an Evolved by
//! 1 - sweeping a profil along a spine.
//! 1 - sweeping a profile along a spine.
//! 2 - removing the self-intersections.
//!
//! The Profile is expected to be planar and can be a line
//! (which lies in infinite number of planes).
//!
//! The profile is defined in a Referential R. The position of
//! the profile at the current point of the spine is given by
//! confusing R and the local referential given by ( D0, D1
//! and the normal of the Spine)
//! and the normal of the Spine).
//!
//! If the Boolean <AxeProf> is true, R is O,X,Y,Z
//! else R is defined as the local refential at the nearest
//! point of the profil to the spine.
//! The coordinate system is determined by theIsAxeProf argument:
//! - if theIsAxeProf is true, R is the global coordinate system,
//! - if theIsAxeProf is false, R is computed so that:
//! * its origin is given by the point on the spine which is
//! closest to the profile,
//! * its "X Axis" is given by the tangent to the spine at this point, and
//! * its "Z Axis" is the normal to the plane which contains the spine.
//!
//! if <Solid> is TRUE the Shape result is completed to be a
//! theJoinType defines the type of pipe generated by the salient
//! vertices of the spine. The default type is GeomAbs_Arc
//! where the vertices generate revolved pipes about the
//! axis passing along the vertex and the normal to the
//! plane of the spine. At present, this is the only
//! construction type implemented.
//!
//! if <theIsSolid> is TRUE the Shape result is completed to be a
//! solid or a compound of solids.
//!
//! If theIsProfOnSpine == TRUE then the profile must connect with the spine.
//!
//! If theIsVolume option is switched on then self-intersections
//! in the result of Pipe-algorithm will be removed by
//! BOPAlgo_MakerVolume algorithm. At that the arguments
//! "theJoinType", "theIsAxeProf", "theIsProfOnSpine" are not used.
class BRepOffsetAPI_MakeEvolved : public BRepBuilderAPI_MakeShape
{
public:
@ -66,29 +89,19 @@ public:
Standard_EXPORT BRepOffsetAPI_MakeEvolved();
Standard_EXPORT BRepOffsetAPI_MakeEvolved(const TopoDS_Wire& Spine, const TopoDS_Wire& Profil, const GeomAbs_JoinType Join = GeomAbs_Arc, const Standard_Boolean AxeProf = Standard_True, const Standard_Boolean Solid = Standard_False, const Standard_Boolean ProfOnSpine = Standard_False, const Standard_Real Tol = 0.0000001);
//! These constructors construct an evolved shape by sweeping the profile
//! Profile along the spine Spine.
//! The profile is defined in a coordinate system R.
//! The coordinate system is determined by AxeProf:
//! - if AxeProf is true, R is the global coordinate system,
//! - if AxeProf is false, R is computed so that:
//! - its origin is given by the point on the spine which is
//! closest to the profile,
//! - its "X Axis" is given by the tangent to the spine at this point, and
//! - its "Z Axis" is the normal to the plane which contains the spine.
//! The position of the profile at the current point of the
//! spine is given by making R coincident with the local
//! coordinate system given by the current point, the
//! tangent vector and the normal to the spine.
//! Join defines the type of pipe generated by the salient
//! vertices of the spine. The default type is GeomAbs_Arc
//! where the vertices generate revolved pipes about the
//! axis passing along the vertex and the normal to the
//! plane of the spine. At present, this is the only
//! construction type implemented.
Standard_EXPORT BRepOffsetAPI_MakeEvolved(const TopoDS_Face& Spine, const TopoDS_Wire& Profil, const GeomAbs_JoinType Join = GeomAbs_Arc, const Standard_Boolean AxeProf = Standard_True, const Standard_Boolean Solid = Standard_False, const Standard_Boolean ProfOnSpine = Standard_False, const Standard_Real Tol = 0.0000001);
//! Constructs an evolved shape by sweeping the profile
//! (theProfile) along the spine (theSpine).
//! theSpine can be shape only of type wire or face.
//! See description to this class for detailed information.
Standard_EXPORT BRepOffsetAPI_MakeEvolved(const TopoDS_Shape& theSpine,
const TopoDS_Wire& theProfile,
const GeomAbs_JoinType theJoinType = GeomAbs_Arc,
const Standard_Boolean theIsAxeProf = Standard_True,
const Standard_Boolean theIsSolid = Standard_False,
const Standard_Boolean theIsProfOnSpine = Standard_False,
const Standard_Real theTol = 0.0000001,
const Standard_Boolean theIsVolume = Standard_False,
const Standard_Boolean theRunInParallel = Standard_False);
Standard_EXPORT const BRepFill_Evolved& Evolved() const;
@ -118,9 +131,9 @@ protected:
private:
BRepFill_Evolved myEvolved;
BRepFill_AdvancedEvolved myVolume;
Standard_Boolean myIsVolume;
};

4
src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
View File

@ -33,8 +33,6 @@
//purpose :
//=======================================================================
BRepOffsetAPI_MakePipeShell::BRepOffsetAPI_MakePipeShell(const TopoDS_Wire& Spine)
{
myPipe = new (BRepFill_PipeShell) (Spine);
SetTolerance();
@ -255,7 +253,7 @@ void BRepOffsetAPI_MakePipeShell::SetMaxSegments(const Standard_Integer NewMaxSe
//function :Build()
//purpose :
//=======================================================================
void BRepOffsetAPI_MakePipeShell::Build()
void BRepOffsetAPI_MakePipeShell::Build()
{
Standard_Boolean Ok;
Ok = myPipe->Build();

3
src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.hxx
View File

@ -211,7 +211,7 @@ public:
//! discontinuities are treated like round
//! corner. The corner is treated as rotation
//! of the profile around an axis which
//! passes through the point of the spine?s
//! passes through the point of the spine's
//! fracture. This axis is based on cross
//! product of directions tangent to the
//! adjacent segments of the spine at their common point.
@ -285,7 +285,6 @@ private:
Handle(BRepFill_PipeShell) myPipe;
};

120
src/BRepTest/BRepTest_SweepCommands.cxx
View File

@ -263,49 +263,99 @@ static Standard_Integer geompipe(Draw_Interpretor&,
Standard_Integer evolved(Draw_Interpretor& di, Standard_Integer n, const char** a)
{
if (n == 1) {
//cout << " 1) evolved result base profil : "<< endl;
//cout << " The relative position of the profil on the base" << endl;
//cout << " is given in the referencial axis. " << endl;
//cout << " 2) evolved result base profil o : "<< endl;
//cout << " This position is automatically computed." << endl;
di << " 1) evolved result base profil : \n";
di << " The relative position of the profil on the base\n";
di << " is given in the referencial axis. \n";
di << " 2) evolved result base profil o : \n";
di << " This position is automatically computed.\n";
di << " evolved result -s spine -p profile [-solid] [-v] [-a] [-t toler] [-parallel] : \n";
di << " Make evolved profile on spine.\n";
di << " -solid means make closed solid.\n";
di << " -v means use alternative algorithm (volume mode).\n";
di << " -a means referencial CS is automatically computed, otherwise global CS is used. \n";
di << " -t sets the tolerance.\n";
di << " -parallel turns on parallel execution.\n";
return 0;
}
if (n < 4) return 1;
Standard_Boolean IsAFace = Standard_False;
Standard_Boolean Solid = (!strcmp(a[0], "evolvedsolid"));
Standard_Boolean Solid = Standard_False;
Standard_Boolean isVolume = Standard_False;
Standard_Boolean hasToComputeAxes = Standard_False;
Standard_Real aTolerance = 0.0;
TopoDS_Shape Base;
TopoDS_Wire Prof;
Standard_Boolean isParallel = Standard_True;
for (Standard_Integer i = 2; i < n; i++)
{
if (a[i][0] != '-')
{
di << "Error: wrong option!\n";
return 1;
}
if (!Solid && !strcmp(a[i], "-solid"))
{
Solid = Standard_True;
continue;
}
TopoDS_Shape Base = DBRep::Get(a[2], TopAbs_WIRE, Standard_False);
if (Base.IsNull()) {
Base = DBRep::Get(a[2], TopAbs_FACE, Standard_False);
IsAFace = Standard_True;
if (!strcmp(a[i], "-stm"))
{
isParallel = Standard_False;
continue;
}
switch (a[i][1])
{
case 's':
{
Base = DBRep::Get(a[++i], TopAbs_WIRE, Standard_False);
if (Base.IsNull())
{
Base = DBRep::Get(a[i], TopAbs_FACE, Standard_False);
}
}
break;
case 'p':
{
Prof = TopoDS::Wire(DBRep::Get(a[++i], TopAbs_WIRE, Standard_False));
}
break;
case 'v':
{
isVolume = Standard_True;
}
break;
case 'a':
{
hasToComputeAxes = Standard_True;
}
break;
case 't':
{
aTolerance = Draw::Atof(a[++i]);
}
break;
default:
di << "Error: Unknown option!\n";
break;
}
}
if (Base.IsNull()) return 1;
TopoDS_Shape InpuTShape(DBRep::Get(a[3], TopAbs_WIRE, Standard_False));
TopoDS_Wire Prof = TopoDS::Wire(InpuTShape);
// TopoDS_Wire Prof =
// TopoDS::Wire(DBRep::Get(a[3],TopAbs_WIRE,Standard_False));
if (Prof.IsNull()) return 1;
if (IsAFace) {
TopoDS_Shape Volevo
= BRepOffsetAPI_MakeEvolved(TopoDS::Face(Base), Prof, GeomAbs_Arc, n == 4, Solid);
DBRep::Set(a[1], Volevo);
}
else {
TopoDS_Shape Volevo
= BRepOffsetAPI_MakeEvolved(TopoDS::Wire(Base), Prof, GeomAbs_Arc, n == 4, Solid);
DBRep::Set(a[1], Volevo);
if (Base.IsNull() || Prof.IsNull())
{
di << "spine (face or wire) and profile (wire) are expected\n";
return 1;
}
TopoDS_Shape Volevo = BRepOffsetAPI_MakeEvolved(Base, Prof, GeomAbs_Arc, !hasToComputeAxes,
Solid, Standard_False,
aTolerance, isVolume, isParallel);
DBRep::Set(a[1],Volevo);
return 0;
}
@ -945,10 +995,6 @@ void BRepTest::SweepCommands(Draw_Interpretor& theCommands)
"evolved , no args to get help",
__FILE__, evolved, g);
theCommands.Add("evolvedsolid",
"evolved , no args to get help",
__FILE__, evolved, g);
theCommands.Add("pruled",
"pruled result Edge1/Wire1 Edge2/Wire2",
__FILE__, pruled, g);

3
src/NCollection/NCollection_List.hxx
View File

@ -144,7 +144,8 @@ public:
PAppend(pNew, theIter);
}
//! Append another list at the end
//! Append another list at the end.
//! After this operation, theOther list will be cleared.
void Append (NCollection_List& theOther)
{
if (this == &theOther || theOther.Extent()<1)

8
src/math/math_NewtonMinimum.cxx
View File

@ -165,15 +165,19 @@ void math_NewtonMinimum::Perform(math_MultipleVarFunctionWithHessian& F,
Standard_Real aMult = RealLast();
for(Standard_Integer anIdx = 1; anIdx <= myLeft.Upper(); anIdx++)
{
const Standard_Real anAbsStep = Abs(TheStep(anIdx));
if (anAbsStep < gp::Resolution())
continue;
if (suivant->Value(anIdx) < myLeft(anIdx))
{
Standard_Real aValue = Abs(precedent->Value(anIdx) - myLeft(anIdx)) / Abs(TheStep(anIdx));
Standard_Real aValue = Abs(precedent->Value(anIdx) - myLeft(anIdx)) / anAbsStep;
aMult = Min (aValue, aMult);
}
if (suivant->Value(anIdx) > myRight(anIdx))
{
Standard_Real aValue = Abs(precedent->Value(anIdx) - myRight(anIdx)) / Abs(TheStep(anIdx));
Standard_Real aValue = Abs(precedent->Value(anIdx) - myRight(anIdx)) / anAbsStep;
aMult = Min (aValue, aMult);
}
}

2
tests/bugs/modalg_4/pro19424
View File

@ -8,7 +8,7 @@ checkshape b
restore [locate_data_file pro19424b.brep] p
checkshape p
if [catch {evolved result b p o } catch_result] {
if [catch {evolved result -s b -p p -a } catch_result] {
puts "Faulty PRO19424 : function EVOLVED works wrongly"
} else {
puts "PRO19424 OK: function EVOLVED works properly"

2
tests/bugs/modalg_6/bug26470_1
View File

@ -8,4 +8,4 @@ puts ""
restore [locate_data_file OCC26470-ClosedWire.brep] a
restore [locate_data_file OCC26470-wprof1.brep] b
evolved res a b o
evolved res -s a -p b -a

2
tests/bugs/modalg_6/bug26470_2
View File

@ -8,5 +8,5 @@ puts ""
restore [locate_data_file OCC26470-ClosedWire.brep] a
restore [locate_data_file OCC26470-wprof2.brep] b
evolved res a b o
evolved res -s a -p b -a
checkshape res

13
tests/evolved/begin Normal file
View File

@ -0,0 +1,13 @@
# To prevent loops limit to 10 minutes
cpulimit 600
if { [array get Draw_Groups "TOPOLOGY Feature commands"] == "" } {
pload TOPTEST
}
if { [info exists imagedir] == 0 } {
set imagedir .
}
if { [info exists test_image ] == 0 } {
set test_image photo
}

2
tests/evolved/end Normal file
View File

@ -0,0 +1,2 @@
# to end a test script
puts "TEST COMPLETED"

1
tests/evolved/evolved/begin Normal file
View File

@ -0,0 +1 @@
set subgroup evolved

20
tests/evolved/evolved/bug26470_1 Normal file
View File

@ -0,0 +1,20 @@
puts "========"
puts "OCC26470"
puts "========"
puts ""
##################################################
# BRepFill_Evolved: exception and invalid result
##################################################
restore [locate_data_file OCC26470-ClosedWire.brep] a
restore [locate_data_file OCC26470-wprof1.brep] b
evolved result -s a -p b -a
checkshape result
checkprops result -s 558.33
smallview
don result a b
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

20
tests/evolved/evolved/bug26470_2 Normal file
View File

@ -0,0 +1,20 @@
puts "========"
puts "OCC26470"
puts "========"
puts ""
##################################################
# BRepFill_Evolved: exception and invalid result
##################################################
restore [locate_data_file OCC26470-ClosedWire.brep] a
restore [locate_data_file OCC26470-wprof2.brep] b
evolved result -s a -p b -a
checkshape result
checkprops result -s 572.14
smallview
don result a b
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

20
tests/evolved/evolved/pro19424 Normal file
View File

@ -0,0 +1,20 @@
puts "=========="
puts "PRO19424"
puts "=========="
restore [locate_data_file pro19424a.brep] b
checkshape b
restore [locate_data_file pro19424b.brep] p
checkshape p
if [catch {evolved result -s b -p p -a } catch_result] {
puts "Faulty PRO19424 : function EVOLVED works wrongly"
} else {
puts "PRO19424 OK: function EVOLVED works properly"
}
checkprops result -s 246.506
checkshape result
checkview -display result -2d -path ${imagedir}/${test_image}.png

2
tests/evolved/grids.list Normal file
View File

@ -0,0 +1,2 @@
001 evolved
002 voluved

1
tests/evolved/parse.rules Normal file
View File

@ -0,0 +1 @@
FAILED /\bFaulty\b/ bad shape

24
tests/evolved/voluved/AGT001 Normal file
View File

@ -0,0 +1,24 @@
puts "=========="
puts "OCC29523"
puts "=========="
profile p F -1 10 TT -1 -1 C 1 90 TT 10 -1 W
polyline t -1 -1 0 0 -1.5 5
evolved result -s p -p t -a -solid -v
checkprops result -s 268.774 -v 245.265
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 1.5e-7
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

24
tests/evolved/voluved/AGT002 Normal file
View File

@ -0,0 +1,24 @@
puts "=========="
puts "OCC29523"
puts "=========="
polyline p 0 0 0 0 10 0 20 10 0 20 0 0 13 0 0 13 5 0 6 5 0 6 0 0 0 0 0
polyline t -2 2 0 0 2 5 0 2 10 1 2 10 1 2 0 -2 2 0
evolved result -s p -p t -a -solid -v
checkprops result -s 1649.58 -v 1023.79
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 1.5e-7
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

24
tests/evolved/voluved/AGT003 Normal file
View File

@ -0,0 +1,24 @@
puts "=========="
puts "OCC29523"
puts "=========="
polyline p 0 0 0 0 10 0 20 10 0 20 0 0 13 0 0 13 5 0 6 5 0 6 0 0 0 0 0
polyline t -1 2 0 0 1 5 0 1 10 0.5 0.5 10 0.5 0.5 0
evolved result -s p -p t -a -solid -v
checkprops result -s 1573.58 -v 532.942
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 5.0e-6
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

25
tests/evolved/voluved/AGT004 Normal file
View File

@ -0,0 +1,25 @@
puts "=========="
puts "OCC29523"
puts "=========="
profile p X 10 Y 2 X -10 W
polyline t -1 1 0 1 1 10
evolved result -s p -p t -a -solid -v
checkprops result -s 287.517 -v 211.903
checkshape result
checknbshapes result -solid 1 -shell 1
# See issue #0029657
#if {[regexp "Faulties" [bopargcheck result]]} {
# puts "Error: bopargcheck has found some faulties in res2"
#}
checkmaxtol result -ref 1.5e-007
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

24
tests/evolved/voluved/AGT005 Normal file
View File

@ -0,0 +1,24 @@
puts "=========="
puts "OCC29523"
puts "=========="
profile p X 10 Y 2 X -10 W
polyline t -1 1 0 1.2 1 10
evolved result -s p -p t -a -solid -v
checkprops result -s 266.546 -v 192.639
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 1.5e-7
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

25
tests/evolved/voluved/AGT006 Normal file
View File

@ -0,0 +1,25 @@
puts "=========="
puts "OCC29523"
puts "=========="
# Different results in command "evolved" with and without "-v"
profile p X 10 Y 2 X -10 W
profile t O 0 1 0 P 0 1 0 0 0 1 X 5 T -1 2 WW
evolved result -s p -p t -a -solid -v
checkprops result -s 162.361 -v 95.3333
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 1.5000000368888203e-007
smallview
don result p t
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

28
tests/evolved/voluved/AGT007 Normal file
View File

@ -0,0 +1,28 @@
puts "=========="
puts "OCC29523"
puts "=========="
# Result contains intersected faces
profile p X 15 C 1 90 Y 5 X -7 Y -2 C -1 90 X -8 W
profile t O 0 1 0 P 0 1 0 0 0 1 X 5 T -1 2 WW
evolved result -s p -p t -a -solid -v
checkprops result -s 361.087 -v 312.848
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 1.5e-7
regexp {Tolerance MAX=([-0-9.+eE]+)} [tolerance result] full toler
checkreal MAXTOL $toler 3.0e-007 0.0 0.1
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

25
tests/evolved/voluved/AGT008 Normal file
View File

@ -0,0 +1,25 @@
puts "=========="
puts "OCC29523"
puts "=========="
# Different results with and without "-v"; internal/intersecting faces created
profile p X 10 Y 2 X -10 W
profile t O 0 1 0 P 0 1 0 0 0 1 X 2 RR -45 C 1 90 T -1 2 WW
evolved result -s p -p t -a -solid -v
checkprops result -s 129.967 -v 70.6801
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 3.25e-007
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

25
tests/evolved/voluved/AGT009 Normal file
View File

@ -0,0 +1,25 @@
puts "=========="
puts "OCC29523"
puts "=========="
# Solids are correctly built but r_1 should be eliminated as junk
profile p X 10 Y 2 X -10 W
profile t O 0 1 0 P 0 1 0 0 0 1 RR 30 C -10 60 WW
evolved result -s p -p t -a -solid -v
checkprops result -s 142.657 -v 39.1789
checkshape result
checknbshapes result -solid 2 -shell 2
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 1.0e-7
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

26
tests/evolved/voluved/HMC001 Normal file
View File

@ -0,0 +1,26 @@
puts "=========="
puts "OCC29523"
puts "=========="
restore [locate_data_file bug29523_cut_extrudewire00.brep] sw
restore [locate_data_file bug29523_cut_toolwire00.brep] tw
evolved result -s sw -p tw -solid -a -v
checkprops result -s 1.94263e+010 -v 6.2718e+013
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 0.00010921129251073595
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

26
tests/evolved/voluved/HMC002 Normal file
View File

@ -0,0 +1,26 @@
puts "=========="
puts "OCC29523"
puts "=========="
restore [locate_data_file bug29523_cut_extrudewire01.brep] sw
restore [locate_data_file bug29523_cut_toolwire01.brep] tw
evolved result -s sw -p tw -solid -a -v
checkprops result -s 2.18924e+011 -v 2.47705e+014
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 1.0e-7
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

26
tests/evolved/voluved/HMC003 Normal file
View File

@ -0,0 +1,26 @@
puts "=========="
puts "OCC29523"
puts "=========="
restore [locate_data_file bug29523_cut_extrudewire02.brep] sw
restore [locate_data_file bug29523_cut_toolwire02.brep] tw
evolved result -s sw -p tw -solid -a -v
checkprops result -s 2.18616e+011 -v 2.46411e+014
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 1.6e-5
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

30
tests/evolved/voluved/HMC004 Normal file
View File

@ -0,0 +1,30 @@
puts "=========="
puts "OCC29523"
puts "=========="
restore [locate_data_file bug29523_cut_extrudewire03.brep] sw
restore [locate_data_file bug29523_cut_toolwire03.brep] tw
evolved result -s sw -p tw -solid -a -v
checkprops result -s 3.02832e+010 -v 4.97434e+013
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
# Attention. Tolerance > 1 is quite big. However,
# the dimensions of the shape "result" are about 1.0e+5.
# So, this tolerance seems to be OK.
checkmaxtol result -ref 1.000010000005457
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

26
tests/evolved/voluved/HMC005 Normal file
View File

@ -0,0 +1,26 @@
puts "=========="
puts "OCC29523"
puts "=========="
restore [locate_data_file bug29523_cut_extrudewire04.brep] sw
restore [locate_data_file bug29523_cut_toolwire04.brep] tw
evolved result -s sw -p tw -solid -a -v
checkprops result -s 1.94263e+010 -v 6.2718e+013
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 2.8631382131562824e-006
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

26
tests/evolved/voluved/HMC006 Normal file
View File

@ -0,0 +1,26 @@
puts "=========="
puts "OCC29523"
puts "=========="
restore [locate_data_file bug29523_cut_extrudewire05.brep] sw
restore [locate_data_file bug29523_cut_toolwire05.brep] tw
evolved result -s sw -p tw -solid -a -v
checkprops result -s 2.84249e+010 -v 8.95554e+013
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 4.4607852024588505e-007
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

26
tests/evolved/voluved/HMC007 Normal file
View File

@ -0,0 +1,26 @@
puts "=========="
puts "OCC29523"
puts "=========="
restore [locate_data_file bug29523_cut_extrudewire06.brep] sw
restore [locate_data_file bug29523_cut_toolwire06.brep] tw
evolved result -s sw -p tw -solid -a -v
checkprops result -s 1.99565e+011 -v 6.75431e+014
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 4.7e-6
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

229
tests/evolved/voluved/HMC008 Normal file
View File

@ -0,0 +1,229 @@
puts "=========="
puts "OCC29523"
puts "=========="
cpulimit 100
puts "TODO OCC30438 ALL: Error : The area of result shape is"
puts "TODO OCC30438 ALL: Error : The volume of result shape is"
puts "TODO OCC30438 ALL: Error : is WRONG because number of SHELL"
puts "TODO OCC30438 ALL: Error : is WRONG because number of SOLID"
puts "TODO OCC30438 ALL: Error: bopargcheck has found some faulties in result"
restore [locate_data_file bug29523_cut_extrudewire07.brep] sw
restore [locate_data_file bug29523_cut_toolwire07.brep] tw
# Indeed the source shapes are invalid for evolved algorithm
# (they contain gaps and discontinuous wire). Therefore, we
# make them valid with following script.
# Clear variables
foreach a [directory cur_*] {unset $a}
foreach a [directory ee*] {unset $a}
# Obtain edges from the wire sw and copy their geometry (3D-curve cur_*) to the new edges ee*
set NbEdges [llength [ explode sw e ]]
for {set i 1} { $i <= $NbEdges} {incr i} { mkcurve cur_$i sw_$i }
for {set i 1} { $i <= $NbEdges} {incr i} { mkedge ee$i cur_$i }
# Extend every 3D-curve to cover the gap
trim cur_1 cur_1 4.71239090823492 5.53811019613953
trim cur_2 cur_2 -0.134931759799294 7999.99999936156
trim cur_3 cur_3 1.57079573067402 2.39667036644493
trim cur_4 cur_4 2.3157179964798 3.14159386656777
trim cur_6 cur_6 3.14159205618886 3.96746669323983
trim cur_7 cur_7 3.8865143232747 4.71239019354553
trim cur_9 cur_9 4.71238838316655 5.53826302003487
trim cur_10 cur_10 1.49677804444134e-010 357.366033033755
trim cur_11 cur_11 5.467579522113 6.28318530589953
trim cur_12 cur_12 -4.48015052825212e-005 496000.040846485
trim cur_13 cur_13 5.83654858656781e-007 0.826061103391988
foreach a {{1 2} {3 4} {6 7} {9 10} {10 11} {12 13} {1 13}} {
set i [lindex $a 0]
set j [lindex $a 1]
explode sw_$i v
explode sw_$j v
mkedge ee$i cur_$i
mkedge ee$j cur_$j
emptycopy ee$i ee$i
emptycopy ee$j ee$j
if {[regexp "REVERSED" [whatis sw_$i]]} {
orientation ee$i R
} else {
orientation ee$i F
}
if {[regexp "REVERSED" [whatis sw_$j]]} {
orientation ee$j R
} else {
orientation ee$j F
}
add sw_${i}_1 ee$i
add sw_${i}_2 ee$i
add sw_${j}_1 ee$j
add sw_${j}_2 ee$j
}
# Create new wire without any gaps
bclearobjects
bcleartools
eval baddobjects [directory ee*]
bfillds
bbuild rr
edgestowire ww rr
settolerance ww 1.0e-7
mkplane pl ww
explode pl w
copy pl_1 sw
# Eliminate not smoothness joint between two circles.
# For that, every pair of circles will be joined by their common tangent.
# So, smoothness joint will be provided automatically.
# Clear variables
foreach a [directory cur_*] {unset $a}
foreach a [directory ee*] {unset $a}
foreach a [directory sw_*] {unset $a}
# Obtain edges from the wire sw and copy their geometry (3D-curve cur_*) to the new edges ee*
set NbEdges [llength [ explode sw e ]]
for {set i 1} { $i <= $NbEdges} {incr i} { mkcurve cur_$i sw_$i }
for {set i 1} { $i <= $NbEdges} {incr i} { mkedge ee$i cur_$i }
# Empty compound
compound ce
#Process circles sw_1 and sw_2
# Trim every circle to the tangent point
trim cur_1 cur_1 4.71239090823492 5.49761669005051
trim cur_2 cur_2 5.83654858656781e-007 0.785568617129074
# Fill the created gap by line
line ccf1l2 -24754.1762623319 0 34741.3413352011 2003.1995336714681 0 2003.8825557731907
trim ccf1l2 ccf1l2 0 2833.43495937946
# Recreate necessary edges
mkedge ee1 cur_1
mkedge ee2 cur_2
mkedge el12 ccf1l2
# Add new (linear edge to compound)
add el12 ce
# Process circles sw_4 and sw_6.
# Note that these circles are joined by the line sw_5.
# This line is too small. Therefore it should be eliminated.
unset ee5
# Trim every circle to the tangent point
trim cur_4 cur_4 5.49750649442623 6.28318530589953
trim cur_6 cur_6 4.71238838316655 5.49750649442623
# Fill the created gap by line
line ccf4l6 522755.595179584 0 36741.7037941423 2000.8085436843103 0 -2001.9319102431036
trim ccf4l6 ccf4l6 0 2830.365029767315
# Recreate necessary edges
mkedge ee4 cur_4
mkedge ee6 cur_6
mkedge el46 ccf4l6
# Add new (linear edge to compound)
add el46 ce
# Process circles sw_8 and sw_9."
# It is made analogically to the step 11.1.
# Trim every circle to the tangent point
trim cur_8 cur_8 3.92695569467718 4.71239019354553
trim cur_9 cur_9 3.14159205618886 3.92695569467718
# Fill the created gap by line
line ccf8l9 522745.848826566 0 -24750.3286992239 2002.755997602304 0 2002.754818110996
trim ccf8l9 ccf8l9 0 2832.3238599070564
# Recreate necessary edges
mkedge ee8 cur_8
mkedge ee9 cur_9
mkedge el89 ccf8l9
# Add new (linear edge to compound)
add el89 ce
# Process circles sw_11 and sw_12
# It is made analogically to the step 11.1.
# Trim every circle to the tangent point
trim cur_11 cur_11 2.3561593678824 3.14159386656777
trim cur_12 cur_12 1.57079573067402 2.3561593678824
# Fill the created gap by line
line ccf11l12 -24750.328699221 0 -22745.8488265693 2002.7548181108614 0 -2002.7559976021548
trim ccf11l12 ccf11l12 0 2832.323859906856
# Recreate necessary edges
mkedge ee11 cur_11
mkedge ee12 cur_12
mkedge el1112 ccf11l12
# Add new (linear edge to compound)
add el1112 ce
# Build wire from compound of edges"
foreach a [directory ee*] {add $a ce}
bclearobjects
bcleartools
eval baddcompound ce
bfillds
bbuild rr
edgestowire ww rr
# Check planarity
mkplane pl ww
explode pl w
copy pl_1 sw
tscale sw 0 0 0 1.0e-3
tscale tw 0 0 0 1.0e-3
removeloc sw sw
removeloc tw tw
evolved result -s sw -p tw -solid -a -v
tscale result 0 0 0 1000
checkprops result -s 1.99565e+011 -v 6.75431e+014
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in result"
}
# Attention. Tolerance > 1 is quite big. However,
# the dimensions of the shape "result" are about 1.0e+5.
# So, this tolerance seems to be OK.
checkmaxtol result -ref 18.634531507134731
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

236
tests/evolved/voluved/HMC009 Normal file
View File

@ -0,0 +1,236 @@
puts "=========="
puts "OCC29523"
puts "=========="
restore [locate_data_file bug29523_cut_extrudewire08.brep] sw
restore [locate_data_file bug29523_cut_toolwire08.brep] tw
# Indeed the source shapes are invalid for evolved algorithm
# (they contain gaps and discontinuous wire). Therefore, we
# make them valid with following script.
# Clear variables
foreach a [directory cur_*] {unset $a}
foreach a [directory ee*] {unset $a}
# Obtain edges from the wire sw and copy their geometry (3D-curve cur_*) to the new edges ee*
set NbEdges [llength [ explode sw e ]]
for {set i 1} { $i <= $NbEdges} {incr i} { mkcurve cur_$i sw_$i }
for {set i 1} { $i <= $NbEdges} {incr i} { mkedge ee$i cur_$i }
trim cur_1 cur_1 6.57409148379884e-010 25541.868037099
trim cur_2 cur_2 0.488694408745945 1.07405488703373
trim cur_3 cur_3 0.985620666922634 1.57079843167744
trim cur_5 cur_5 1.57079573067402 2.39667036644493
trim cur_6 cur_6 2.3157179964798 3.14159386656777
trim cur_8 cur_8 3.14159205618886 3.96746669323982
trim cur_9 cur_9 3.88651432327475 4.7123901935455
trim cur_11 cur_11 4.71238838316667 5.53826302003462
trim cur_12 cur_12 -7.31217388895948e-010 357.366033033913
trim cur_13 cur_13 5.46757952211301 6.28318530589953
trim cur_14 cur_14 -4.48015052825212e-005 473931.684018372
trim cur_15 cur_15 1.20053942593701e-006 0.486331243523059
foreach a {{1 2} {2 3} {5 6} {8 9} {11 12} {12 13} {14 15} {1 15}} {
set i [lindex $a 0]
set j [lindex $a 1]
explode sw_$i v
explode sw_$j v
mkedge ee$i cur_$i
mkedge ee$j cur_$j
emptycopy ee$i ee$i
emptycopy ee$j ee$j
if {[regexp "REVERSED" [whatis sw_$i]]} {
orientation ee$i R
} else {
orientation ee$i F
}
if {[regexp "REVERSED" [whatis sw_$j]]} {
orientation ee$j R
} else {
orientation ee$j F
}
add sw_${i}_1 ee$i
add sw_${i}_2 ee$i
add sw_${j}_1 ee$j
add sw_${j}_2 ee$j
}
# Step 11. Create new wire without any gaps
bclearobjects
bcleartools
eval baddobjects [directory ee*]
bfillds
bbuild rr
edgestowire ww rr
settolerance ww 1.0e-7
mkplane pl ww
explode pl w
copy pl_1 sw
# Step 12. Eliminate not smoothness joint between two circles.
# For that, every pair of circles will be joined by their common tangent.
# So, smoothness joint will be provided automatically.
# Clear variables
foreach a [directory cur_*] {unset $a}
foreach a [directory ee*] {unset $a}
foreach a [directory sw_*] {unset $a}
# Obtain edges from the wire sw and copy their geometry (3D-curve cur_*) to the new edges ee*
set NbEdges [llength [ explode sw e ]]
for {set i 1} { $i <= $NbEdges} {incr i} { mkcurve cur_$i sw_$i }
for {set i 1} { $i <= $NbEdges} {incr i} { mkedge ee$i cur_$i }
# Empty compound
compound ce
# Step 12.1. Process circles sw_3 and sw_5.
# Note that these circles are joined by the line sw_4.
# This line is too small. Therefore it should be eliminated.
unset ee4
# Trim every circle to the tangent point
trim cur_3 cur_3 5.49750649442626 6.28318530589953
trim cur_5 cur_5 4.71238838316667 5.49750649442626
# Fill the created gap by line
line ccf3l5 522755.595179583 0 84741.703794143 2000.808543679188 0 -2001.9319102384907
trim ccf3l5 ccf3l5 0 2830.365029760431
# Recreate necessary edges
mkedge ee3 cur_3
mkedge ee5 cur_5
mkedge el35 ccf3l5
# Add new (linear) edge to compound
add el35 ce
# Step 12.2. Process circles sw_7 and sw_8
# Trim every circle to the tangent point
trim cur_7 cur_7 3.92695569468046 4.7123901935455
trim cur_8 cur_8 3.14159205618886 3.92695569468046
# Fill the created gap by line
line ccf7l8 524748.604824248 0 -22747.573881033 -2002.755997600907 0 -2002.7548181097663
trim ccf7l8 ccf7l8 0 2832.3238599051992
# Recreate necessary edges
mkedge ee7 cur_7
mkedge ee8 cur_8
mkedge el78 ccf7l8
# Add new (linear) edge to compound
add el78 ce
# Step 11.3. Process circles sw_10 and sw_11.
# It is made analogically to the step 12.2.
# Trim every circle to the tangent point
trim cur_10 cur_10 2.3561593678821 3.14159386656777
trim cur_11 cur_11 1.57079573067402 2.3561593678821
# Fill the created gap by line
line ccf10l11 -24750.3286992284 0 -22745.8488265618 2002.7548181109923 0 -2002.7559976022822
trim ccf10l11 ccf10l11 0 2832.3238599070387
# Recreate necessary edges
mkedge ee10 cur_10
mkedge ee11 cur_11
mkedge el1011 ccf10l11
# Add new (linear edge to compound)
add el1011 ce
# Step 12.4. Process circles sw_13 and sw_14.
# It is made analogically to the step 12.2.
# Trim every circle to the tangent point
trim cur_13 cur_13 1.02983856973504 1.57079843167744
trim cur_14 cur_14 0.488694408745945 1.02983856973504
# Fill the created gap by line
line ccf13l14 -28409.9420261742 0 66073.105965381 -1593.2045777171916 0 -2652.1042208640938
trim ccf13l14 ccf13l14 0 3093.8580485833795
# Recreate necessary edges
mkedge ee13 cur_13
mkedge ee14 cur_14
mkedge el1314 ccf13l14
# Add new (linear edge to compound)
add el1314 ce
# Step 13. Join two lines (sw_15 and sw_2 with "smooth circle")
trim cur_2 cur_2 -4.48015052825212e-005 473931.43880149431
trim cur_15 cur_15 81.530450931155428 25541.868037099
circle cur_1 2.406856119850569e+004, 0.000000000000000e+000, 6.000556224103060e+004 0 1 0 34994.3148920752
trim cur_1 cur_1 -0.4886661927028566 0
mkedge ee1 cur_1
mkedge ee2 cur_2
mkedge ee15 cur_15
# Step 14. Build wire from compound of edges
foreach a [directory ee*] {add $a ce}
bclearobjects
bcleartools
eval baddcompound ce
bfillds
bbuild rr
edgestowire ww rr
# Step 15. Check planarity
mkplane pl ww
explode pl w
copy pl_1 sw
#Step 15. Process of profile
settolerance tw 1.0e-7
mkplane pl tw
explode pl w
copy pl_1 tw
tscale sw 0 0 0 1.0e-3
tscale tw 0 0 0 1.0e-3
removeloc sw sw
removeloc tw tw
evolved result -s sw -p tw -solid -a -v
tscale result 0 0 0 1000
checkprops result -s 2.13384e+011 -v 7.22142e+014
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 3.5169018900217868
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

28
tests/evolved/voluved/HMC010 Normal file
View File

@ -0,0 +1,28 @@
puts "=========="
puts "OCC29523"
puts "=========="
cpulimit 60
restore [locate_data_file bug29523_cut_extrudewire09.brep] sw
restore [locate_data_file bug29523_cut_toolwire09.brep] tw
evolved result -s sw -p tw -solid -a -v
checkprops result -s 21088.8 -v 75993.1
checkshape result
checknbshapes result -solid 1 -shell 1
if {[regexp "Faulties" [bopargcheck result]]} {
puts "Error: bopargcheck has found some faulties in res2"
}
checkmaxtol result -ref 0.031968491076118669
smallview
don result sw tw
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

1
tests/evolved/voluved/begin Normal file
View File

@ -0,0 +1 @@
set subgroup voluved

20
tests/evolved/voluved/bug26470_1 Normal file
View File

@ -0,0 +1,20 @@
puts "========"
puts "OCC26470"
puts "========"
puts ""
##################################################
# BRepFill_Evolved: exception and invalid result
##################################################
restore [locate_data_file OCC26470-ClosedWire.brep] a
restore [locate_data_file OCC26470-wprof1.brep] b
evolved result -s a -p b -a -v
checkshape result
checkprops result -s 558.33
smallview
don result a b
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

20
tests/evolved/voluved/bug26470_2 Normal file
View File

@ -0,0 +1,20 @@
puts "========"
puts "OCC26470"
puts "========"
puts ""
##################################################
# BRepFill_Evolved: exception and invalid result
##################################################
restore [locate_data_file OCC26470-ClosedWire.brep] a
restore [locate_data_file OCC26470-wprof2.brep] b
evolved result -s a -p b -a -v
checkshape result
checkprops result -s 572.14
smallview
don result a b
fit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

20
tests/evolved/voluved/pro19424 Normal file
View File

@ -0,0 +1,20 @@
puts "=========="
puts "PRO19424"
puts "=========="
restore [locate_data_file pro19424a.brep] b
checkshape b
restore [locate_data_file pro19424b.brep] p
checkshape p
if [catch {evolved result -s b -p p -a -v } catch_result] {
puts "Faulty PRO19424 : function EVOLVED works wrongly"
} else {
puts "PRO19424 OK: function EVOLVED works properly"
}
checkprops result -s 246.506
checkshape result
checkview -display result -2d -path ${imagedir}/${test_image}.png