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

0025926: 3D offset in mode "Complete" with Join type "Intersection"

Browse Source 
Extension for colliding cases (Limited to work on planar cases only).

Test cases for issue CR25926

Update of test-cases according to the new behavior
This commit is contained in:
emv 2015-10-30 16:27:02 +03:00 committed by bugmaster
parent b40693b0c2
commit 9b7f3f83c0
168 changed files with 4641 additions and 2011 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/BRepAlgo/BRepAlgo_Tool.cxx
View File

@ -49,8 +49,15 @@ TopoDS_Shape BRepAlgo_Tool::Deboucle3D(const TopoDS_Shape& S,
Standard_Boolean JeGarde = Standard_True;
for ( Standard_Integer i = 1; i <= Map.Extent() && JeGarde; i++) {
if (Map(i).Extent() < 2) {
const TopTools_ListOfShape& aLF = Map(i);
if (aLF.Extent() < 2) {
const TopoDS_Edge& anEdge = TopoDS::Edge(Map.FindKey(i));
if (anEdge.Orientation() == TopAbs_INTERNAL) {
const TopoDS_Face& aFace = TopoDS::Face(aLF.First());
if (aFace.Orientation() != TopAbs_INTERNAL) {
continue;
}
}
if (!Boundary.Contains(anEdge) &&
!BRep_Tool::Degenerated(anEdge) )
JeGarde = Standard_False;

54
src/BRepOffset/BRepOffset_Inter2d.cxx
View File

@ -267,6 +267,7 @@ static void Store (const TopoDS_Edge& E1,
//=======================================================================
static void EdgeInter(const TopoDS_Face& F,
const BRepAdaptor_Surface& BAsurf,
const TopoDS_Edge& E1,
const TopoDS_Edge& E2,
const Handle(BRepAlgo_AsDes)& AsDes,
@ -330,7 +331,7 @@ static void EdgeInter(const TopoDS_Face& F,
DegPoint = CEdeg.Value( CEdeg.FirstParameter() );
}
}
BRepAdaptor_Surface BAsurf(F);
//
Handle(Geom2d_Curve) pcurve1 = BRep_Tool::CurveOnSurface(E1, F, f[1], l[1]);
Handle(Geom2d_Curve) pcurve2 = BRep_Tool::CurveOnSurface(E2, F, f[2], l[2]);
Geom2dAdaptor_Curve GAC1(pcurve1, f[1], l[1]);
@ -537,6 +538,7 @@ static void EdgeInter(const TopoDS_Face& F,
//=======================================================================
static void RefEdgeInter(const TopoDS_Face& F,
const BRepAdaptor_Surface& BAsurf,
const TopoDS_Edge& E1,
const TopoDS_Edge& E2,
const Handle(BRepAlgo_AsDes)& AsDes,
@ -598,7 +600,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
DegPoint = CEdeg.Value( CEdeg.FirstParameter() );
}
}
BRepAdaptor_Surface BAsurf(F);
//
Handle(Geom2d_Curve) pcurve1 = BRep_Tool::CurveOnSurface(E1, F, f[1], l[1]);
Handle(Geom2d_Curve) pcurve2 = BRep_Tool::CurveOnSurface(E2, F, f[2], l[2]);
Geom2dAdaptor_Curve GAC1(pcurve1, f[1], l[1]);
@ -1427,7 +1429,8 @@ void BRepOffset_Inter2d::Compute (const Handle(BRepAlgo_AsDes)& AsDes,
const TopTools_ListOfShape& LE = AsDes->Descendant(F);
TopoDS_Vertex V1,V2;
Standard_Integer j, i = 1;
BRepAdaptor_Surface BAsurf(F);
//
for ( it1LE.Initialize(LE) ; it1LE.More(); it1LE.Next()) {
const TopoDS_Edge& E1 = TopoDS::Edge(it1LE.Value());
j = 1;
@ -1442,7 +1445,7 @@ void BRepOffset_Inter2d::Compute (const Handle(BRepAlgo_AsDes)& AsDes,
if ( (!EdgesOfFace.Contains(E1) || !EdgesOfFace.Contains(E2)) &&
(NewEdges.Contains(E1) || NewEdges.Contains(E2)) ) {
TopoDS_Shape aLocalShape = F.Oriented(TopAbs_FORWARD);
EdgeInter(TopoDS::Face(aLocalShape),E1,E2,AsDes,Tol,Standard_True);
EdgeInter(TopoDS::Face(aLocalShape),BAsurf,E1,E2,AsDes,Tol,Standard_True);
// EdgeInter(TopoDS::Face(F.Oriented(TopAbs_FORWARD)),E1,E2,AsDes,Tol,Standard_True);
}
it2LE.Next();
@ -1465,6 +1468,7 @@ void BRepOffset_Inter2d::ConnexIntByInt
TopTools_DataMapOfShapeShape& MES,
const TopTools_DataMapOfShapeShape& Build,
const Handle(BRepAlgo_AsDes)& AsDes,
const Handle(BRepAlgo_AsDes)& AsDes2d,
const Standard_Real Offset,
const Standard_Real Tol)
// Modified by skv - Fri Dec 26 16:53:18 2003 OCC4455 End
@ -1505,6 +1509,16 @@ void BRepOffset_Inter2d::ConnexIntByInt
TopoDS_Face FIO = TopoDS::Face(OFI.Face());
if (MES.IsBound(FIO)) FIO = TopoDS::Face(MES(FIO));
//
TopTools_MapOfShape aME;
const TopTools_ListOfShape& aLE = AsDes->Descendant(FIO);
TopTools_ListIteratorOfListOfShape aItLE(aLE);
for (; aItLE.More(); aItLE.Next()) {
const TopoDS_Shape& aE = aItLE.Value();
aME.Add(aE);
}
//
BRepAdaptor_Surface BAsurf(FIO);
TopExp_Explorer exp(FI.Oriented(TopAbs_FORWARD),TopAbs_WIRE);
for (; exp.More(); exp.Next()) {
@ -1569,8 +1583,29 @@ void BRepOffset_Inter2d::ConnexIntByInt
TopExp_Explorer Exp1,Exp2;
for (Exp1.Init(NE1,TopAbs_EDGE) ; Exp1.More(); Exp1.Next()) {
for (Exp2.Init(NE2,TopAbs_EDGE) ; Exp2.More(); Exp2.Next()) {
RefEdgeInter(FIO,TopoDS::Edge(Exp1.Current()),TopoDS::Edge(Exp2.Current()),
AsDes,Tol,Standard_True/*Standard_False*/, Pref);
RefEdgeInter(FIO,BAsurf,TopoDS::Edge(Exp1.Current()),TopoDS::Edge(Exp2.Current()),
AsDes2d,Tol,Standard_True/*Standard_False*/, Pref);
}
}
//
if (Build.IsBound(Vref)) {
TopoDS_Shape NE3 = Build(Vref);
//
for (Exp2.Init(NE3,TopAbs_EDGE) ; Exp2.More(); Exp2.Next()) {
const TopoDS_Edge& aE3 = *(TopoDS_Edge*)&Exp2.Current();
if (!aME.Contains(aE3)) {
continue;
}
//
for (Exp1.Init(NE1,TopAbs_EDGE) ; Exp1.More(); Exp1.Next()) {
RefEdgeInter(FIO,BAsurf,TopoDS::Edge(Exp1.Current()),aE3,
AsDes2d,Tol,Standard_True/*Standard_False*/, Pref);
}
//
for (Exp1.Init(NE2,TopAbs_EDGE) ; Exp1.More(); Exp1.Next()) {
RefEdgeInter(FIO,BAsurf,TopoDS::Edge(Exp1.Current()),aE3,
AsDes2d,Tol,Standard_True/*Standard_False*/, Pref);
}
}
}
}
@ -1578,18 +1613,15 @@ void BRepOffset_Inter2d::ConnexIntByInt
if (MES.IsBound(CEO)) {
TopoDS_Vertex V = CommonVertex(CEO,NEO);
UpdateVertex (V,CEO,TopoDS::Edge(MES(CEO)),Tol);
AsDes->Add (MES(CEO),V);
AsDes2d->Add (MES(CEO),V);
}
else if (MES.IsBound(NEO)) {
TopoDS_Vertex V = CommonVertex(CEO,NEO);
UpdateVertex (V,NEO,TopoDS::Edge(MES(NEO)),Tol);
AsDes->Add (MES(NEO),V);
AsDes2d->Add (MES(NEO),V);
}
}
CurE = NextE;
}
}
}

28
src/BRepOffset/BRepOffset_Inter2d.hxx
View File

@ -41,31 +41,27 @@ public:
//! Computes the intersections between the edges stored
//! is AsDes as descendants of <F> . Intersections is computed
//! between two edges if one of them is bound in NewEdges.
Standard_EXPORT static void Compute (const Handle(BRepAlgo_AsDes)& AsDes, const TopoDS_Face& F, const TopTools_IndexedMapOfShape& NewEdges, const Standard_Real Tol);
Standard_EXPORT static void Compute (const Handle(BRepAlgo_AsDes)& AsDes,
const TopoDS_Face& F,
const TopTools_IndexedMapOfShape& NewEdges,
const Standard_Real Tol);
Standard_EXPORT static void ConnexIntByInt (const TopoDS_Face& FI, BRepOffset_Offset& OFI, TopTools_DataMapOfShapeShape& MES, const TopTools_DataMapOfShapeShape& Build, const Handle(BRepAlgo_AsDes)& AsDes, const Standard_Real Offset, const Standard_Real Tol);
Standard_EXPORT static void ConnexIntByInt (const TopoDS_Face& FI,
BRepOffset_Offset& OFI,
TopTools_DataMapOfShapeShape& MES,
const TopTools_DataMapOfShapeShape& Build,
const Handle(BRepAlgo_AsDes)& AsDes,
const Handle(BRepAlgo_AsDes)& AsDes2d,
const Standard_Real Offset,
const Standard_Real Tol);
protected:
private:
};
#endif // _BRepOffset_Inter2d_HeaderFile

451
src/BRepOffset/BRepOffset_Inter3d.cxx
View File

@ -30,6 +30,7 @@
#include <BRepOffset_Offset.hxx>
#include <BRepOffset_Tool.hxx>
#include <Extrema_ExtPC.hxx>
#include <GeomAPI_ProjectPointOnCurve.hxx>
#include <Precision.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
@ -98,109 +99,52 @@ static void ExtentEdge(const TopoDS_Face& /*F*/,
//function : SelectEdge
//purpose :
//=======================================================================
static void SelectEdge (const TopoDS_Face& /*F*/,
const TopoDS_Face& /*EF*/,
const TopoDS_Edge& E,
TopTools_ListOfShape& LInt)
static void SelectEdge (const TopoDS_Shape& theS,
TopTools_ListOfShape& theLE)
{
//------------------------------------------------------------
// Proofing on the intersections on periodical faces
//------------------------------------------------------------
TopTools_ListIteratorOfListOfShape it(LInt);
// Modified by Sergey KHROMOV - Wed Jun 5 11:43:04 2002 Begin
// Standard_Real dU = 1.0e100;
Standard_Real dU = RealLast();
// Modified by Sergey KHROMOV - Wed Jun 5 11:43:05 2002 End
TopoDS_Edge GE;
Standard_Real Fst, Lst, tmp;
BRep_Tool::Range(E, Fst, Lst);
BRepAdaptor_Curve Ad1(E);
gp_Pnt PFirst = Ad1.Value( Fst );
gp_Pnt PLast = Ad1.Value( Lst );
// Modified by Sergey KHROMOV - Wed Jun 5 11:23:10 2002 Begin
Extrema_ExtPC anExt;
// Modified by Sergey KHROMOV - Wed Jun 5 11:23:11 2002 End
//----------------------------------------------------------------------
// Selection of edge that coversmost of the domain of the initial edge.
//----------------------------------------------------------------------
for (; it.More(); it.Next()) {
const TopoDS_Edge& EI = TopoDS::Edge(it.Value());
BRep_Tool::Range(EI, Fst, Lst);
BRepAdaptor_Curve Ad2(EI);
// Modified by Sergey KHROMOV - Wed Jun 5 11:25:03 2002 Begin
Standard_Integer i;
Standard_Real aTol = BRep_Tool::Tolerance(EI);
Standard_Boolean isMinFound = Standard_False;
Standard_Real aSqrDist1 = Precision::Infinite();
Standard_Real aSqrDist2 = Precision::Infinite();
anExt.Initialize(Ad2, Fst, Lst, aTol);
// Seek for the min distance for PFirst:
anExt.Perform(PFirst);
if (anExt.IsDone()) {
for (i = 1; i <= anExt.NbExt(); i++) {
if (anExt.IsMin(i)) {
const gp_Pnt &aPMin = anExt.Point(i).Value();
aSqrDist1 = PFirst.SquareDistance(aPMin);
isMinFound = Standard_True;
break;
Standard_Real aT1, aT2, aDist, aDistMin;
TopExp_Explorer aExp;
TopTools_ListIteratorOfListOfShape aIt;
GeomAPI_ProjectPointOnCurve aProjPC;
gp_Pnt aPE1, aPE2;
TopoDS_Edge aRE;
//
aDistMin = RealLast();
//
aIt.Initialize(theLE);
for (; aIt.More(); aIt.Next()) {
const TopoDS_Edge& aE = *(TopoDS_Edge*)&aIt.Value();
//
const Handle(Geom_Curve)& aC = BRep_Tool::Curve(aE, aT1, aT2);
//
aProjPC.Init(aC, aT1, aT2);
aPE1 = aC->Value(aT1);
aPE2 = aC->Value(aT2);
//
aDist = 0.;
aExp.Init(theS, TopAbs_VERTEX);
for (; aExp.More(); aExp.Next()) {
const TopoDS_Vertex& aV = *(TopoDS_Vertex*)&aExp.Current();
const gp_Pnt aP = BRep_Tool::Pnt(aV);
//
aProjPC.Perform(aP);
if (aProjPC.NbPoints()) {
aDist += aProjPC.LowerDistance();
}
else {
aDist += Min(aP.Distance(aPE1), aP.Distance(aPE2));
}
}
}
if (!isMinFound) {
gp_Pnt aP1 = Ad2.Value(Fst);
gp_Pnt aP2 = Ad2.Value(Lst);
aSqrDist1 = Min(aP1.SquareDistance(PFirst), aP2.SquareDistance(PFirst));
}
// Seek for the min distance for PLast:
isMinFound = Standard_False;
anExt.Perform(PLast);
if (anExt.IsDone()) {
for (i = 1; i <= anExt.NbExt(); i++) {
if (anExt.IsMin(i)) {
const gp_Pnt &aPMin = anExt.Point(i).Value();
aSqrDist2 = PLast.SquareDistance(aPMin);
isMinFound = Standard_True;
break;
//
if (aDist < aDistMin) {
aDistMin = aDist;
aRE = aE;
}
}
//
theLE.Clear();
theLE.Append(aRE);
}
if (!isMinFound) {
gp_Pnt aP1 = Ad2.Value(Fst);
gp_Pnt aP2 = Ad2.Value(Lst);
aSqrDist2 = Min(aP1.SquareDistance(PLast), aP2.SquareDistance(PLast));
}
tmp = aSqrDist1 + aSqrDist2;
// gp_Pnt P1 = Ad2.Value(Fst);
// gp_Pnt P2 = Ad2.Value(Lst);
// tmp = P1.Distance(PFirst) + P2.Distance(PLast);
if( tmp <= dU ) {
dU = tmp;
GE = EI;
}
// Modified by Sergey KHROMOV - Wed Jun 5 11:24:54 2002 End
}
LInt.Clear();
LInt.Append(GE);
}
//=======================================================================
//function : CompletInt
@ -301,13 +245,19 @@ void BRepOffset_Inter3d::FaceInter(const TopoDS_Face& F1,
// UNSUFFICIENT, but a larger criterion shakes too
// many sections.
//--------------------------------------------------------
if (InterFaces &&
BRepOffset_Tool::HasCommonShapes(TopoDS::Face(InitF1),
TopoDS::Face(InitF2),LE,LV))
if (!LE.IsEmpty())
if (InterFaces) {
if (BRepOffset_Tool::HasCommonShapes(TopoDS::Face(InitF1),
TopoDS::Face(InitF2),LE,LV)) {
if (!LE.IsEmpty()) {
BRepOffset_Tool::Inter3D (F1,F2,LInt1,LInt2,mySide,NullEdge);
}
}
else {
BRepOffset_Tool::Inter3D(F1,F2,LInt1,LInt2,mySide,NullEdge);
}
}
}
}
}
else {
if (InterPipes) {
@ -474,34 +424,127 @@ void BRepOffset_Inter3d::ConnexIntByInt
const BRepOffset_Analyse& Analyse,
TopTools_DataMapOfShapeShape& MES,
TopTools_DataMapOfShapeShape& Build,
TopTools_ListOfShape& Failed)
TopTools_ListOfShape& Failed,
const Standard_Boolean bIsPlanar)
{
//TopExp_Explorer Exp(SI,TopAbs_EDGE);
TopTools_IndexedMapOfShape Emap;
TopExp::MapShapes( SI, TopAbs_EDGE, Emap );
TopTools_IndexedMapOfShape VEmap;
TopTools_IndexedDataMapOfShapeListOfShape aMVF;
TopoDS_Face F1,F2,OF1,OF2,NF1,NF2;
TopAbs_State CurSide = mySide;
BRep_Builder B;
TopTools_ListIteratorOfListOfShape it;
//for (; Exp.More(); Exp.Next()) {
for (Standard_Integer i = 1; i <= Emap.Extent(); i++) {
//const TopoDS_Edge& E = TopoDS::Edge(Exp.Current());
const TopoDS_Edge& E = TopoDS::Edge(Emap(i));
Standard_Boolean bEdge;
Standard_Integer i, aNb;
TopTools_ListIteratorOfListOfShape it, it1, itF1, itF2;
//
TopExp::MapShapes(SI, TopAbs_EDGE , VEmap);
// map the shape for vertices
if (bIsPlanar) {
TopExp::MapShapes(SI, TopAbs_VERTEX, VEmap);
TopExp::MapShapesAndAncestors(SI, TopAbs_VERTEX, TopAbs_FACE, aMVF);
}
//
aNb = VEmap.Extent();
for (i = 1; i <= aNb; ++i) {
const TopoDS_Shape& aS = VEmap(i);
//
TopoDS_Edge E;
TopTools_ListOfShape aLF1, aLF2;
//
bEdge = (aS.ShapeType() == TopAbs_EDGE);
if (bEdge) {
// faces connected by the edge
E = *(TopoDS_Edge*)&aS;
//
const BRepOffset_ListOfInterval& L = Analyse.Type(E);
if (!L.IsEmpty()) {
if (L.IsEmpty()) {
continue;
}
//
BRepOffset_Type OT = L.First().Type();
if (OT == BRepOffset_Convex || OT == BRepOffset_Concave) {
if (OT != BRepOffset_Convex && OT != BRepOffset_Concave) {
continue;
}
//
if (OT == BRepOffset_Concave) CurSide = TopAbs_IN;
else CurSide = TopAbs_OUT;
//-----------------------------------------------------------
// edge is of the proper type, return adjacent faces.
//-----------------------------------------------------------
const TopTools_ListOfShape& Anc = Analyse.Ancestors(E);
if (Anc.Extent() != 2) continue;
if (Anc.Extent() != 2) {
continue;
}
//
F1 = TopoDS::Face(Anc.First());
F2 = TopoDS::Face(Anc.Last ());
OF1 = TopoDS::Face(MapSF(F1).Face()); OF2 = TopoDS::Face(MapSF(F2).Face());
//
aLF1.Append(F1);
aLF2.Append(F2);
}
else {
// faces connected by the vertex
const TopTools_ListOfShape& aLF = aMVF.FindFromKey(aS);
if (aLF.Extent() < 2) {
continue;
}
//
Standard_Boolean bVertexOnly = Standard_False;
TopTools_MapOfShape aMFence;
//
it.Initialize(aLF);
for (; it.More(); it.Next()) {
const TopoDS_Face& aFV1 = *(TopoDS_Face*)&it.Value();
if (!aMFence.Add(aFV1)) {
continue;
}
//
TopTools_MapOfShape aME;
TopExp_Explorer aExp(aFV1, TopAbs_EDGE);
for (; aExp.More(); aExp.Next()) {
aME.Add(aExp.Current());
}
//
it1.Initialize(aLF);
for (it1.Next(); it1.More(); it1.Next()) {
const TopoDS_Face& aFV2 = *(TopoDS_Face*)&it1.Value();
if (aMFence.Contains(aFV2)) {
continue;
}
//
bVertexOnly = Standard_True;
aExp.Init(aFV2, TopAbs_EDGE);
for (; aExp.More(); aExp.Next()) {
const TopoDS_Shape& aEV2 = aExp.Current();
if (aME.Contains(aEV2)) {
bVertexOnly = Standard_False;
break;
}
}
//
if (bVertexOnly) {
aLF1.Append(aFV1);
aLF2.Append(aFV2);
aMFence.Add(aFV2);
}
}
}
//
if (aLF1.IsEmpty()) {
continue;
}
//
CurSide = mySide;
}
//
itF1.Initialize(aLF1);
itF2.Initialize(aLF2);
for (; itF1.More() && itF2.More(); itF1.Next(), itF2.Next()) {
F1 = TopoDS::Face(itF1.Value());
F2 = TopoDS::Face(itF2.Value());
//
OF1 = TopoDS::Face(MapSF(F1).Face());
OF2 = TopoDS::Face(MapSF(F2).Face());
if (!MES.IsBound(OF1)) {
Standard_Boolean enlargeU = Standard_True;
Standard_Boolean enlargeVfirst = Standard_True, enlargeVlast = Standard_True;
@ -512,6 +555,7 @@ void BRepOffset_Inter3d::ConnexIntByInt
else {
NF1 = TopoDS::Face(MES(OF1));
}
//
if (!MES.IsBound(OF2)) {
Standard_Boolean enlargeU = Standard_True;
Standard_Boolean enlargeVfirst = Standard_True, enlargeVlast = Standard_True;
@ -522,27 +566,41 @@ void BRepOffset_Inter3d::ConnexIntByInt
else {
NF2 = TopoDS::Face(MES(OF2));
}
//
if (!IsDone(NF1,NF2)) {
TopTools_ListOfShape LInt1,LInt2;
BRepOffset_Tool::Inter3D (NF1,NF2,LInt1,LInt2,CurSide,E,Standard_True);
if (LInt1.Extent() > 1)
{
BRepOffset_Tool::Inter3D (NF1,NF2,LInt1,LInt2,CurSide,E,bEdge);
if (LInt1.Extent() > 1) {
// intersection is in seceral edges (free sewing)
SelectEdge( NF1, NF2, E, LInt1 );
SelectEdge( NF1, NF2, E, LInt2 );
SelectEdge(aS, LInt1);
SelectEdge(aS, LInt2);
}
SetDone(NF1,NF2);
if (!LInt1.IsEmpty()) {
Store (NF1,NF2,LInt1,LInt2);
//
TopoDS_Compound C;
B.MakeCompound(C);
for (it.Initialize(LInt1) ; it.More(); it.Next()) {
B.Add(C,it.Value());
//
if (Build.IsBound(aS)) {
const TopoDS_Shape& aSE = Build(aS);
TopExp_Explorer aExp(aSE, TopAbs_EDGE);
for (; aExp.More(); aExp.Next()) {
const TopoDS_Shape& aNE = aExp.Current();
B.Add(C, aNE);
}
Build.Bind(E,C);
}
//
it.Initialize(LInt1);
for (; it.More(); it.Next()) {
const TopoDS_Shape& aNE = it.Value();
B.Add(C, aNE);
}
//
Build.Bind(aS,C);
}
else {
Failed.Append(E);
Failed.Append(aS);
}
} else { // IsDone(NF1,NF2)
// Modified by skv - Fri Dec 26 12:20:13 2003 OCC4455 Begin
@ -551,31 +609,37 @@ void BRepOffset_Inter3d::ConnexIntByInt
if (!aLInt1.IsEmpty()) {
TopoDS_Compound C;
TopTools_ListIteratorOfListOfShape anIt2;
B.MakeCompound(C);
//
if (Build.IsBound(aS)) {
const TopoDS_Shape& aSE = Build(aS);
TopExp_Explorer aExp(aSE, TopAbs_EDGE);
for (; aExp.More(); aExp.Next()) {
const TopoDS_Shape& aNE = aExp.Current();
B.Add(C, aNE);
}
}
//
for (it.Initialize(aLInt1) ; it.More(); it.Next()) {
const TopoDS_Shape &anE1 = it.Value();
for (anIt2.Initialize(aLInt2) ; anIt2.More(); anIt2.Next()) {
const TopoDS_Shape &anE2 = anIt2.Value();
//
for (it1.Initialize(aLInt2) ; it1.More(); it1.Next()) {
const TopoDS_Shape &anE2 = it1.Value();
if (anE1.IsSame(anE2))
B.Add(C, anE1);
}
}
Build.Bind(E,C);
Build.Bind(aS,C);
}
else {
Failed.Append(E);
Failed.Append(aS);
}
}
}
// Modified by skv - Fri Dec 26 12:20:14 2003 OCC4455 End
}
}
}
}
//=======================================================================
//function : ContextIntByInt
@ -589,7 +653,8 @@ void BRepOffset_Inter3d::ContextIntByInt
const BRepOffset_Analyse& Analyse,
TopTools_DataMapOfShapeShape& MES,
TopTools_DataMapOfShapeShape& Build,
TopTools_ListOfShape& Failed)
TopTools_ListOfShape& Failed,
const Standard_Boolean bIsPlanar)
{
TopTools_MapOfShape MV;
TopExp_Explorer exp;
@ -597,10 +662,12 @@ void BRepOffset_Inter3d::ContextIntByInt
TopoDS_Edge OE;
TopoDS_Compound C;
BRep_Builder B;
TopTools_ListIteratorOfListOfShape it;
Standard_Integer i;
TopTools_ListIteratorOfListOfShape it, itF;
Standard_Integer i, j, aNb, aNbVE;
Standard_Boolean bEdge;
for (i = 1; i <= ContextFaces.Extent(); i++) {
aNb = ContextFaces.Extent();
for (i = 1; i <= aNb; i++) {
const TopoDS_Face& CF = TopoDS::Face(ContextFaces(i));
myTouched.Add(CF);
if (ExtentContext) {
@ -610,14 +677,31 @@ void BRepOffset_Inter3d::ContextIntByInt
}
TopAbs_State Side = TopAbs_OUT;
for (i = 1; i <= ContextFaces.Extent(); i++) {
for (i = 1; i <= aNb; i++) {
const TopoDS_Face& CF = TopoDS::Face(ContextFaces(i));
if (ExtentContext) WCF = TopoDS::Face(MES(CF));
else WCF = CF;
for (exp.Init(CF.Oriented(TopAbs_FORWARD),TopAbs_EDGE);
exp.More(); exp.Next()) {
const TopoDS_Edge& E = TopoDS::Edge(exp.Current());
TopTools_IndexedMapOfShape VEmap;
TopExp::MapShapes(CF.Oriented(TopAbs_FORWARD), TopAbs_EDGE , VEmap);
//
if (bIsPlanar) {
TopExp::MapShapes(CF.Oriented(TopAbs_FORWARD), TopAbs_VERTEX, VEmap);
}
//
aNbVE = VEmap.Extent();
for (j = 1; j <= aNbVE; ++j) {
const TopoDS_Shape& aS = VEmap(j);
//
bEdge = (aS.ShapeType() == TopAbs_EDGE);
//
TopoDS_Edge E;
TopTools_ListOfShape Anc;
//
if (bEdge) {
// faces connected by the edge
//
E = *(TopoDS_Edge*)&aS;
if (!Analyse.HasAncestor(E)) {
//----------------------------------------------------------------
// the edges of faces of context that are not in the initial shape
@ -659,8 +743,48 @@ void BRepOffset_Inter3d::ContextIntByInt
}
continue;
}
const TopTools_ListOfShape& Anc = Analyse.Ancestors(E);
const TopoDS_Face& F = TopoDS::Face(Anc.First());
Anc = Analyse.Ancestors(E);
}
else {
// faces connected by the vertex
//
if (!Analyse.HasAncestor(aS)) {
continue;
}
//
const TopTools_ListOfShape& aLE = Analyse.Ancestors(aS);
it.Initialize(aLE);
for (; it.More(); it.Next()) {
const TopoDS_Edge& aE = *(TopoDS_Edge*)&it.Value();
//
if (BRep_Tool::Degenerated(aE)) {
continue;
}
//
if (VEmap.Contains(aE)) {
continue;
}
//
const TopTools_ListOfShape& aLF = Analyse.Ancestors(aE);
itF.Initialize(aLF);
for (; itF.More(); itF.Next()) {
const TopoDS_Shape& aF = itF.Value();
Standard_Boolean bAdd = Standard_True;
exp.Init(aF, TopAbs_EDGE);
for (; exp.More() && bAdd; exp.Next()) {
const TopoDS_Shape& aEF = exp.Current();
bAdd = !VEmap.Contains(aEF);
}
if (bAdd) {
Anc.Append(aF);
}
}
}
}
//
itF.Initialize(Anc);
for (; itF.More(); itF.Next()) {
const TopoDS_Face& F = TopoDS::Face(itF.Value());
OF = TopoDS::Face(MapSF(F).Face());
TopoDS_Shape aLocalShape = MapSF(F).Generated(E);
OE = TopoDS::Edge(aLocalShape);
@ -676,23 +800,33 @@ void BRepOffset_Inter3d::ContextIntByInt
TopTools_ListOfShape LInt1,LInt2;
TopTools_ListOfShape LOE;
LOE.Append(OE);
BRepOffset_Tool::Inter3D (WCF,NF,LInt1,LInt2,Side,E,Standard_True);
BRepOffset_Tool::Inter3D (WCF,NF,LInt1,LInt2,Side,E,bEdge);
SetDone(NF,CF);
if (!LInt1.IsEmpty()) {
Store (CF,NF,LInt1,LInt2);
if (LInt1.Extent() == 1) {
Build.Bind(E,LInt1.First());
if ((LInt1.Extent() == 1) && !Build.IsBound(aS)) {
Build.Bind(aS,LInt1.First());
}
else {
B.MakeCompound(C);
if (Build.IsBound(aS)) {
const TopoDS_Shape& aSE = Build(aS);
exp.Init(aSE, TopAbs_EDGE);
for (; exp.More(); exp.Next()) {
const TopoDS_Shape& aNE = exp.Current();
B.Add(C, aNE);
}
}
//
for (it.Initialize(LInt1) ; it.More(); it.Next()) {
B.Add(C,it.Value());
}
Build.Bind(E,C);
Build.Bind(aS,C);
}
}
else {
Failed.Append(E);
Failed.Append(aS);
}
}
}
}
@ -794,11 +928,11 @@ void BRepOffset_Inter3d::ContextIntByArc(const TopTools_IndexedMapOfShape& Conte
// LInt1,LInt2);
LInt1.Clear(); LInt1.Append(OE);
LInt2.Clear();
TopAbs_Orientation O1,O2;
BRepOffset_Tool::OrientSection(OE,CF,OF1,O1,O2);
// if (mySide == TopAbs_OUT) O1 = TopAbs::Reverse(O1);
O1 = TopAbs::Reverse(O1);
LInt1.First().Orientation(O1);
TopAbs_Orientation anOri1, anOri2;
BRepOffset_Tool::OrientSection(OE,CF,OF1, anOri1,anOri2);
// if (mySide == TopAbs_OUT);
anOri1 = TopAbs::Reverse(anOri1);
LInt1.First().Orientation(anOri1);
Store(CF,OF1,LInt1,LInt2);
//------------------------------------------------------
@ -844,11 +978,11 @@ void BRepOffset_Inter3d::ContextIntByArc(const TopTools_IndexedMapOfShape& Conte
// LInt1,LInt2);
LInt1.Clear(); LInt1.Append(OE);
LInt2.Clear();
TopAbs_Orientation anOri1, anOri2;
BRepOffset_Tool::OrientSection(OE,CF,OF1, anOri1,anOri2);
TopAbs_Orientation O1,O2;
BRepOffset_Tool::OrientSection(OE,CF,OF1,O1,O2);
// if (mySide == TopAbs_OUT);
anOri1 = TopAbs::Reverse(anOri1);
LInt1.First().Orientation(anOri1);
O1 = TopAbs::Reverse(O1);
LInt1.First().Orientation(O1);
Store(CF,OF1,LInt1,LInt2);
}
}
@ -1003,6 +1137,3 @@ void BRepOffset_Inter3d::Store(const TopoDS_Face& F1,
}
SetDone(F1,F2);
}

4
src/BRepOffset/BRepOffset_Inter3d.hxx
View File

@ -53,9 +53,9 @@ public:
Standard_EXPORT void ConnexIntByArc (const TopTools_ListOfShape& SetOfFaces, const TopoDS_Shape& ShapeInit, const BRepOffset_Analyse& Analyse, const BRepAlgo_Image& InitOffsetFace);
Standard_EXPORT void ConnexIntByInt (const TopoDS_Shape& SI, const BRepOffset_DataMapOfShapeOffset& MapSF, const BRepOffset_Analyse& A, TopTools_DataMapOfShapeShape& MES, TopTools_DataMapOfShapeShape& Build, TopTools_ListOfShape& Failed);
Standard_EXPORT void ConnexIntByInt (const TopoDS_Shape& SI, const BRepOffset_DataMapOfShapeOffset& MapSF, const BRepOffset_Analyse& A, TopTools_DataMapOfShapeShape& MES, TopTools_DataMapOfShapeShape& Build, TopTools_ListOfShape& Failed, const Standard_Boolean bIsPlanar = Standard_False);
Standard_EXPORT void ContextIntByInt (const TopTools_IndexedMapOfShape& ContextFaces, const Standard_Boolean ExtentContext, const BRepOffset_DataMapOfShapeOffset& MapSF, const BRepOffset_Analyse& A, TopTools_DataMapOfShapeShape& MES, TopTools_DataMapOfShapeShape& Build, TopTools_ListOfShape& Failed);
Standard_EXPORT void ContextIntByInt (const TopTools_IndexedMapOfShape& ContextFaces, const Standard_Boolean ExtentContext, const BRepOffset_DataMapOfShapeOffset& MapSF, const BRepOffset_Analyse& A, TopTools_DataMapOfShapeShape& MES, TopTools_DataMapOfShapeShape& Build, TopTools_ListOfShape& Failed, const Standard_Boolean bIsPlanar = Standard_False);
Standard_EXPORT void ContextIntByArc (const TopTools_IndexedMapOfShape& ContextFaces, const Standard_Boolean ExtentContext, const BRepOffset_Analyse& Analyse, const BRepAlgo_Image& InitOffsetFace, BRepAlgo_Image& InitOffsetEdge);

1431
src/BRepOffset/BRepOffset_MakeOffset.cxx
View File

File diff suppressed because it is too large Load Diff

50
src/BRepOffset/BRepOffset_MakeOffset.hxx
View File

@ -53,9 +53,27 @@ public:
Standard_EXPORT BRepOffset_MakeOffset();
Standard_EXPORT BRepOffset_MakeOffset(const TopoDS_Shape& S, const Standard_Real Offset, const Standard_Real Tol, const BRepOffset_Mode Mode = BRepOffset_Skin, const Standard_Boolean Intersection = Standard_False, const Standard_Boolean SelfInter = Standard_False, const GeomAbs_JoinType Join = GeomAbs_Arc, const Standard_Boolean Thickening = Standard_False);
Standard_EXPORT BRepOffset_MakeOffset(const TopoDS_Shape& S,
const Standard_Real Offset,
const Standard_Real Tol,
const BRepOffset_Mode Mode = BRepOffset_Skin,
const Standard_Boolean Intersection = Standard_False,
const Standard_Boolean SelfInter = Standard_False,
const GeomAbs_JoinType Join = GeomAbs_Arc,
const Standard_Boolean Thickening = Standard_False,
const Standard_Boolean RemoveIntEdges = Standard_False,
const Standard_Boolean RemoveInvalidFaces = Standard_False);
Standard_EXPORT void Initialize (const TopoDS_Shape& S, const Standard_Real Offset, const Standard_Real Tol, const BRepOffset_Mode Mode = BRepOffset_Skin, const Standard_Boolean Intersection = Standard_False, const Standard_Boolean SelfInter = Standard_False, const GeomAbs_JoinType Join = GeomAbs_Arc, const Standard_Boolean Thickening = Standard_False);
Standard_EXPORT void Initialize (const TopoDS_Shape& S,
const Standard_Real Offset,
const Standard_Real Tol,
const BRepOffset_Mode Mode = BRepOffset_Skin,
const Standard_Boolean Intersection = Standard_False,
const Standard_Boolean SelfInter = Standard_False,
const GeomAbs_JoinType Join = GeomAbs_Arc,
const Standard_Boolean Thickening = Standard_False,
const Standard_Boolean RemoveIntEdges = Standard_False,
const Standard_Boolean RemoveInvalidFaces = Standard_False);
Standard_EXPORT void Clear();
@ -106,14 +124,9 @@ public:
Standard_EXPORT const TopoDS_Shape& GetBadShape() const;
protected:
private:
@ -121,6 +134,15 @@ private:
Standard_EXPORT void BuildOffsetByInter();
//! Building splits of the offset faces by the section curves
//! between the neighboring faces.
Standard_EXPORT void BuildSplitsOfFaces(const TopTools_ListOfShape& theLF,
const Handle(BRepAlgo_AsDes)& theAsDes,
TopTools_IndexedDataMapOfShapeListOfShape& theOrigins,
BRepAlgo_Image& theImage,
TopTools_ListOfShape& theLFailed,
const Standard_Boolean bLimited);
Standard_EXPORT void SelfInter (TopTools_MapOfShape& Modif);
Standard_EXPORT void Intersection3D (BRepOffset_Inter3d& Inter);
@ -152,6 +174,10 @@ private:
//! Private method used to build walls for thickening the shell
Standard_EXPORT void MakeMissingWalls();
//! Removes INTERNAL edges from the result
Standard_EXPORT void RemoveInternalEdges();
Standard_Real myOffset;
Standard_Real myTol;
@ -161,6 +187,8 @@ private:
Standard_Boolean mySelfInter;
GeomAbs_JoinType myJoin;
Standard_Boolean myThickening;
Standard_Boolean myRemoveIntEdges;
Standard_Boolean myRemoveInvalidFaces;
TopTools_DataMapOfShapeReal myFaceOffset;
TopTools_IndexedMapOfShape myFaces;
BRepOffset_Analyse myAnalyse;
@ -174,15 +202,9 @@ private:
BRepOffset_Error myError;
BRepOffset_MakeLoops myMakeLoops;
Standard_Boolean myIsPerformSewing; // Handle bad walls in thicksolid mode.
Standard_Boolean myIsPlanar;
TopoDS_Shape myBadShape;
};
#endif // _BRepOffset_MakeOffset_HeaderFile

6
src/BRepOffsetAPI/BRepOffsetAPI_MakeOffsetShape.cxx
View File

@ -43,9 +43,11 @@ BRepOffsetAPI_MakeOffsetShape::BRepOffsetAPI_MakeOffsetShape
const BRepOffset_Mode Mode,
const Standard_Boolean Intersection,
const Standard_Boolean SelfInter,
const GeomAbs_JoinType Join)
const GeomAbs_JoinType Join,
const Standard_Boolean RemoveIntEdges)
{
myOffsetShape.Initialize (S,Offset,Tol,Mode,Intersection,SelfInter,Join);
myOffsetShape.Initialize (S,Offset,Tol,Mode,Intersection,SelfInter,
Join, Standard_False, RemoveIntEdges);
Build();
}

11
src/BRepOffsetAPI/BRepOffsetAPI_MakeOffsetShape.hxx
View File

@ -82,6 +82,8 @@ public:
//! - if Join is equal to GeomAbs_Intersection, then the parallels to the
//! two adjacent faces are enlarged and intersected,
//! so that there are no free edges on parallels to faces.
//! RemoveIntEdges flag defines whether to remove the INTERNAL edges
//! from the result or not.
//! Warnings
//! 1. All the faces of the shape S should be based on the surfaces
//! with continuity at least C1.
@ -100,7 +102,14 @@ public:
//! Exceptions
//! Geom_UndefinedDerivative if the underlying
//! geometry of S is BSpline with continuity C0.
Standard_EXPORT BRepOffsetAPI_MakeOffsetShape(const TopoDS_Shape& S, const Standard_Real Offset, const Standard_Real Tol, const BRepOffset_Mode Mode = BRepOffset_Skin, const Standard_Boolean Intersection = Standard_False, const Standard_Boolean SelfInter = Standard_False, const GeomAbs_JoinType Join = GeomAbs_Arc);
Standard_EXPORT BRepOffsetAPI_MakeOffsetShape(const TopoDS_Shape& S,
const Standard_Real Offset,
const Standard_Real Tol,
const BRepOffset_Mode Mode = BRepOffset_Skin,
const Standard_Boolean Intersection = Standard_False,
const Standard_Boolean SelfInter = Standard_False,
const GeomAbs_JoinType Join = GeomAbs_Arc,
const Standard_Boolean RemoveIntEdges = Standard_False);
Standard_EXPORT virtual const BRepOffset_MakeOffset& MakeOffset() const;

6
src/BRepOffsetAPI/BRepOffsetAPI_MakeThickSolid.cxx
View File

@ -44,9 +44,11 @@ BRepOffsetAPI_MakeThickSolid::BRepOffsetAPI_MakeThickSolid
const BRepOffset_Mode Mode,
const Standard_Boolean Intersection,
const Standard_Boolean SelfInter,
const GeomAbs_JoinType Join)
const GeomAbs_JoinType Join,
const Standard_Boolean RemoveIntEdges)
{
myOffsetShape.Initialize (S,Offset,Tol,Mode,Intersection,SelfInter,Join);
myOffsetShape.Initialize (S,Offset,Tol,Mode,Intersection,SelfInter,
Join, Standard_False, RemoveIntEdges);
TopTools_ListIteratorOfListOfShape it(ClosingFaces);
for (; it.More(); it.Next()) {
myOffsetShape.AddFace(TopoDS::Face(it.Value()));

12
src/BRepOffsetAPI/BRepOffsetAPI_MakeThickSolid.hxx
View File

@ -88,11 +88,21 @@ public:
//! then the parallels to the two adjacent faces are
//! enlarged and intersected, so that there are no free
//! edges on parallels to faces.
//! RemoveIntEdges flag defines whether to remove the INTERNAL edges
//! from the result or not.
//! Warnings
//! Since the algorithm of MakeThickSolid is based on
//! MakeOffsetShape algorithm, the warnings are the same as for
//! MakeOffsetShape.
Standard_EXPORT BRepOffsetAPI_MakeThickSolid(const TopoDS_Shape& S, const TopTools_ListOfShape& ClosingFaces, const Standard_Real Offset, const Standard_Real Tol, const BRepOffset_Mode Mode = BRepOffset_Skin, const Standard_Boolean Intersection = Standard_False, const Standard_Boolean SelfInter = Standard_False, const GeomAbs_JoinType Join = GeomAbs_Arc);
Standard_EXPORT BRepOffsetAPI_MakeThickSolid(const TopoDS_Shape& S,
const TopTools_ListOfShape& ClosingFaces,
const Standard_Real Offset,
const Standard_Real Tol,
const BRepOffset_Mode Mode = BRepOffset_Skin,
const Standard_Boolean Intersection = Standard_False,
const Standard_Boolean SelfInter = Standard_False,
const GeomAbs_JoinType Join = GeomAbs_Arc,
const Standard_Boolean RemoveIntEdges = Standard_False);
//! Builds the resulting shape (redefined from MakeOffsetShape).
Standard_EXPORT virtual void Build() Standard_OVERRIDE;

45
src/BRepTest/BRepTest_FeatureCommands.cxx
View File

@ -942,56 +942,66 @@ static Standard_Boolean theYaBouchon;
static Standard_Real TheTolerance = Precision::Confusion();
static Standard_Boolean TheInter = Standard_False;
static GeomAbs_JoinType TheJoin = GeomAbs_Arc;
static Standard_Boolean RemoveIntEdges = Standard_False;
static Standard_Boolean RemoveInvalidFaces = Standard_False;
Standard_Integer offsetparameter(Draw_Interpretor& di,
Standard_Integer n, const char** a)
{
if ( n == 1 ) {
//cout << " OffsetParameter Tol Inter(c/p) JoinType(a/i)" << endl;
//cout << " Current Values" << endl;
//cout << " --> Tolerance :" << TheTolerance << endl;
//cout << " --> TheInter :";
di << " OffsetParameter Tol Inter(c/p) JoinType(a/i)" << "\n";
di << " OffsetParameter Tol Inter(c/p) JoinType(a/i/t) [RemoveInternalEdges(r/k) RemoveInvalidFaces(r/k)]" << "\n";
di << " Current Values" << "\n";
di << " --> Tolerance : " << TheTolerance << "\n";
di << " --> TheInter : ";
if ( TheInter) {
//cout << "Complet" ;
di << "Complet" ;
} else {
//cout << "Partial";
di << "Partial";
}
//cout << endl << " --> TheJoin :";
di << "\n" << " --> TheJoin : ";
switch (TheJoin) {
//case GeomAbs_Arc: cout << " Arc"; break;
//case GeomAbs_Intersection: cout << " Intersection"; break;
case GeomAbs_Arc: di << "Arc"; break;
case GeomAbs_Intersection: di << "Intersection"; break;
default:
break ;
}
//cout << endl;
//
di << "\n" << " --> Internal Edges : ";
if (RemoveIntEdges) {
di << "Remove";
}
else {
di << "Keep";
}
//
di << "\n" << " --> Invalid Faces : ";
if (RemoveInvalidFaces) {
di << "Remove";
}
else {
di << "Keep";
}
di << "\n";
//
return 0;
}
if ( n < 4 ) return 1;
//
TheTolerance = Draw::Atof(a[1]);
TheInter = strcmp(a[2],"p");
//
if ( !strcmp(a[3],"a")) TheJoin = GeomAbs_Arc;
else if ( !strcmp(a[3],"i")) TheJoin = GeomAbs_Intersection;
else if ( !strcmp(a[3],"t")) TheJoin = GeomAbs_Tangent;
//
RemoveIntEdges = (n >= 5) ? !strcmp(a[4], "r") : Standard_False;
RemoveInvalidFaces = (n == 6) ? !strcmp(a[5], "r") : Standard_False;
//
return 0;
}
//=======================================================================
//function : offsetinit
//purpose :
@ -1008,7 +1018,8 @@ Standard_Integer offsetload(Draw_Interpretor& ,
TheRadius = Of;
// Standard_Boolean Inter = Standard_True;
TheOffset.Initialize(S,Of,TheTolerance,BRepOffset_Skin,TheInter,0,TheJoin);
TheOffset.Initialize(S,Of,TheTolerance,BRepOffset_Skin,TheInter,0,TheJoin,
Standard_False, RemoveIntEdges, RemoveInvalidFaces);
//------------------------------------------
// recuperation et chargement des bouchons.
//----------------------------------------

6
tests/offset/faces_type_i/C5
View File

@ -1,6 +1,6 @@
puts "TODO OCC23068 ALL: An exception was caught"
puts "TODO OCC23068 ALL: \\*\\* Exception \\*\\*"
puts "TODO OCC23068 ALL: TEST INCOMPLETE"
puts "TODO OCC23068 ALL: ERROR. offsetperform operation not done."
puts "TODO OCC23068 ALL: Error : The offset cannot be built."
psphere s 15 90
trotate s 0 0 0 0 0 1 90

2
tests/offset/faces_type_i/C8
View File

@ -1,5 +1,5 @@
puts "TODO OCC23068 ALL: Error : The volume of the resulting shape is"
puts "TODO OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
puts "TODO OCC25406 ALL: Faulty shapes in variables faulty_1 to"
ellipse w1 0 0 0 15 10
mkedge w1 w1 0 pi/2

6
tests/offset/faces_type_i/D4
View File

@ -1,6 +1,6 @@
puts "TODO OCC23068 ALL: An exception was caught"
puts "TODO OCC23068 ALL: \\*\\* Exception \\*\\*"
puts "TODO OCC23068 ALL: TEST INCOMPLETE"
puts "TODO OCC23068 ALL: ERROR. offsetperform operation not done."
puts "TODO OCC23068 ALL: Error : The offset cannot be built."
ptorus s 10 10 0 45
OFFSETSHAPE 1 {s_2} $calcul $type

1
tests/offset/grids.list
View File

@ -15,3 +15,4 @@
015 wire_unclosed_outside_0_075
016 with_intersect_20
017 with_intersect_80
018 shape_type_i_c

5
tests/offset/shape_type_i/B4
View File

@ -1,9 +1,6 @@
puts "TODO OCC23068 ALL: An exception was caught"
puts "TODO OCC23068 ALL: \\*\\* Exception \\*\\*"
puts "TODO OCC23068 ALL: TEST INCOMPLETE"
psphere s 15 90
trotate s 0 0 0 0 0 1 90
OFFSETSHAPE 1 {} $calcul $type
set volume 0
set volume 1.77778e+16

7
tests/offset/shape_type_i/B6
View File

@ -1,8 +1,7 @@
puts "TODO OCC23068 ALL: An exception was caught"
puts "TODO OCC23068 ALL: \\*\\* Exception \\*\\*"
puts "TODO OCC23068 ALL: TEST INCOMPLETE"
puts "TODO OCC23068 ALL: Error: bsection of the result and s is not equal to zero."
psphere s 15 270
OFFSETSHAPE 1 {} $calcul $type
set volume 0
set volume 1.77778e+16

4
tests/offset/shape_type_i/B8
View File

@ -1,6 +1,6 @@
puts "TODO OCC23068 ALL: An exception was caught"
puts "TODO OCC23068 ALL: \\*\\* Exception \\*\\*"
puts "TODO OCC23068 ALL: result is not a topological shape"
puts "TODO OCC23068 ALL: TEST INCOMPLETE"
ptorus s 10 10 0 45
OFFSETSHAPE 1 {} $calcul $type

2
tests/offset/shape_type_i/C8
View File

@ -1,5 +1,5 @@
puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to"
puts "TODO OCC23068 ALL: Error : The volume of the resulting shape is"
puts "TODO OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
ellipse w1 0 0 0 15 10
mkedge w1 w1 0 pi/2

5
tests/offset/shape_type_i_c/A1 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_box_cut_4boxes.brep] s
OFFSETSHAPE 0.1 {} $calcul $type
set volume 925.196

5
tests/offset/shape_type_i_c/A2 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_box_cut_4boxes.brep] s
OFFSETSHAPE 0.3 {} $calcul $type
set volume 1068.58

5
tests/offset/shape_type_i_c/A3 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_box_cut_4boxes.brep] s
OFFSETSHAPE 0.6 {} $calcul $type
set volume 1296.86

5
tests/offset/shape_type_i_c/A4 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_box_cut_4boxes.brep] s
OFFSETSHAPE 0.9 {} $calcul $type
set volume 1543.91

5
tests/offset/shape_type_i_c/A5 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_box_cut_4boxes.brep] s
OFFSETSHAPE 1.2 {} $calcul $type
set volume 1817.34

5
tests/offset/shape_type_i_c/A6 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_box_cut_4boxes.brep] s
OFFSETSHAPE 1.5 {} $calcul $type
set volume 2119

5
tests/offset/shape_type_i_c/A7 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_box_cut_4boxes.brep] s
OFFSETSHAPE 1.8 {} $calcul $type
set volume 2450.18

5
tests/offset/shape_type_i_c/A8 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_box_cut_4boxes.brep] s
OFFSETSHAPE 2.1 {} $calcul $type
set volume 2812.17

5
tests/offset/shape_type_i_c/A9 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_box_cut_4boxes.brep] s
OFFSETSHAPE 2.4 {} $calcul $type
set volume 3206.27

5
tests/offset/shape_type_i_c/B1 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_slanted.brep] s
OFFSETSHAPE 3 {} $calcul $type
set volume 2.00176e+007

5
tests/offset/shape_type_i_c/B2 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_slanted.brep] s
OFFSETSHAPE 6 {} $calcul $type
set volume 2.19865e+007

5
tests/offset/shape_type_i_c/B3 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_slanted.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 2.47223e+007

5
tests/offset/shape_type_i_c/B4 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_slanted.brep] s
OFFSETSHAPE 18 {} $calcul $type
set volume 3.05847e+007

5
tests/offset/shape_type_i_c/B5 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_slanted.brep] s
OFFSETSHAPE 21 {} $calcul $type
set volume 3.29213e+007

5
tests/offset/shape_type_i_c/B6 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_slanted.brep] s
OFFSETSHAPE 25 {} $calcul $type
set volume 3.61487e+007

5
tests/offset/shape_type_i_c/B7 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_slanted.brep] s
OFFSETSHAPE 26 {} $calcul $type
set volume 3.6976e+007

5
tests/offset/shape_type_i_c/B8 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_slanted.brep] s
OFFSETSHAPE 36 {} $calcul $type
set volume 4.58112e+007

5
tests/offset/shape_type_i_c/B9 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_slanted.brep] s
OFFSETSHAPE 44 {} $calcul $type
set volume 5.36522e+007

5
tests/offset/shape_type_i_c/C1 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_input_shape.brep] s
OFFSETSHAPE 3 {} $calcul $type
set volume 5.53893e+008

5
tests/offset/shape_type_i_c/C2 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_input_shape.brep] s
OFFSETSHAPE 6 {} $calcul $type
set volume 5.70329e+008

5
tests/offset/shape_type_i_c/C3 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_input_shape.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 5.92261e+008

5
tests/offset/shape_type_i_c/C4 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_input_shape.brep] s
OFFSETSHAPE 13 {} $calcul $type
set volume 6.08723e+008

5
tests/offset/shape_type_i_c/C5 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_input_shape.brep] s
OFFSETSHAPE 18 {} $calcul $type
set volume 6.36191e+008

5
tests/offset/shape_type_i_c/C6 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_input_shape.brep] s
OFFSETSHAPE 30 {} $calcul $type
set volume 7.02144e+008

5
tests/offset/shape_type_i_c/C7 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_input_shape.brep] s
OFFSETSHAPE 40 {} $calcul $type
set volume 7.58284e+008

5
tests/offset/shape_type_i_c/C8 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_input_shape.brep] s
OFFSETSHAPE 50 {} $calcul $type
set volume 8.16e+008

5
tests/offset/shape_type_i_c/C9 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_input_shape.brep] s
OFFSETSHAPE 60 {} $calcul $type
set volume 8.75772e+008

5
tests/offset/shape_type_i_c/D1 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_offset_shape_tc80_2_smaller.brep] s
OFFSETSHAPE 5 {} $calcul $type
set volume 3.03855e+008

5
tests/offset/shape_type_i_c/D2 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_offset_shape_tc80_2_smaller.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 3.38527e+008

5
tests/offset/shape_type_i_c/D3 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_offset_shape_tc80_2_smaller.brep] s
OFFSETSHAPE 15 {} $calcul $type
set volume 3.68177e+008

5
tests/offset/shape_type_i_c/D4 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_offset_shape_tc80_3_smaller.brep] s
OFFSETSHAPE 5 {} $calcul $type
set volume 3.13188e+008

5
tests/offset/shape_type_i_c/D5 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_offset_shape_tc80_3_smaller.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 3.44873e+008

5
tests/offset/shape_type_i_c/D6 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_offset_shape_tc80_3_smaller.brep] s
OFFSETSHAPE 15 {} $calcul $type
set volume 3.72139e+008

5
tests/offset/shape_type_i_c/D7 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_shape_input_tc80.2.brep] s
OFFSETSHAPE 5 {} $calcul $type
set volume 1.01936e+008

5
tests/offset/shape_type_i_c/D8 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_shape_input_tc80.2.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 1.14248e+008

5
tests/offset/shape_type_i_c/D9 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_shape_input_tc80.2.brep] s
OFFSETSHAPE 15 {} $calcul $type
set volume 1.25498e+008

5
tests/offset/shape_type_i_c/E1 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_shape_input_tc80.3.brep] s
OFFSETSHAPE 5 {} $calcul $type
set volume 1.05054e+008

5
tests/offset/shape_type_i_c/E2 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_shape_input_tc80.3.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 1.16522e+008

5
tests/offset/shape_type_i_c/E3 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_offset_shape_input_tc80.3.brep] s
OFFSETSHAPE 15 {} $calcul $type
set volume 1.27083e+008

5
tests/offset/shape_type_i_c/E4 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_shape_fails.brep] s
OFFSETSHAPE 5 {} $calcul $type
set volume 2.1234e+007

5
tests/offset/shape_type_i_c/E5 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_shape_fails.brep] s
OFFSETSHAPE 30 {} $calcul $type
set volume 4.0384e+007

5
tests/offset/shape_type_i_c/E6 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_input_shape_fails.brep] s
OFFSETSHAPE 60 {} $calcul $type
set volume 7.15e+007

5
tests/offset/shape_type_i_c/E7 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_trapezoid_1.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 244837

5
tests/offset/shape_type_i_c/E8 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_spike_shape.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 4.30309e+008

5
tests/offset/shape_type_i_c/E9 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_spike_shape.brep] s
OFFSETSHAPE 15 {} $calcul $type
set volume 4.79673e+008

5
tests/offset/shape_type_i_c/F1 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_undercut_1.brep] s
OFFSETSHAPE 5 {} $calcul $type
set volume 2.7823e+007

5
tests/offset/shape_type_i_c/F2 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_undercut_1.brep] s
OFFSETSHAPE 15 {} $calcul $type
set volume 3.89013e+007

5
tests/offset/shape_type_i_c/F3 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_undercut_1.brep] s
OFFSETSHAPE 25 {} $calcul $type
set volume 5.10815e+007

5
tests/offset/shape_type_i_c/F4 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_undercut_1.brep] s
OFFSETSHAPE 30 {} $calcul $type
set volume 5.7548e+007

5
tests/offset/shape_type_i_c/F5 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_undercut_1.brep] s
OFFSETSHAPE 40 {} $calcul $type
set volume 7.1364e+007

5
tests/offset/shape_type_i_c/F6 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_unit_cell_grid.brep] s
OFFSETSHAPE 5 {} $calcul $type
set volume 2.46039e+008

5
tests/offset/shape_type_i_c/F7 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_unit_cell_grid.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 2.8855e+008

5
tests/offset/shape_type_i_c/F8 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_unit_cell_grid.brep] s
OFFSETSHAPE 25 {} $calcul $type
set volume 4.21733e+008

5
tests/offset/shape_type_i_c/F9 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_unit_cell_grid.brep] s
OFFSETSHAPE 30 {} $calcul $type
set volume 4.67244e+008

5
tests/offset/shape_type_i_c/G1 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_three_chimneys.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 2.5576e+007

5
tests/offset/shape_type_i_c/G2 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_three_chimneys.brep] s
OFFSETSHAPE 20 {} $calcul $type
set volume 3.2592e+007

5
tests/offset/shape_type_i_c/G3 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_three_chimneys.brep] s
OFFSETSHAPE 25 {} $calcul $type
set volume 3.6439e+007

5
tests/offset/shape_type_i_c/G4 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_three_chimneys.brep] s
OFFSETSHAPE 50 {} $calcul $type
set volume 5.9724e+007

5
tests/offset/shape_type_i_c/G5 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_three_chimneys_duplicated.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 2.11792e+008

5
tests/offset/shape_type_i_c/G6 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_three_chimneys_duplicated.brep] s
OFFSETSHAPE 20 {} $calcul $type
set volume 2.51328e+008

5
tests/offset/shape_type_i_c/G7 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_three_chimneys_duplicated.brep] s
OFFSETSHAPE 30 {} $calcul $type
set volume 2.93724e+008

5
tests/offset/shape_type_i_c/G8 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_three_chimneys_duplicated.brep] s
OFFSETSHAPE 50 {} $calcul $type
set volume 3.89556e+008

5
tests/offset/shape_type_i_c/G9 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_three_chimneys_duplicated.brep] s
OFFSETSHAPE 60 {} $calcul $type
set volume 4.33344e+008

5
tests/offset/shape_type_i_c/H1 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_example_1_side_10_top_10.brep] s
OFFSETSHAPE 10 {} $calcul $type
set volume 9.6408e+007

5
tests/offset/shape_type_i_c/H2 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_example_1_side_10_top_10.brep] s
OFFSETSHAPE 15 {} $calcul $type
set volume 1.07272e+008

5
tests/offset/shape_type_i_c/H3 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_example_2_side_26_top_0.brep] s
OFFSETSHAPE 26 {} $calcul $type
set volume 3.14983e+007

5
tests/offset/shape_type_i_c/H4 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_example_3_side_30_top_0.brep] s
OFFSETSHAPE 35 {} $calcul $type
set volume 8.08679e+007

5
tests/offset/shape_type_i_c/H5 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_example_3_side_30_top_0.brep] s
OFFSETSHAPE 45 {} $calcul $type
set volume 9.51489e+007

5
tests/offset/shape_type_i_c/H6 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_example_4_side_30_top_10.brep] s
OFFSETSHAPE 35 {} $calcul $type
set volume 4.8893e+007

5
tests/offset/shape_type_i_c/H7 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_example_4_side_30_top_10.brep] s
OFFSETSHAPE 45 {} $calcul $type
set volume 5.89638e+007

5
tests/offset/shape_type_i_c/H8 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_b5.brep] s
OFFSETSHAPE 2 {} $calcul $type
set volume 4580.57

5
tests/offset/shape_type_i_c/H9 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_b5.brep] s
OFFSETSHAPE 11 {} $calcul $type
set volume 43008

5
tests/offset/shape_type_i_c/I1 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_b1x.brep] s
OFFSETSHAPE 2 {} $calcul $type
set volume 1756.4

5
tests/offset/shape_type_i_c/I2 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_b1x.brep] s
OFFSETSHAPE 5 {} $calcul $type
set volume 6000

5
tests/offset/shape_type_i_c/I3 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_b1.brep] s
OFFSETSHAPE 1 {} $calcul $type
set volume 5328

7
tests/offset/shape_type_i_c/I4 Normal file
View File

@ -0,0 +1,7 @@
polyline p 0 0 0 5 0 0 7 0 3 3 0 3 4 0 1 1 0 1 2 0 3 -2 0 3 0 0 0
mkplane f p
prism s f 0 5 0
OFFSETSHAPE 0.6 {} $calcul $type
set volume 216.363

7
tests/offset/shape_type_i_c/I5 Normal file
View File

@ -0,0 +1,7 @@
polyline p 0 0 0 5 0 0 7 0 3 3 0 3 4 0 1 1 0 1 2 0 3 -2 0 3 0 0 0
mkplane f p
prism s f 0 5 0
OFFSETSHAPE 1.2 {} $calcul $type
set volume 394.982

5
tests/offset/shape_type_i_c/I6 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_parasite_solid.brep] s
OFFSETSHAPE 1 {} $calcul $type
set volume 1450.99

5
tests/offset/shape_type_i_c/I7 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_parasite_solid_s.brep] s
OFFSETSHAPE 1 {} $calcul $type
set volume 1304.43

5
tests/offset/shape_type_i_c/I8 Normal file
View File

@ -0,0 +1,5 @@
restore [locate_data_file bug25926_parasite_solid_s2.brep] s
OFFSETSHAPE 1 {} $calcul $type
set volume 1217.22

Some files were not shown because too many files have changed in this diff Show More